diff options
17 files changed, 59 insertions, 575 deletions
diff --git a/plans/vfc-nfvo-lcm/sanity-check/testplan.txt b/plans/vfc-nfvo-lcm/sanity-check/testplan.txt index 2e0a32d5..90ea734f 100644 --- a/plans/vfc-nfvo-lcm/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-lcm/sanity-check/testplan.txt @@ -1,3 +1,3 @@ # Test suites are relative paths under [integration/csit.git]/tests/. -# Place the suites in run order. +# Place the suites in run order. vfc/nfvo-lcm/test.robot diff --git a/tests/vfc/nfvo-lcm/jsoninput/create_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/create_ns_instance.json index bed82d90..38201435 100644 --- a/tests/vfc/nfvo-lcm/jsoninput/create_ns_instance.json +++ b/tests/vfc/nfvo-lcm/jsoninput/create_ns_instance.json @@ -1,5 +1,6 @@ { - "nsdId": "23", - "nsName": "ns23", - "nsDescription": "ns23 desc" + "nsdId": "c9f0a95e-dea0-4698-96e5-5a79bc5a233d", + "nsName": "ns", + "nsDescription": "description", + "test": "test" }
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/create_pnf.json b/tests/vfc/nfvo-lcm/jsoninput/create_pnf.json deleted file mode 100644 index 282e0af2..00000000 --- a/tests/vfc/nfvo-lcm/jsoninput/create_pnf.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "pnfId": "123", - "pnfName": "pnf1", - "pnfdId": "456", - "pnfdInfoId": "011234", - "pnfProfileId": "456788", - "cpInfo": "cp info" -}
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/create_sfc.json b/tests/vfc/nfvo-lcm/jsoninput/create_sfc.json deleted file mode 100644 index e7fe0170..00000000 --- a/tests/vfc/nfvo-lcm/jsoninput/create_sfc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "fpindex": "123", - "nsInstanceId": "123", - "context": "create sfc", - "sdnControllerId": "123" -}
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/create_subscription.json b/tests/vfc/nfvo-lcm/jsoninput/create_subscription.json index 553d38ce..a3368974 100644 --- a/tests/vfc/nfvo-lcm/jsoninput/create_subscription.json +++ b/tests/vfc/nfvo-lcm/jsoninput/create_subscription.json @@ -1,54 +1,19 @@ { - "callbackUri": "/api/nslcm/v1/subscriptions", - "filter": { - "nsInstanceSubscriptionFilter": { - "nsdIds": [ - "3fa85f64-5717-4562-b3fc-2c963f66afa6" - ], - "vnfdIds": [ - "3fa85f64-5717-4562-b3fc-2c963f66afa6" - ], - "pnfdIds": [ - "3fa85f64-5717-4562-b3fc-2c963f66afa6" - ], - "nsInstanceIds": [ - "3fa85f64-5717-4562-b3fc-2c963f66afa6" - ], - "nsInstanceNames": [ - "ns1" - ] + "callbackUri": "http://aurl.com", + "authentication": { + "authType": ["BASIC"], + "paramsBasic": { + "username": "username", + "password": "password" + } }, - "notificationTypes": [ - "NsLcmOperationOccurrenceNotification" - ], - "operationTypes": [ - "INSTANTIATE" - ], - "operationStates": [ - "STARTING" - ], - "nsComponentTypes": [ - "VNF" - ], - "lcmOpNameImpactingNsComponent": [ - "VNF_INSTANTIATE" - ], - "lcmOpOccStatusImpactingNsComponent": [ - "START" - ] - }, - "authentication": { - "authType": [ - "BASIC" - ], - "paramsBasic": { - "userName": "test", - "password": "test" - }, - "paramsOauth2ClientCredentials": { - "clientId": "123", - "clientPassword": "test", - "tokenEndpoint": "test" + "filter": { + "notificationTypes": ["NsLcmOperationOccurrenceNotification"], + "operationTypes": [ + "INSTANTIATE" + ], + "operationStates": [ + "STARTING" + ] } - } }
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/heal_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/heal_ns_instance.json deleted file mode 100644 index d15d7373..00000000 --- a/tests/vfc/nfvo-lcm/jsoninput/heal_ns_instance.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "healVnfData": [ - { - "vnfInstanceId": "vnf123", - "cause": "string", - "additionalParams": { - "additionalProp1": { - "action": "action1", - "actionvminfo": { - "vmid": "vm123", - "vduid": "vdu123", - "vmname": "vmname1" - } - }, - "additionalProp2": { - "action": "action2", - "actionvminfo": { - "vmid": "vm456", - "vduid": "vdu456", - "vmname": "vmname456" - } - }, - "additionalProp3": { - "action": "action3", - "actionvminfo": { - "vmid": "vm789", - "vduid": "vdu789", - "vmname": "vmname789" - } - } - } - } - ], - "healNsData": { - "degreeHealing": "HEAL_RESTORE", - "actionsHealing": [ - "action for healing" - ], - "healScript": "script2", - "additionalParamsforNs": "additional info" - } -}
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns.json b/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns.json deleted file mode 100644 index 01ed3961..00000000 --- a/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "locationConstraints": [ - { - "vnfProfileId": "123", - "locationConstraints": { - "vimId": "vim123" - } - } - ], - "additionalParamForNs": { - "additionalProp1": "Prop1", - "additionalProp2": "Prop2", - "additionalProp3": "Prop3" - }, - "addpnfData": [ - { - "pnfId": "123", - "pnfName": "pdf123", - "pnfdId": "123", - "pnfProfileId": "123", - "cpData": [ - { - "cpInstanceId": "123", - "cpdId": "123", - "cpProtocolData": [ - { - "layerProtocol": "IP_OVER_ETHERNET", - "ipOverEthernet": { - "macAddress": "7C-76-35-4C-31-78", - "ipAddresses": [ - { - "type": "IPV4", - "fixedAddresses": [ - "192.168.43.10" - ], - "numDynamicAddresses": 0, - "addressRange": { - "minAddress": "192.168.253.0", - "maxAddress": "192.168.253.255" - }, - "subnetId": "255.255.255.0" - } - ] - } - } - ] - } - ] - } - ] -}
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns_instance.json deleted file mode 100644 index 75a19459..00000000 --- a/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns_instance.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "nsFlavourId": "nsFlavour123", - "sapData": [ - { - "sapdId": "23", - "sapName": "sap123", - "description": "sap desc", - "sapProtocolData": [ - { - "layerProtocol": "IP_OVER_ETHERNET", - "ipOverEthernet": { - "macAddress": "7C-76-35-4C-31-78", - "ipAddresses": [ - { - "type": "IPV4", - "fixedAddresses": [ - "192.168.43.12" - ], - "numDynamicAddresses": 0, - "addressRange": { - "minAddress": "192.168.253.0", - "maxAddress": "192.168.253.255" - }, - "subnetId": "255.255.255.0" - } - ] - } - } - ] - } - ], - "addpnfData": [ - { - "pnfId": "pnf123", - "pnfName": "pnfName123", - "pnfdId": "pnfd123", - "pnfProfileId": "pnfPro123", - "cpData": [ - { - "cpInstanceI16": { - "IdentifierInPnf": {} - }, - "cpdId": { - "IdentifierInNsd": {} - }, - "cpProtocolData": [ - { - "layerProtocol": "IP_OVER_ETHERNET", - "ipOverEthernet": { - "macAddress": "7C-76-35-4C-31-78", - "ipAddresses": [ - { - "type": "IPV4", - "fixedAddresses": [ - "192.168.43.15" - ], - "numDynamicAddresses": 0, - "addressRange": { - "minAddress": "192.168.43.0", - "maxAddress": "192.168.43.255" - }, - "subnetId": "255.255.255.0" - } - ] - } - } - ] - } - ] - } - ], - "vnfInstanceData": [ - { - "vnfInstanceId": "vnf123", - "vnfProfileId": "vnfPro123" - } - ], - "nestedNsInstanceId": [ - "nested123" - ], - "localizationLanguage": [ - { - "vnfProfileId": "string", - "locationConstraints": { - "countryCode": "460", - "civicAddressElement": [ - { - "caType": "type1", - "caValue": "123" - } - ] - } - } - ], - "additionalParamForNs": { - "additionalProp1": "nsProp1", - "additionalProp2": "nsProp2", - "additionalProp3": "nsProp3" - }, - "additionalParamsForVnf": [ - { - "vnfProfileId": "vnfPro456", - "additionalParams": { - "additionalProp1": "vnfProp1", - "additionalProp2": "vnfProp2", - "additionalProp3": "vnfProp3" - } - } - ], - "startTime": "2019-10-08T01:45:26.226Z", - "nsInstantiationLevelId": "345678", - "additionalAffinityOrAntiAffiniityRule": [ - { - "vnfdId": [ - "123" - ], - "vnfProfileId": [ - "456" - ], - "vnfInstanceId": [ - "789" - ], - "affinityOrAntiAffiinty": "AFFINITY", - "scope": "NFVI_POP" - } - ] -}
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/postdeal_ns.json b/tests/vfc/nfvo-lcm/jsoninput/postdeal_ns.json deleted file mode 100644 index c518885c..00000000 --- a/tests/vfc/nfvo-lcm/jsoninput/postdeal_ns.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "status": "ongoing" -}
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/scale_ns.json b/tests/vfc/nfvo-lcm/jsoninput/scale_ns.json index e7f729d8..de0a95e8 100644 --- a/tests/vfc/nfvo-lcm/jsoninput/scale_ns.json +++ b/tests/vfc/nfvo-lcm/jsoninput/scale_ns.json @@ -1,14 +1,12 @@ { - "scaleType": "ns", - "scaleNsData": [ - { - "scaleNsByStepsData": [ + "scaleType": "SCALE_NS", + "scaleNsData": [ { - "aspectId": "123", - "numberOfSteps": "3", - "scalingDirection": "north" + "scaleNsByStepsData": [{ + "aspectId": "1", + "numberOfSteps": 1, + "scalingDirection": "0" + }] } - ] - } - ] + ] }
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/scale_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/scale_ns_instance.json deleted file mode 100644 index 73d27f6e..00000000 --- a/tests/vfc/nfvo-lcm/jsoninput/scale_ns_instance.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "scaleType": "ns_instance", - "scaleNsData": [ - { - "vnfInstanceToBeAdded": [ - { - "vnfInstanceId": "vnf456", - "vnfProfileId": "vnfPro456" - } - ], - "vnfInstanceToBeRemoved": [ - "" - ], - "scaleNsByStepsData": { - "scalingDirection": "SCALE_IN", - "aspectId": "123", - "numberOfSteps": "2" - }, - "scaleNsToLevelData": { - "nsInstantiationLevel": "1", - "nsScaleInfo": [ - { - "nsScalingAspectId": "2", - "nsScaleLevelId": "3" - } - ] - }, - "additionalParamsForNs": { - "additionalProp1": "nsProp11", - "additionalProp2": "nsProp12", - "additionalProp3": "nsProp13" - }, - "additionalParamsForVnf": [ - { - "vnfProfileId": "string", - "additionalParams": { - "additionalProp1": "vnfProp11", - "additionalProp2": "vnfProp12", - "additionalProp3": "vnfProp13" - } - } - ], - "locationConstraints": [ - { - "vnfProfileId": "vnfPro789", - "locationConstraints": { - "countryCode": "460", - "civicAddressElement": [ - { - "caType": "type2", - "caValue": "789" - } - ] - } - } - ] - } - ] -}
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/terminate_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/terminate_ns_instance.json index d03830a9..0cb384b5 100644 --- a/tests/vfc/nfvo-lcm/jsoninput/terminate_ns_instance.json +++ b/tests/vfc/nfvo-lcm/jsoninput/terminate_ns_instance.json @@ -1,3 +1,3 @@ { - "terminationTime": "1602668880" + "terminationTime": "2020-03-25T09:10:35.610" }
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/terminate_vnf.json b/tests/vfc/nfvo-lcm/jsoninput/terminate_vnf.json index 9884b6ac..7cee8684 100644 --- a/tests/vfc/nfvo-lcm/jsoninput/terminate_vnf.json +++ b/tests/vfc/nfvo-lcm/jsoninput/terminate_vnf.json @@ -1,4 +1,4 @@ { - "terminationType": "vnf", - "gracefulTerminationTimeout": "3600" + "terminationType": "FORCEFUL", + "gracefulTerminationTimeout": "600" }
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/update_job_ns.json b/tests/vfc/nfvo-lcm/jsoninput/update_job_ns.json deleted file mode 100644 index 3682bcfb..00000000 --- a/tests/vfc/nfvo-lcm/jsoninput/update_job_ns.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "progress": "updating", - "desc": "update job des", - "errcode": "405" -}
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/jsoninput/update_ns.json b/tests/vfc/nfvo-lcm/jsoninput/update_ns.json index 2722b3a5..c71329f7 100644 --- a/tests/vfc/nfvo-lcm/jsoninput/update_ns.json +++ b/tests/vfc/nfvo-lcm/jsoninput/update_ns.json @@ -1,12 +1,9 @@ { - "updateType": "ADD_VNF", - "addVnfInstance": [ - { - "vnfInstanceId": "456", - "vnfProfileId": "456" - } - ], - "updateTime": { - "DateTime": {} - } -}
\ No newline at end of file + "updateType": "OPERATE_VNF", + "OperateVnfData": [{ + "vnfInstanceId": "test_vnf_001", + "changeStateTo": {"OperationalStates": "STOPPED"}, + "stopType": "GRACEFUL", + "gracefulStopTimeout": "2020-01-01" + }] +} diff --git a/tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json index 2722b3a5..417958b5 100644 --- a/tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json +++ b/tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json @@ -1,12 +1,9 @@ { "updateType": "ADD_VNF", - "addVnfInstance": [ - { - "vnfInstanceId": "456", - "vnfProfileId": "456" - } - ], - "updateTime": { - "DateTime": {} - } + "OperateVnfData": [{ + "vnfInstanceId": "test_vnf_001", + "changeStateTo": {"OperationalStates": "STOPPED"}, + "stopType": "GRACEFUL", + "gracefulStopTimeout": "2020-01-01" + }] }
\ No newline at end of file diff --git a/tests/vfc/nfvo-lcm/test.robot b/tests/vfc/nfvo-lcm/test.robot index 452392f9..8ce0adb2 100644 --- a/tests/vfc/nfvo-lcm/test.robot +++ b/tests/vfc/nfvo-lcm/test.robot @@ -5,13 +5,12 @@ Library RequestsLibrary Library OperatingSystem Library json Library HttpLibrary.HTTP +Library ONAPLibrary.Utilities *** Variables *** @{return_ok_list}= 200 201 202 204 ${queryswagger_url} /api/nslcm/v1/swagger.json -${create_ns_url} /api/nslcm/v1/ns -${delete_ns_url} /api/nslcm/v1/ns -${get_ns_url} /api/nslcm/v1/ns +${ns_url} /api/nslcm/v1/ns ${get_subscriptions_url} /api/nslcm/v1/subscriptions ${healthcheck_url} /api/nslcm/v1/health_check ${get_job_url} /api/nslcm/v1/jobs @@ -26,34 +25,23 @@ ${ns_instances_url} /api/nslcm/v1/ns_instances #json files ${create_ns_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/create_ns.json ${heal_ns_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/heal_ns.json -${instantiate_ns_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/instantiate_ns.json -${postdeal_ns_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/postdeal_ns.json ${scale_ns_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/scale_ns.json ${update_ns_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/update_ns.json ${terminate_ns_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/terminate_ns.json -${update_job_ns_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/update_job_ns.json ${create_vnf_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/create_vnf.json ${terminate_vnf_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/terminate_vnf.json ${create_vl_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/create_vl.json -${create_sfcs_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/create_sfc.json ${create_subscriptions_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/create_subscription.json -${create_pnfs_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/create_pnf.json ${create_ns_instance_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/create_ns_instance.json -${heal_ns_instance_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/heal_ns_instance.json -${instantiate_ns_instance_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/instantiate_ns_instance.json -${postdeal_ns_instance_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/postdeal_ns_instance.json -${scale_ns_instance_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/scale_ns_instance.json -${update_ns_instance_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json ${terminate_ns_instance_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/terminate_ns_instance.json +${update_ns_instance_json} ${SCRIPTS}/../tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json #global variables ${nsInstId} ${jobInstId} ${vnfInstId} ${vlInstId} -${sfcInstId} -${pnfId} ${nsInstanceId} *** Test Cases *** @@ -86,44 +74,13 @@ CreateNSTest ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} Set Request Body ${json_string} - ${resp}= Post Request web_session ${create_ns_url} ${json_string} + ${resp}= Post Request web_session ${ns_url} ${json_string} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} ${response_json} json.loads ${resp.content} ${nsInstId}= Convert To String ${response_json['nsInstanceId']} Set Global Variable ${nsInstId} -CreateSfcTest - [Documentation] Create sfc function test - ${json_value}= json_from_file ${create_sfcs_json} - Set To Dictionary ${json_value} nsInstanceId=${nsInstId} - ${json_string}= string_from_json ${json_value} - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${sfcs_url} ${json_string} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - ${response_json} json.loads ${resp.content} - ${sfcInstId}= Convert To String ${response_json['sfcInstId']} - Set Global Variable ${sfcInstId} - -QuerySfcTest - [Documentation] Query sfc function test - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Get Request web_session ${sfcs_url}/${sfcInstId} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - -DeleteSfcTest - [Documentation] Delete sfc function test - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Delete Request web_session ${sfcs_url}/${sfcInstId} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - CreateVnfTest [Documentation] Create vnf function test ${json_value}= json_from_file ${create_vnf_json} @@ -154,14 +111,14 @@ TerminateVnfTest ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} Set Request Body ${json_string} - ${resp}= Post Request web_session ${terminate_vnfs_url} ${json_string} + ${resp}= Post Request web_session ${terminate_vnfs_url}/${vnfInstId} ${json_string} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} CreateVlTest [Documentation] Create vl function test ${json_value}= json_from_file ${create_vl_json} - Set To Dictionary ${json_value} nsInstanceId=${nsInstId} + Set To Dictionary ${json_value} nsInstanceId=${nsInstId} ${json_string}= string_from_json ${json_value} ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} @@ -173,14 +130,6 @@ CreateVlTest ${vlInstId}= Convert To String ${response_json['vlId']} Set Global Variable ${vlInstId} -QueryVlTest - [Documentation] Query vl function test - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Get Request web_session ${vls_url}/${vlInstId} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - DeleteVlTest [Documentation] Delete vl function test ${headers} Create Dictionary Content-Type=application/json Accept=application/json @@ -189,25 +138,6 @@ DeleteVlTest ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} -InstantiateNSTest - [Documentation] Instantiate Ns function test - ${json_value}= json_from_file ${instantiate_ns_json} - ${json_string}= string_from_json ${json_value} - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${create_ns_url}/${nsInstId}/instantiate ${json_string} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - -QueryNSTest - [Documentation] Query Ns function test - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Get Request web_session ${get_ns_url}/${nsInstId} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - ScaleNSTest [Documentation] Scale Ns function test ${json_value}= json_from_file ${scale_ns_json} @@ -215,7 +145,7 @@ ScaleNSTest ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} Set Request Body ${json_string} - ${resp}= Post Request web_session ${create_ns_url}/${nsInstId}/scale ${json_string} + ${resp}= Post Request web_session ${ns_url}/${nsInstId}/scale ${json_string} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} @@ -226,25 +156,13 @@ HealNSTest ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} Set Request Body ${json_string} - ${resp}= Post Request web_session ${create_ns_url}/${nsInstId}/heal ${json_string} + ${resp}= Post Request web_session ${ns_url}/${nsInstId}/heal ${json_string} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} ${response_json} json.loads ${resp.content} ${jobInstId}= Convert To String ${response_json['jobId']} Set Global Variable ${jobInstId} -UpdateJobTest - [Documentation] Update Ns Job function test - ${json_value}= json_from_file ${update_job_ns_json} - ${json_string}= string_from_json ${json_value} - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${get_job_url}/${jobInstId} ${json_string} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - ${response_json} json.loads ${resp.content} - GetJobTest [Documentation] Query Ns Job function test ${headers} Create Dictionary Content-Type=application/json Accept=application/json @@ -253,26 +171,14 @@ GetJobTest ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} -PostdealNSTest - [Documentation] Postdeal Ns function test - ${json_value}= json_from_file ${postdeal_ns_json} - ${json_string}= string_from_json ${json_value} - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${create_ns_url}/${nsInstId}/postdeal ${json_string} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - UpdateNSTest [Documentation] Scale Ns function test ${json_value}= json_from_file ${update_ns_json} ${json_string}= string_from_json ${json_value} - Log ${json_string} ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} Set Request Body ${json_string} - ${resp}= Post Request web_session ${create_ns_url}/${nsInstId}/update ${json_string} + ${resp}= Post Request web_session ${ns_url}/${nsInstId}/update ${json_string} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} @@ -283,7 +189,7 @@ TerminateNSTest ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} Set Request Body ${json_string} - ${resp}= Post Request web_session ${create_ns_url}/${nsInstId}/terminate ${json_string} + ${resp}= Post Request web_session ${ns_url}/${nsInstId}/terminate ${json_string} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} @@ -291,7 +197,7 @@ DeleteNSTest [Documentation] Delete NS function test ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Delete Request web_session ${delete_ns_url}/${nsInstId} + ${resp}= Delete Request web_session ${ns_url}/${nsInstId} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} @@ -310,23 +216,9 @@ LcmGetNsTest [Documentation] get ns instances for nslcm by MSB ${headers} Create Dictionary Content-Type=application/json Accept=application/json Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Get Request web_session ${get_ns_url} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - -CreatePnfsTest - [Documentation] Create pnf function test - ${json_value}= json_from_file ${create_pnfs_json} - ${json_string}= string_from_json ${json_value} - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${pnfs_url} ${json_string} + ${resp}= Get Request web_session ${ns_url} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} - ${response_json} json.loads ${resp.content} - ${pnfId}= Convert To String ${response_json['pnfId']} - Set Global Variable ${pnfId} QueryAllPnfsTest [Documentation] Query all pnfs function test @@ -336,34 +228,18 @@ QueryAllPnfsTest ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} -QueryPnfsTest - [Documentation] Query pnf function test - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Get Request web_session ${pnfs_url}/${pnfId} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - -DeletePnfTest - [Documentation] Delete pnf function test - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Delete Request web_session ${pnfs_url}/${pnfId} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - CreateNSInstanceTest [Documentation] Create NS Instance function test ${json_value}= json_from_file ${create_ns_instance_json} ${json_string}= string_from_json ${json_value} - ${headers} Create Dictionary Content-Type=application/json Accept=application/json + ${headers} Create Dictionary Content-Type=application/json Accept=application/json globalcustomerid=global-customer-id-test1 servicetype=service-type-test1 Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} Set Request Body ${json_string} ${resp}= Post Request web_session ${ns_instances_url} ${json_string} ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} ${response_json} json.loads ${resp.content} - ${nsInstanceId}= Convert To String ${response_json['id']} + ${nsInstanceId}= Convert To String ${response_json['nsInstanceId']} Set Global Variable ${nsInstanceId} QueryNSInstancesTest @@ -374,47 +250,6 @@ QueryNSInstancesTest ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} -QueryNSIntanceTest - [Documentation] Query One Ns Instance function test - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Get Request web_session ${ns_instances_url}/${nsInstanceId} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - -InstantiateNSInstanceTest - [Documentation] Instantiate Ns function test - ${json_value}= json_from_file ${instantiate_ns_instance_json} - ${json_string}= string_from_json ${json_value} - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${ns_instances_url}/${nsInstanceId}/instantiate ${json_string} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - -ScaleNSInstanceTest - [Documentation] Scale Ns Instance function test - ${json_value}= json_from_file ${scale_ns_instance_json} - ${json_string}= string_from_json ${json_value} - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${ns_instances_url}/${nsInstanceId}/scale ${json_string} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - -HealNSInstanceTest - [Documentation] Heal Ns Instance function test - ${json_value}= json_from_file ${heal_ns_instance_json} - ${json_string}= string_from_json ${json_value} - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${ns_instances_url}/${nsInstanceId}/heal ${json_string} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - UpdateNSInstanceTest [Documentation] Scale Ns Instance function test ${json_value}= json_from_file ${update_ns_instance_json} @@ -438,14 +273,6 @@ TerminateNSInstanceTest ${responese_code}= Convert To String ${resp.status_code} List Should Contain Value ${return_ok_list} ${responese_code} -DeleteNSInstanceTest - [Documentation] Delete NS Instance function test - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Delete Request web_session ${ns_instances_url}/${nsInstanceId} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - LcmCreateSubscriptionsTest [Documentation] Postdeal Ns function test ${json_value}= json_from_file ${create_subscriptions_json} |