feature/add-e2e-tests-gsma-edgecloud: add tests e2e edgecloud gsma methods

Cesar Cajasrequested to merge
feature/add-e2e-tests-gsma-edgecloud into main

Merge request reports

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

+1 −2
Changes for src/sunrise6g_opensdk/edgecloud/adapters/i2edge/client.py: 1 added line, 2 removed lines.
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
Changes for src/sunrise6g_opensdk/edgecloud/adapters/kubernetes/client.py: 1 added line, 1 removed line.
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

src/sunrise6g_opensdk/edgecloud/core/gsma_schemas.py

+66 −4
Changes for src/sunrise6g_opensdk/edgecloud/core/gsma_schemas.py: 66 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class OSType(BaseModel): 
class Flavour(BaseModel):

    flavourId: str

    cpuArchType: Literal["ISA_X86", "ISA_X86_64", "ISA_ARM_64"]

    supportedOSTypes: List[OSType] = Field(..., min_items=1)

    supportedOSTypes: List[OSType] = Field(..., min_length=1)

    numCPU: int

    memorySize: int

    storageSize: int
@@ -105,9 +105,9 @@ class ZoneServiceLevelObjsInfo(BaseModel): 


class ZoneRegisteredData(BaseModel):

    zoneId: str

    reservedComputeResources: List[ComputeResourceInfo] = Field(..., min_items=1)

    computeResourceQuotaLimits: List[ComputeResourceInfo] = Field(..., min_items=1)

    flavoursSupported: List[Flavour] = Field(..., min_items=1)

    reservedComputeResources: List[ComputeResourceInfo] = Field(..., min_length=1)

    computeResourceQuotaLimits: List[ComputeResourceInfo] = Field(..., min_length=1)

    flavoursSupported: List[Flavour] = Field(..., min_length=1)

    networkResources: Optional[NetworkResources] = None

    zoneServiceLevelObjsInfo: Optional[ZoneServiceLevelObjsInfo] = None
@@ -146,6 +146,8 @@ class Artefact(BaseModel): 
# ApplicationOnboardingManagement

# ---------------------------



# Responses





class AppDeploymentZone(BaseModel):

    countryCode: str
@@ -202,10 +204,26 @@ class ApplicationModel(BaseModel): 
    onboardStatusInfo: Literal["PENDING", "ONBOARDED", "DEBOARDING", "REMOVED", "FAILED"]





# Entry





class AppOnboardManifestGSMA(BaseModel):

    appId: str

    appProviderId: str

    appDeploymentZones: List[str]

    appMetaData: AppMetaData

    appQoSProfile: AppQoSProfile

    appComponentSpecs: List[AppComponentSpec]

    appStatusCallbackLink: str

    edgeAppFQDN: str





# ---------------------------

# ApplicationDeploymentManagement

# ---------------------------



# Responses





class AppInstance(BaseModel):

    zoneId: str
@@ -224,3 +242,47 @@ class ZoneIdentifier(BaseModel): 


class ZoneIdentifierList(RootModel[List[ZoneIdentifier]]):

    pass





# Entry





class ZoneInfo(BaseModel):

    zoneId: str

    flavourId: str

    resourceConsumption: str

    resPool: str





class AppDeployPayloadGSMA(BaseModel):

    appId: str

    appVersion: str

    appProviderId: str

    zoneInfo: ZoneInfo

    appInstCallbackLink: str





# ---------------------------

# ApplicationUpdateManagement

# ---------------------------





class AppUpdQoSProfile(BaseModel):

    latencyConstraints: str

    bandwidthRequired: int

    mobilitySupport: bool

    multiUserClients: str

    noOfUsersPerAppInst: int

    appProvisioning: bool





class PatchAppComponentSpec(BaseModel):

    serviceNameNB: str

    serviceNameEW: str

    componentName: str

    artefactId: str





class PatchOnboardedAppGSMA(BaseModel):

    appUpdQoSProfile: AppUpdQoSProfile

    appComponentSpecs: List[PatchAppComponentSpec]

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

+4 −4
Changes for tests/edgecloud/test_config_camara.py: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ CONFIG = { 
                    "componentName": "my-component",

                    "networkInterfaces": [

                        {

                            "interfaceId": "c3e1e6d4-1a5c-4a3b-9e4a-5f3d7b6c8e01",

                            "interfaceId": "eth0",

                            "protocol": "TCP",

                            "port": 8080,

                            "visibilityType": "VISIBILITY_EXTERNAL",
@@ -102,7 +102,7 @@ CONFIG = { 
                    "componentName": "aeros-component",

                    "networkInterfaces": [

                        {

                            "interfaceId": "<UUID>",

                            "interfaceId": "eth0",

                            "protocol": "TCP",

                            "port": 9090,

                            "visibilityType": "VISIBILITY_INTERNAL",
@@ -163,13 +163,13 @@ CONFIG = { 
                        {

                            "protocol": "TCP",

                            "port": 80,

                            "interfaceId": "8f4b02a9-73ba-4fde-9d93-3b1a6e7c5d9f",

                            "interfaceId": "http_interface",

                            "visibilityType": "VISIBILITY_EXTERNAL",

                        },

                        {

                            "protocol": "TCP",

                            "port": 443,

                            "interfaceId": "e5c9a2b1-3d7f-4b8e-a6c4-1f9d8b7a6c0e",

                            "interfaceId": "https_interface",

                            "visibilityType": "VISIBILITY_EXTERNAL",

                        },

                    ],