merge 5.1.1-dev-sol005 in 5.1.1-dev

This reverts commit 8e16f258.

Merge request reports

Loading
+3 −0
Changes for SOL005/NFVICapacityInformation-API/environment/variables.txt: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -43,4 +43,7 @@ ${invalidVimId}
${capacityThreshold}
${invalid_capacityThreshold}

${ccmId}
${invalidCcmId}

${PRODUCER_SUPPORT_COND_REQ}    1
+15 −6
Changes for SOL005/NFVICapacityInformation-API/schemas/NfviCapacityInfo.schema.json: 15 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@
    "description": "This type defines the format of the NFVI capacity information. The type shall comply with the provisions defined\nin Table 10.5.2.4-1.\n",
    "required": [
        "id",
		"vimId",
        "capacityInfoPerZone"
    ],
    "properties": {
@@ -15,6 +14,10 @@
            "description": "An identifier with the intention of being globally unique.\n",
            "type": "string"
        },
        "ccmId": {
            "description": "Identifies the CCM to which the NFVI capacity information is associated. \n",
            "type": "string"
        },
        "capacityInfoPerZone": {
            "description": "Capacity information on a per resource zone basis under control by the associated VIM.\n",
            "type": "array",
@@ -29,12 +32,16 @@
                        "description": "An identifier with the intention of being globally unique.\n",
                        "type": "string"
                    },
                    "cisClusterId": {
                        "description": "Identifies the CIS cluster of the applicable NFVI capacity information.\n",
                        "type": "string"
                    },
                    "capacityMeasurements": {
                        "description": "Capacity measurement on a per resource type basis.\n",
                        "type": "array",
                        "items": {
                            "type": "object",
							"description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\n",
                            "description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\nNOTE: The present document and referred documents do not specify the capacity measurements,\nthus the capacity measurement names are not specified in the present document version.\n",
                            "required": [
                                "resourceType",
                                "capacityMeasurementName",
@@ -54,7 +61,7 @@
                                    ]
                                },
                                "capacityMeasurementName": {
									"description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nThe present document and referred documents do not specify the capacity measurements, thus the capacity\nmeasurement names are not specified in the present document version.\n",
                                    "description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nSee note.\n",
                                    "type": "string"
                                },
                                "totalCapacity": {
@@ -81,7 +88,7 @@
        },
        "totalCapacityInfo": {
            "type": "object",
			"description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\n",
            "description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\nNOTE: The present document and referred documents do not specify the capacity measurements,\nthus the capacity measurement names are not specified in the present document version.\n",
            "required": [
                "resourceType",
                "capacityMeasurementName",
@@ -101,7 +108,7 @@
                    ]
                },
                "capacityMeasurementName": {
					"description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nThe present document and referred documents do not specify the capacity measurements, thus the capacity\nmeasurement names are not specified in the present document version.\n",
                    "description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nSee note.\n",
                    "type": "string"
                },
                "totalCapacity": {
@@ -124,17 +131,19 @@
        },
        "timeInterval": {
            "type": "object",
			"description": "This type defines the format of a time interval. The type shall comply with the provisions defined in table 10.5.2.7-1.\n",
            "description": "This type defines the format of a time interval. The type shall comply with the provisions defined in table 10.5.2.7-1.\nNOTE: When only the aTime is present, there is no time interval being defined, and therefore the provided timing\ninformation refers to a specific point in time.\n",
            "required": [
                "aTime"
            ],
            "properties": {
                "aTime": {
                    "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
                    "type": "string",
                    "format": "date-time"
                },
                "bTime": {
                    "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
                    "type": "string",
                    "format": "date-time"
                }
            }
+16 −8
Changes for SOL005/NFVICapacityInformation-API/schemas/NfviCapacityInfos.schema.json: 16 added lines, 8 removed lines.
Original line number Diff line number Diff line
{
    "type": "array",
  "items":
  {
    "items": {
        "type": "object",
        "description": "This type defines the format of the NFVI capacity information. The type shall comply with the provisions defined\nin Table 10.5.2.4-1.\n",
        "required": [
            "id",
		"vimId",
            "capacityInfoPerZone"
        ],
        "properties": {
@@ -17,6 +15,10 @@
            "vimId": {
                "description": "An identifier with the intention of being globally unique.\n",
                "type": "string"
            },
			"ccmId": {
                "description": "Identifies the CCM to which the NFVI capacity information is associated. \n",
                "type": "string"
            },
            "capacityInfoPerZone": {
                "description": "Capacity information on a per resource zone basis under control by the associated VIM.\n",
@@ -31,13 +33,17 @@
                        "resourceZoneId": {
                            "description": "An identifier with the intention of being globally unique.\n",
                            "type": "string"
                        },
						"cisClusterId": {
                            "description": "Identifies the CIS cluster of the applicable NFVI capacity information.\n",
                            "type": "string"
                        },
                        "capacityMeasurements": {
                            "description": "Capacity measurement on a per resource type basis.\n",
                            "type": "array",
                            "items": {
                                "type": "object",
							"description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\n",
                                "description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\nNOTE: The present document and referred documents do not specify the capacity measurements,\nthus the capacity measurement names are not specified in the present document version.\n",
                                "required": [
                                    "resourceType",
                                    "capacityMeasurementName",
@@ -57,7 +63,7 @@
                                        ]
                                    },
                                    "capacityMeasurementName": {
									"description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nThe present document and referred documents do not specify the capacity measurements, thus the capacity\nmeasurement names are not specified in the present document version.\n",
                                        "description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nSee note.\n",
                                        "type": "string"
                                    },
                                    "totalCapacity": {
@@ -84,7 +90,7 @@
            },
            "totalCapacityInfo": {
                "type": "object",
			"description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\n",
                "description": "This type defines the format of the NFVI capacity information on a per resource type basis.\nThe type shall comply with the provisions defined in table 10.5.2.6-1.\nNOTE: The present document and referred documents do not specify the capacity measurements,\nthus the capacity measurement names are not specified in the present document version.\n",
                "required": [
                    "resourceType",
                    "capacityMeasurementName",
@@ -104,7 +110,7 @@
                        ]
                    },
                    "capacityMeasurementName": {
					"description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nThe present document and referred documents do not specify the capacity measurements, thus the capacity\nmeasurement names are not specified in the present document version.\n",
                        "description": "Name of the capacity measurement. Different resource types can have different associated capacity measurements,\ntypically associated to different sub-types of the resource type.\nSee note.\n",
                        "type": "string"
                    },
                    "totalCapacity": {
@@ -127,17 +133,19 @@
            },
            "timeInterval": {
                "type": "object",
			"description": "This type defines the format of a time interval. The type shall comply with the provisions defined in table 10.5.2.7-1.\n",
                "description": "This type defines the format of a time interval. The type shall comply with the provisions defined in table 10.5.2.7-1.\nNOTE: When only the aTime is present, there is no time interval being defined, and therefore the provided timing\ninformation refers to a specific point in time.\n",
                "required": [
                    "aTime"
                ],
                "properties": {
                    "aTime": {
                        "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
                        "type": "string",
                        "format": "date-time"
                    },
                    "bTime": {
                        "description": "Date-time stamp. Representation: String formatted according toas defined by the date-time production in IETF RFC 3339.\n",
                        "type": "string",
                        "format": "date-time"
                    }
                }
+12 −12
Changes for SOL005/NFVICapacityInformation-API/CapacityThresholds.robot: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ POST Create Capacity Threshold
    ...    Test title: POST Create Capacity Threshold
    ...    Test objective: The objective is to test that POST method creates a Capacity  Threshold
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
@@ -21,7 +21,7 @@ POST Create Capacity Threshold - Unprocessible Content
    ...    Test title: POST Create Capacity Threshold - Unprocessible Content
    ...    Test objective: The objective is to test that POST method creates a Capacity  Threshold
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
@@ -34,7 +34,7 @@ GET Capacity Thresholds
    ...    Test title: GET Capacity Thresholds
    ...    Test objective: The objective is to GET Capacity Thresholds objects
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
@@ -47,7 +47,7 @@ GET Capacity Thresholds - Filter
    ...    Test title: GET Capacity Thresholds - Filter
    ...    Test objective: The objective is to GET Capacity Thresholds objects using filter
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
@@ -60,7 +60,7 @@ GET Capacity Thresholds Bad Request Invalid attribute-based filtering parameters
    ...    Test title: GET Capacity Thresholds Bad Request Invalid attribute-based filtering parameters
    ...    Test objective: The objective is to get information about Capacity Thresholds with Invalid attribute-based filtering parameters
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
@@ -73,7 +73,7 @@ GET Capacity Thresholds - Bad Request Response too Big
    ...    Test title: GET Capacity Thresholds - Bad Request Response too Big
    ...    Test objective: The objective is test that the retrieval of existing Capacity Thresholds list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: NFVO does not support paged response.
    ...    Post-Conditions: none 
@@ -86,7 +86,7 @@ GET Capacity Thresholds as Paged Response
    ...    Test title: GET Capacity Thresholds as Paged Response
    ...    Test objective: The objective is to test that GET method retrieves the list of existing Capacity Thresholds as paged response.
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: NFVO supports paged response.
    ...    Post-Conditions: none    
@@ -99,7 +99,7 @@ PUT Capacity Thresholds - Method not implemented
    ...    Test title: PUT Capacity Thresholds - Method not implemented
    ...    Test objective: The objective is to test that PUT method is not implemented
    ...    Pre-conditions:  none
    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
@@ -111,7 +111,7 @@ PATCH Capacity Thresholds - Method not implemented
    ...    Test title: PATCH Capacity Thresholds - Method not implemented
    ...    Test objective: The objective is to test that PATCH method is not implemented
    ...    Pre-conditions: none 
    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
@@ -123,7 +123,7 @@ DELETE Capacity Thresholds - Method not implemented
    ...    Test title: DELETE Capacity Thresholds - Method not implemented
    ...    Test objective: The objective is to test that DELETE method is not implemented
    ...    Pre-conditions: none 
    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
@@ -135,7 +135,7 @@ GET Capacity Thresholds with permitted authorization scope
    ...    Test title: GET Capacity Thresholds with permitted authorization scope
    ...    Test objective: The objective is to GET Capacity Thresholds objects with permitted authorization scope
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
@@ -148,7 +148,7 @@ GET Capacity Thresholds with not permitted authorization scope
    ...    Test title: GET Capacity Thresholds with not permitted authorization scope
    ...    Test objective: The objective is to test that GET Capacity Thresholds objects fails when using not permitted authorization scope
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.5.1
    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
+115 −0
Changes for SOL005/NFVICapacityInformation-API/IndividualCCMsNFVICapacityInformation.robot: 115 added lines, 0 removed lines.
Original line number Diff line number Diff line
*** Settings ***
Resource    NFVICapacityInformationKeywords.robot

*** Test Cases ***
POST Individual CCMs NFVI Capacity Information - Method not implemented
    [Documentation]    Test ID: 5.3.6.7.1
    ...    Test title: POST Individual CCMs NFVI Capacity Information - Method not implemented
    ...    Test objective: The objective is to test that POST method is not implemented
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.3a.3.1 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
    POST Individual CCMs NFVI Capacity Information
    Check HTTP Response Status Code Is    405
    
GET Information about an Individual CCMs NFVI Capacity Information
    [Documentation]    Test ID: 5.3.6.7.2
    ...    Test title: GET Information about an Individual CCMs NFVI Capacity Information
    ...    Test objective: The objective is to retrieve information about Individual CCMs NFVI Capacity Information
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.3a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
    GET Individual CCMs NFVI Capacity Information
    Check HTTP Response Status Code Is    200
    Check HTTP Response Body Json Schema Is    NfviCapacityInfo

GET Information about an Individual CCMs NFVI Capacity Information using filter query parameter
    [Documentation]    Test ID: 5.3.6.7.3
    ...    Test title: GET Information about an Individual CCMs NFVI Capacity Information using filter query parameter
    ...    Test objective: The objective is to retrieve information about Individual CCMs NFVI Capacity Information using filter query parameter
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.3a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
    GET Individual CCMs NFVI Capacity Information using filter
    Check HTTP Response Status Code Is    200
    Check HTTP Response Body Json Schema Is    NfviCapacityInfo
        
GET Information about an Individual CCMs NFVI Capacity Information - NOT FOUND
     [Documentation]    Test ID: 5.3.6.7.4
    ...    Test title: GET Information about an Individual CCMs NFVI Capacity Information - NOT FOUND
    ...    Test objective: The objective is to test that the retrieval of Individual CCMs NFVI Capacity Information fails when using an invalid resource identifier.
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.3a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFV-MANO
    ...    Applicability: none
    ...    Post-Conditions: none
    GET Individual CCMs NFVI Capacity Information with Invalid VIM ID
    Check HTTP Response Status Code Is    404
    Check HTTP Response Body Json Schema Is   ProblemDetails

PUT Individual CCMs NFVI Capacity Information - Method not implemented 
     [Documentation]    Test ID: 5.3.6.7.5
    ...    Test title: PUT Individual CCMs NFVI Capacity Information - Method not implemented
    ...    Test objective: The objective is to test that PUT method is not implemented
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.3a.3.3 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: VNF Snapshot Package not modified
    PUT Individual CCMs NFVI Capacity Information
    Check HTTP Response Status Code Is    405

PATCH Individual CCMs NFVI Capacity Information - Method Not implemented
    [Documentation]    Test ID: 5.3.6.7.6
    ...    Test title: PATCH Individual CCMs NFVI Capacity Information
    ...    Test objective: The objective is to test that PATCH method is not implemented
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.3a.3.4 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: VNF Snapshot Package modified
    PATCH Individual CCMs NFVI Capacity Information
    Check HTTP Response Status Code Is    405

DELETE Individual CCMs NFVI Capacity Information - Method Not implemented 
    [Documentation]    Test ID: 5.3.6.7.7
    ...    Test title: DELETE Individual CCMs NFVI Capacity Information - Method Not implemented
    ...    Test objective: The objective is to test that DELETE method is not implemented
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.3a.3.5 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: VNF Snapshot Package deleted
    DELETE Individual CCMs NFVI Capacity Information
    Check HTTP Response Status Code Is    405

GET Information about an Individual CCMs NFVI Capacity Information with permitted authorization scope
    [Documentation]    Test ID: 5.3.6.7.8
    ...    Test title: GET Information about an Individual CCMs NFVI Capacity Information with permitted authorization scope
    ...    Test objective: The objective is to retrieve information about Individual CCms NFVI Capacity Information with permitted authorization scope
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.3a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
    GET Individual CCMs NFVI Capacity Information with permitted authorization scope
    Check HTTP Response Status Code Is    200
    Check HTTP Response Body Json Schema Is    NfviCapacityInfo

GET Information about an Individual CCMs NFVI Capacity Information with not permitted authorization scope
    [Documentation]    Test ID: 5.3.6.7.9
    ...    Test title: GET Information about an Individual CCMs NFVI Capacity Information with not permitted authorization scope
    ...    Test objective: The objective is to test that retrieve information about Individual CCMs NFVI Capacity Information fails when using not permitted authorization scope
    ...    Pre-conditions: none
    ...    Reference: Clause 10.4.3a.3.2 - ETSI GS NFV-SOL 005 [3] v5.1.1
    ...    Config ID: Config_prod_NFVO
    ...    Applicability: none
    ...    Post-Conditions: none
    GET Individual CCMs NFVI Capacity Information with not permitted authorization scope
    Check HTTP Response Status Code Is    401
 No newline at end of file
Loading
Loading