Separate CAMARA & GSMA tests. Update schemas to camara_schemas. (4e11f16e) · Commits · OOP / code / transformation-function-sdk

src/sunrise6g_opensdk/edgecloud/adapters/i2edge/client.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,7 @@ from pydantic import ValidationError
		from requests import Response

		from sunrise6g_opensdk import logger
		from sunrise6g_opensdk.edgecloud.core import gsma_schemas
		from sunrise6g_opensdk.edgecloud.core import schemas as camara_schemas
		from sunrise6g_opensdk.edgecloud.core import camara_schemas, gsma_schemas
		from sunrise6g_opensdk.edgecloud.core.edgecloud_interface import (
		EdgeCloudManagementInterface,
		)

src/sunrise6g_opensdk/edgecloud/adapters/kubernetes/client.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ from sunrise6g_opensdk.edgecloud.adapters.kubernetes.lib.utils.connector_db impo
		from sunrise6g_opensdk.edgecloud.adapters.kubernetes.lib.utils.kubernetes_connector import (
		KubernetesConnector,
		)
		from sunrise6g_opensdk.edgecloud.core import schemas as camara_schemas
		from sunrise6g_opensdk.edgecloud.core import camara_schemas
		from sunrise6g_opensdk.edgecloud.core.edgecloud_interface import (
		EdgeCloudManagementInterface,
		)

src/sunrise6g_opensdk/edgecloud/core/schemas.py→src/sunrise6g_opensdk/edgecloud/core/camara_schemas.py

+0 −0

File moved.

View file

tests/edgecloud/test_config.py→tests/edgecloud/test_config_camara.py

+46 −114

Original line number	Diff line number	Diff line
		@@ -65,91 +65,14 @@ CONFIG = {
		}
		],
		},
		# GSMA
		"APP_ONBOARD_MANIFEST_GSMA": {
		"appId": "demo-app-id",
		"appProviderId": "Y89TSlxMPDKlXZz7rN6vU2y",
		"appDeploymentZones": [
		"Dmgoc-y2zv97lar0UKqQd53aS6MCTTdoGMY193yvRBYgI07zOAIktN2b9QB2THbl5Gqvbj5Zp92vmNeg7v4M"
		],
		"appMetaData": {
		"appName": "pj1iEkprop",
		"version": "string",
		"appDescription": "stringstringstri",
		"mobilitySupport": False,
		"accessToken": "MfxADOjxDgBhMrqmBeG8XdQFLp2XviG3cZ_LM7uQKc9b",
		"category": "IOT",
		},
		"appQoSProfile": {
		"latencyConstraints": "NONE",
		"bandwidthRequired": 1,
		"multiUserClients": "APP_TYPE_SINGLE_USER",
		"noOfUsersPerAppInst": 1,
		"appProvisioning": True,
		},
		"appComponentSpecs": [
		{
		"serviceNameNB": "k8yyElSyJN4ctbNVqwodEQNUoGb2EzOEt4vQBjGnPii_5",
		"serviceNameEW": "iDm08OZN",
		"componentName": "HIEWqstajCmZJQmSFUj0kNHZ0xYvKWq720BKt8wjA41p",
		"artefactId": "9c9143f0-f44f-49df-939e-1e8b891ba8f5",
		}
		],
		"appStatusCallbackLink": "string",
		"edgeAppFQDN": "string",
		},
		"APP_DEPLOY_PAYLOAD_GSMA": {
		"appId": "demo-app-id",
		"appVersion": "string",
		"appProviderId": "Y89TSlxMPDKlXZz7rN6vU2y",
		"zoneInfo": {
		"zoneId": "f0662bfe-1d90-5f59-a759-c755b3b69b93",
		"flavourId": "67f3a0b0e3184a85952e174d",
		"resourceConsumption": "RESERVED_RES_AVOID",
		"resPool": "ySIT0LuZ6ApHs0wlyGZve",
		},
		"appInstCallbackLink": "string",
		},
		"PATCH_ONBOARDED_APP_GSMA": {
		"appUpdQoSProfile": {
		"latencyConstraints": "NONE",
		"bandwidthRequired": 1,
		"mobilitySupport": False,
		"multiUserClients": "APP_TYPE_SINGLE_USER",
		"noOfUsersPerAppInst": 1,
		"appProvisioning": True,
		},
		"appComponentSpecs": [
		{
		"serviceNameNB": "7CI_9d4lAK90vU4ASUkKxYdQjsv3y3IuwucISSQ6lG5_EMqeyVUHPIhwa5",
		"serviceNameEW": "tPihoUFj30938Bu9blpsHkvsec1iA7gqZZRMpsx6o7aSSj5",
		"componentName": "YCAhqPadfld8y68wJfTc6QNGguI41z",
		"artefactId": "9c9143f0-f44f-49df-939e-1e8b891ba8f5",
		},
		{
		"serviceNameNB": "JCjR0Lc3J0sm2PcItECdbHXtpCLQCfq3B",
		"serviceNameEW": "N8KBAdqT8L_sWOxeFZs3XYn6oykTTFHLiPKOS7kdYbw",
		"componentName": "9aCfCEDe2Dv0Peg",
		"artefactId": "9c9143f0-f44f-49df-939e-1e8b891ba8f5",
		},
		{
		"serviceNameNB": "RIfXlfU9cDeLnrOBYzz9LJGdAjwPRp_3Mjp0Wq_RDlQiAPyXm",
		"serviceNameEW": "31y8sCwvvyNCXfwtLhwJw6hoblG7ZcFzEjyFdAnzq7M8cxiOtDik0",
		"componentName": "3kTa4zKEX",
		"artefactId": "9c9143f0-f44f-49df-939e-1e8b891ba8f5",
		},
		],
		},
		},
		"aeros": {
		"ZONE_ID": "urn:ngsi-ld:Domain:NCSRD",
		"ARTEFACT_ID": "aeros-app-2",
		"ARTEFACT_NAME": "aeroschart",
		"REPO_NAME": "github-aeros",
		"REPO_TYPE": "PUBLICREPO",
		"REPO_URL": "https://aeros.github.io/helm/",
		# Basic identifiers
		"ZONE_ID": "<UUID>",
		"APP_ID": "<UUID>",
		# CAMARA onboard_app payload
		"APP_ONBOARD_MANIFEST": {
		"appId": "aeros-app-2",
		"appId": "<UUID>",
		"name": "aeros-SDK-app",
		"version": "1.0.0",
		"appProvider": "aeros",
		@@ -188,14 +111,13 @@ CONFIG = {
		}
		],
		},
		"APP_ID": "aeros-app-2",
		# CAMARA deploy_app payload
		"APP_DEPLOY_PAYLOAD": {
		"appId": "aeros-app-2",
		"appId": "<UUID>",
		"appZones": [
		{
		"EdgeCloudZone": {
		"edgeCloudZoneId": "urn:ngsi-ld:Domain:NCSRD",
		"edgeCloudZoneId": "<UUID>",
		"edgeCloudZoneName": "aeros-zone-1",
		"edgeCloudZoneStatus": "active",
		"edgeCloudProvider": "NCSRD",
		@@ -206,39 +128,34 @@ CONFIG = {
		},
		},
		"kubernetes": {
		"K8S_ONBOARDED_APP_NAME": "nginx",
		"K8S_APP_ID": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
		# Basic identifiers
		"ZONE_ID": "999b7746-d2e2-4bb4-96e6-f1e895adef0c",
		"APP_ID": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
		"ZONE_ID": "b2a1b33d-f382-47de-b555-2d32155eb74c",
		# CAMARA deploy_app payload
		"APP_DEPLOY_PAYLOAD": {
		"appId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
		"appZones": [
		{
		"EdgeCloudZone": {
		"edgeCloudZoneId": "b2a1b33d-f382-47de-b555-2d32155eb74c",
		"edgeCloudZoneName": "k8s-zone-1",
		"edgeCloudZoneStatus": "active",
		"edgeCloudProvider": "kubernetes",
		"edgeCloudRegion": "Local",
		}
		}
		],
		},
		# Legacy K8S_DEPLOY_PAYLOAD for backward compatibility (if needed)
		"K8S_DEPLOY_PAYLOAD": {
		"appId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
		"name": "nginx-test",
		"edgeCloudZoneId": "zorro-solutions",
		"kubernetesClusterRef": "",
		},
		"ZONE_ID": "999b7746-d2e2-4bb4-96e6-f1e895adef0c",
		# CAMARA onboard_app payload
		"APP_ONBOARD_MANIFEST": {
		"appId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
		"name": "nginx",
		"name": "nginx_test",
		"version": "1",
		"packageType": "QCOW2",
		"appProvider": "Nginx Inc.",
		"appProvider": "jJsxUU403g5PUhoRtYfOBaaIRZGVzXDZgMBqzMYq5xLcdZoWGYIYqmVy0",
		"appRepo": {"imagePath": "nginx", "type": "PRIVATEREPO"},
		"requiredResources": {
		"infraKind": "kubernetes",
		"applicationResources": {
		"cpuPool": {
		"numCPU": 2,
		"memory": 2048,
		"topology": {
		"minNumberOfNodes": 2,
		"minNodeCpu": 1,
		"minNodeMemory": 1024,
		},
		}
		},
		"isStandalone": False,
		"version": "1.29",
		},
		"componentSpec": [
		{
		"componentName": "nginx",
		@@ -246,18 +163,33 @@ CONFIG = {
		{
		"protocol": "TCP",
		"port": 80,
		"interfaceId": "Uj6qThvzkegxa3L4b88",
		"interfaceId": "http_interface",
		"visibilityType": "VISIBILITY_EXTERNAL",
		},
		{
		"protocol": "TCP",
		"port": 443,
		"interfaceId": "Uj6qThvzkegxa3L4b88",
		"interfaceId": "https_interface",
		"visibilityType": "VISIBILITY_EXTERNAL",
		},
		],
		}
		],
		},
		# CAMARA deploy_app payload
		"APP_DEPLOY_PAYLOAD": {
		"appId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
		"appZones": [
		{
		"EdgeCloudZone": {
		"edgeCloudZoneId": "999b7746-d2e2-4bb4-96e6-f1e895adef0c",
		"edgeCloudZoneName": "zorro-solutions",
		"edgeCloudZoneStatus": "active",
		"edgeCloudProvider": "ICOM",
		"edgeCloudRegion": "Europe-Southeast",
		}
		}
		],
		},
		},
		}

tests/edgecloud/test_config_gsma.py

0 → 100644

+84 −0

Original line number	Diff line number	Diff line
		CONFIG = {
		"i2edge": {
		"APP_ONBOARD_MANIFEST_GSMA": {
		"appId": "demo-app-id",
		"appProviderId": "Y89TSlxMPDKlXZz7rN6vU2y",
		"appDeploymentZones": [
		"Dmgoc-y2zv97lar0UKqQd53aS6MCTTdoGMY193yvRBYgI07zOAIktN2b9QB2THbl5Gqvbj5Zp92vmNeg7v4M"
		],
		"appMetaData": {
		"appName": "pj1iEkprop",
		"version": "string",
		"appDescription": "stringstringstri",
		"mobilitySupport": False,
		"accessToken": "MfxADOjxDgBhMrqmBeG8XdQFLp2XviG3cZ_LM7uQKc9b",
		"category": "IOT",
		},
		"appQoSProfile": {
		"latencyConstraints": "NONE",
		"bandwidthRequired": 1,
		"multiUserClients": "APP_TYPE_SINGLE_USER",
		"noOfUsersPerAppInst": 1,
		"appProvisioning": True,
		},
		"appComponentSpecs": [
		{
		"serviceNameNB": "k8yyElSyJN4ctbNVqwodEQNUoGb2EzOEt4vQBjGnPii_5",
		"serviceNameEW": "iDm08OZN",
		"componentName": "HIEWqstajCmZJQmSFUj0kNHZ0xYvKWq720BKt8wjA41p",
		"artefactId": "9c9143f0-f44f-49df-939e-1e8b891ba8f5",
		}
		],
		"appStatusCallbackLink": "string",
		"edgeAppFQDN": "string",
		},
		"APP_DEPLOY_PAYLOAD_GSMA": {
		"appId": "demo-app-id",
		"appVersion": "string",
		"appProviderId": "Y89TSlxMPDKlXZz7rN6vU2y",
		"zoneInfo": {
		"zoneId": "f0662bfe-1d90-5f59-a759-c755b3b69b93",
		"flavourId": "67f3a0b0e3184a85952e174d",
		"resourceConsumption": "RESERVED_RES_AVOID",
		"resPool": "ySIT0LuZ6ApHs0wlyGZve",
		},
		"appInstCallbackLink": "string",
		},
		"PATCH_ONBOARDED_APP_GSMA": {
		"appUpdQoSProfile": {
		"latencyConstraints": "NONE",
		"bandwidthRequired": 1,
		"mobilitySupport": False,
		"multiUserClients": "APP_TYPE_SINGLE_USER",
		"noOfUsersPerAppInst": 1,
		"appProvisioning": True,
		},
		"appComponentSpecs": [
		{
		"serviceNameNB": "7CI_9d4lAK90vU4ASUkKxYdQjsv3y3IuwucISSQ6lG5_EMqeyVUHPIhwa5",
		"serviceNameEW": "tPihoUFj30938Bu9blpsHkvsec1iA7gqZZRMpsx6o7aSSj5",
		"componentName": "YCAhqPadfld8y68wJfTc6QNGguI41z",
		"artefactId": "9c9143f0-f44f-49df-939e-1e8b891ba8f5",
		},
		{
		"serviceNameNB": "JCjR0Lc3J0sm2PcItECdbHXtpCLQCfq3B",
		"serviceNameEW": "N8KBAdqT8L_sWOxeFZs3XYn6oykTTFHLiPKOS7kdYbw",
		"componentName": "9aCfCEDe2Dv0Peg",
		"artefactId": "9c9143f0-f44f-49df-939e-1e8b891ba8f5",
		},
		{
		"serviceNameNB": "RIfXlfU9cDeLnrOBYzz9LJGdAjwPRp_3Mjp0Wq_RDlQiAPyXm",
		"serviceNameEW": "31y8sCwvvyNCXfwtLhwJw6hoblG7ZcFzEjyFdAnzq7M8cxiOtDik0",
		"componentName": "3kTa4zKEX",
		"artefactId": "9c9143f0-f44f-49df-939e-1e8b891ba8f5",
		},
		],
		},
		},
		"aeros": {
		# PLACEHOLDER
		},
		"kubernetes": {
		# PLACEHOLDER
		},
		}