Skip to content

Commit

Permalink
Merge branch 'main' into update-dns-record-interface
Browse files Browse the repository at this point in the history
  • Loading branch information
nrobinaubertin authored Jan 9, 2025
2 parents 581a87f + eea8223 commit 5197412
Show file tree
Hide file tree
Showing 33 changed files with 1,495 additions and 35 deletions.
2 changes: 1 addition & 1 deletion README_INTERFACE_TESTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ providers:
- name: traefik-k8s
url: https://github.com/canonical/traefik-k8s-operator
test_setup:
- location: foo/bar/baz.py # location of the identifier
location: foo/bar/baz.py # location of the identifier
identifier: qux # name of a pytest fixture yielding a configured InterfaceTester
requirers: []
Expand Down
4 changes: 2 additions & 2 deletions docs/json_schemas/fiveg_core_gnb/v0/provider.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"208",
"302"
],
"pattern": "[0-9][0-9][0-9]",
"pattern": "^[0-9][0-9][0-9]$",
"title": "Mcc",
"type": "string"
},
Expand All @@ -52,7 +52,7 @@
"001",
"999"
],
"pattern": "[0-9][0-9][0-9]?",
"pattern": "^[0-9][0-9][0-9]?$",
"title": "Mnc",
"type": "string"
},
Expand Down
6 changes: 3 additions & 3 deletions docs/json_schemas/fiveg_core_gnb/v0/requirer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
},
"FivegCoreGnbRequirerAppData": {
"properties": {
"cu_name": {
"gnb-name": {
"description": "Unique identifier of the CU/gnB.",
"examples": [
"gnb001"
],
"title": "Cu Name",
"title": "Gnb-Name",
"type": "string"
}
},
"required": [
"cu_name"
"gnb-name"
],
"title": "FivegCoreGnbRequirerAppData",
"type": "object"
Expand Down
34 changes: 33 additions & 1 deletion docs/json_schemas/fiveg_rfsim/v0/provider.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,42 @@
],
"title": "Rfsim Address",
"type": "string"
},
"sst": {
"description": "Slice/Service Type",
"examples": [
1,
2,
3,
4
],
"maximum": 255,
"minimum": 0,
"title": "Sst",
"type": "integer"
},
"sd": {
"anyOf": [
{
"maximum": 16777215,
"minimum": 0,
"type": "integer"
},
{
"type": "null"
}
],
"default": null,
"description": "Slice Differentiator",
"examples": [
1
],
"title": "Sd"
}
},
"required": [
"rfsim_address"
"rfsim_address",
"sst"
],
"title": "FivegRFSIMProviderAppData",
"type": "object"
Expand Down
133 changes: 133 additions & 0 deletions docs/json_schemas/grafana_datasource/v0/provider.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"$defs": {
"GrafanaSourceData": {
"properties": {
"model": {
"description": "Name of the Juju model where the source is deployed.",
"examples": [
"cos"
],
"title": "Model",
"type": "string"
},
"model_uuid": {
"description": "UUID of the Juju model where the source is deployed.",
"examples": [
"0000-0000-0000-0000"
],
"title": "Model Uuid",
"type": "string"
},
"application": {
"description": "Name of the Juju model where the source is deployed.",
"examples": [
"tempo",
"loki",
"prometheus"
],
"title": "Application",
"type": "string"
},
"type": {
"description": "Type of the datasource.",
"examples": [
"tempo",
"loki",
"prometheus"
],
"title": "Type",
"type": "string"
},
"extra_fields": {
"anyOf": [
{
"contentMediaType": "application/json",
"contentSchema": {},
"type": "string"
},
{
"type": "null"
}
],
"description": "Any datasource-type-specific additional configuration.",
"title": "Extra Fields"
},
"secure_extra_fields": {
"anyOf": [
{
"contentMediaType": "application/json",
"contentSchema": {},
"type": "string"
},
{
"type": "null"
}
],
"description": "Any secure datasource-type-specific additional configuration.",
"title": "Secure Extra Fields"
}
},
"required": [
"model",
"model_uuid",
"application",
"type",
"extra_fields",
"secure_extra_fields"
],
"title": "GrafanaSourceData",
"type": "object"
},
"GrafanaSourceProviderAppData": {
"description": "Application databag model for the requirer side of this interface.",
"properties": {
"grafana_source_data": {
"contentMediaType": "application/json",
"contentSchema": {
"$ref": "#/$defs/GrafanaSourceData"
},
"title": "Grafana Source Data",
"type": "string"
}
},
"required": [
"grafana_source_data"
],
"title": "GrafanaSourceProviderAppData",
"type": "object"
},
"GrafanaSourceProviderUnitData": {
"description": "Application databag model for the requirer side of this interface.",
"properties": {
"grafana_source_host": {
"description": "Hostname of a source server.",
"examples": [
"localhost:80"
],
"title": "Grafana Source Host",
"type": "string"
}
},
"required": [
"grafana_source_host"
],
"title": "GrafanaSourceProviderUnitData",
"type": "object"
}
},
"description": "The schemas for the requirer side of this interface.",
"properties": {
"unit": {
"$ref": "#/$defs/GrafanaSourceProviderUnitData"
},
"app": {
"$ref": "#/$defs/GrafanaSourceProviderAppData"
}
},
"required": [
"unit",
"app"
],
"title": "ProviderSchema",
"type": "object"
}
61 changes: 61 additions & 0 deletions docs/json_schemas/grafana_datasource/v0/requirer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"$defs": {
"BaseModel": {
"properties": {},
"title": "BaseModel",
"type": "object"
},
"GrafanaSourceRequirerAppData": {
"description": "Application databag model for the requirer side of this interface.",
"properties": {
"datasource_uids": {
"contentMediaType": "application/json",
"contentSchema": {
"additionalProperties": {
"type": "string"
},
"type": "object"
},
"title": "Datasource Uids",
"type": "string"
},
"grafana_uid": {
"description": "UID of the requirer application.",
"examples": [
"foo-0000-0000-0000-0000-grafana-1"
],
"title": "Grafana Uid",
"type": "string"
}
},
"required": [
"datasource_uids",
"grafana_uid"
],
"title": "GrafanaSourceRequirerAppData",
"type": "object"
}
},
"description": "The schema for the provider side of this interface.",
"properties": {
"unit": {
"anyOf": [
{
"$ref": "#/$defs/BaseModel"
},
{
"type": "null"
}
],
"default": null
},
"app": {
"$ref": "#/$defs/GrafanaSourceRequirerAppData"
}
},
"required": [
"app"
],
"title": "RequirerSchema",
"type": "object"
}
84 changes: 84 additions & 0 deletions docs/json_schemas/grafana_datasource_exchange/v0/provider.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
{
"$defs": {
"BaseModel": {
"properties": {},
"title": "BaseModel",
"type": "object"
},
"GrafanaDatasource": {
"properties": {
"type": {
"description": "Type of the datasource, typically one of https://grafana.com/docs/grafana/latest/datasources/#built-in-core-data-sources.",
"examples": [
"tempo",
"loki",
"prometheus",
"elasticsearch"
],
"title": "Type",
"type": "string"
},
"uid": {
"description": "Grafana datasource UID, as assigned by Grafana.",
"title": "Uid",
"type": "string"
},
"grafana_uid": {
"description": "Grafana UID.",
"title": "Grafana Uid",
"type": "string"
}
},
"required": [
"type",
"uid",
"grafana_uid"
],
"title": "GrafanaDatasource",
"type": "object"
},
"GrafanaSourceAppData": {
"description": "Application databag model for the requirer side of this interface.",
"properties": {
"datasources": {
"contentMediaType": "application/json",
"contentSchema": {
"items": {
"$ref": "#/$defs/GrafanaDatasource"
},
"type": "array"
},
"title": "Datasources",
"type": "string"
}
},
"required": [
"datasources"
],
"title": "GrafanaSourceAppData",
"type": "object"
}
},
"description": "The schemas for the requirer side of this interface.",
"properties": {
"unit": {
"anyOf": [
{
"$ref": "#/$defs/BaseModel"
},
{
"type": "null"
}
],
"default": null
},
"app": {
"$ref": "#/$defs/GrafanaSourceAppData"
}
},
"required": [
"app"
],
"title": "ProviderSchema",
"type": "object"
}
Loading

0 comments on commit 5197412

Please sign in to comment.