From a84c8a335a496627881401400b801de859efc9cb Mon Sep 17 00:00:00 2001 From: yangyan Date: Thu, 20 Feb 2020 18:01:26 +0800 Subject: Add test scripts of F version Change-Id: Id7508c41af929e1385f5ede99fd45cf9fcb84cae Issue-ID: VFC-1621 Signed-off-by: yangyan --- resources/testscripts/E-version/ns/Instructions | 24 +++++++++++ resources/testscripts/E-version/ns/msb_create.py | 21 ++++++++++ resources/testscripts/E-version/ns/msb_delete.py | 17 ++++++++ resources/testscripts/E-version/ns/msb_get.py | 14 +++++++ resources/testscripts/E-version/ns/msb_onboard.py | 22 ++++++++++ resources/testscripts/E-version/ns/msb_upload.py | 18 ++++++++ .../testscripts/E-version/ns_instance/Instrutions | 49 ++++++++++++++++++++++ .../testscripts/E-version/ns_instance/create.py | 30 +++++++++++++ .../testscripts/E-version/ns_instance/delete.py | 17 ++++++++ resources/testscripts/E-version/ns_instance/get.py | 14 +++++++ .../testscripts/E-version/ns_instance/get_one.py | 17 ++++++++ .../testscripts/E-version/ns_instance/instance.py | 35 ++++++++++++++++ .../testscripts/E-version/ns_instance/terminate.py | 27 ++++++++++++ resources/testscripts/E-version/vnf/Instructions | 24 +++++++++++ resources/testscripts/E-version/vnf/msb_create.py | 21 ++++++++++ resources/testscripts/E-version/vnf/msb_delete.py | 17 ++++++++ resources/testscripts/E-version/vnf/msb_get.py | 14 +++++++ resources/testscripts/E-version/vnf/msb_onboard.py | 21 ++++++++++ resources/testscripts/E-version/vnf/msb_upload.py | 18 ++++++++ resources/testscripts/F-version/ns/ns_create.py | 13 ++++++ resources/testscripts/F-version/ns/ns_delete.py | 8 ++++ resources/testscripts/F-version/ns/ns_get.py | 5 +++ resources/testscripts/F-version/ns/ns_get_one.py | 8 ++++ resources/testscripts/F-version/ns/ns_upload.py | 6 +++ .../testscripts/F-version/ns_instance/create.py | 22 ++++++++++ resources/testscripts/F-version/ns_instance/del.py | 6 +++ resources/testscripts/F-version/ns_instance/get.py | 5 +++ .../F-version/ns_instance/get_job_id.py | 9 ++++ .../testscripts/F-version/ns_instance/get_one.py | 7 ++++ .../testscripts/F-version/ns_instance/instance.py | 23 ++++++++++ .../testscripts/F-version/ns_instance/terminate.py | 19 +++++++++ resources/testscripts/F-version/vnf/vnf_create.py | 13 ++++++ resources/testscripts/F-version/vnf/vnf_delete.py | 8 ++++ resources/testscripts/F-version/vnf/vnf_get.py | 5 +++ resources/testscripts/F-version/vnf/vnf_get_one.py | 8 ++++ resources/testscripts/F-version/vnf/vnf_upload.py | 9 ++++ resources/testscripts/ns/Instructions | 24 ----------- resources/testscripts/ns/msb_create.py | 21 ---------- resources/testscripts/ns/msb_delete.py | 17 -------- resources/testscripts/ns/msb_get.py | 14 ------- resources/testscripts/ns/msb_onboard.py | 22 ---------- resources/testscripts/ns/msb_upload.py | 18 -------- resources/testscripts/ns_instance/Instrutions | 49 ---------------------- resources/testscripts/ns_instance/create.py | 30 ------------- resources/testscripts/ns_instance/delete.py | 17 -------- resources/testscripts/ns_instance/get.py | 14 ------- resources/testscripts/ns_instance/get_one.py | 17 -------- resources/testscripts/ns_instance/instance.py | 35 ---------------- resources/testscripts/ns_instance/terminate.py | 27 ------------ resources/testscripts/vnf/Instructions | 24 ----------- resources/testscripts/vnf/msb_create.py | 21 ---------- resources/testscripts/vnf/msb_delete.py | 17 -------- resources/testscripts/vnf/msb_get.py | 14 ------- resources/testscripts/vnf/msb_onboard.py | 21 ---------- resources/testscripts/vnf/msb_upload.py | 18 -------- 55 files changed, 594 insertions(+), 420 deletions(-) create mode 100644 resources/testscripts/E-version/ns/Instructions create mode 100644 resources/testscripts/E-version/ns/msb_create.py create mode 100644 resources/testscripts/E-version/ns/msb_delete.py create mode 100644 resources/testscripts/E-version/ns/msb_get.py create mode 100644 resources/testscripts/E-version/ns/msb_onboard.py create mode 100644 resources/testscripts/E-version/ns/msb_upload.py create mode 100644 resources/testscripts/E-version/ns_instance/Instrutions create mode 100644 resources/testscripts/E-version/ns_instance/create.py create mode 100644 resources/testscripts/E-version/ns_instance/delete.py create mode 100644 resources/testscripts/E-version/ns_instance/get.py create mode 100644 resources/testscripts/E-version/ns_instance/get_one.py create mode 100644 resources/testscripts/E-version/ns_instance/instance.py create mode 100644 resources/testscripts/E-version/ns_instance/terminate.py create mode 100644 resources/testscripts/E-version/vnf/Instructions create mode 100644 resources/testscripts/E-version/vnf/msb_create.py create mode 100644 resources/testscripts/E-version/vnf/msb_delete.py create mode 100644 resources/testscripts/E-version/vnf/msb_get.py create mode 100644 resources/testscripts/E-version/vnf/msb_onboard.py create mode 100644 resources/testscripts/E-version/vnf/msb_upload.py create mode 100644 resources/testscripts/F-version/ns/ns_create.py create mode 100644 resources/testscripts/F-version/ns/ns_delete.py create mode 100644 resources/testscripts/F-version/ns/ns_get.py create mode 100644 resources/testscripts/F-version/ns/ns_get_one.py create mode 100644 resources/testscripts/F-version/ns/ns_upload.py create mode 100644 resources/testscripts/F-version/ns_instance/create.py create mode 100644 resources/testscripts/F-version/ns_instance/del.py create mode 100644 resources/testscripts/F-version/ns_instance/get.py create mode 100644 resources/testscripts/F-version/ns_instance/get_job_id.py create mode 100644 resources/testscripts/F-version/ns_instance/get_one.py create mode 100644 resources/testscripts/F-version/ns_instance/instance.py create mode 100644 resources/testscripts/F-version/ns_instance/terminate.py create mode 100644 resources/testscripts/F-version/vnf/vnf_create.py create mode 100644 resources/testscripts/F-version/vnf/vnf_delete.py create mode 100644 resources/testscripts/F-version/vnf/vnf_get.py create mode 100644 resources/testscripts/F-version/vnf/vnf_get_one.py create mode 100644 resources/testscripts/F-version/vnf/vnf_upload.py delete mode 100644 resources/testscripts/ns/Instructions delete mode 100644 resources/testscripts/ns/msb_create.py delete mode 100644 resources/testscripts/ns/msb_delete.py delete mode 100644 resources/testscripts/ns/msb_get.py delete mode 100644 resources/testscripts/ns/msb_onboard.py delete mode 100644 resources/testscripts/ns/msb_upload.py delete mode 100644 resources/testscripts/ns_instance/Instrutions delete mode 100644 resources/testscripts/ns_instance/create.py delete mode 100644 resources/testscripts/ns_instance/delete.py delete mode 100644 resources/testscripts/ns_instance/get.py delete mode 100644 resources/testscripts/ns_instance/get_one.py delete mode 100644 resources/testscripts/ns_instance/instance.py delete mode 100644 resources/testscripts/ns_instance/terminate.py delete mode 100644 resources/testscripts/vnf/Instructions delete mode 100644 resources/testscripts/vnf/msb_create.py delete mode 100644 resources/testscripts/vnf/msb_delete.py delete mode 100644 resources/testscripts/vnf/msb_get.py delete mode 100644 resources/testscripts/vnf/msb_onboard.py delete mode 100644 resources/testscripts/vnf/msb_upload.py diff --git a/resources/testscripts/E-version/ns/Instructions b/resources/testscripts/E-version/ns/Instructions new file mode 100644 index 00000000..43333767 --- /dev/null +++ b/resources/testscripts/E-version/ns/Instructions @@ -0,0 +1,24 @@ + +# msb_create +The Python script in this folder is used to register ns to msb. +It mainly includes the creation, upload, query acquisition and deletion of msb. + +# msb_upload +When you execute the msb_create script, you get an ID. At this time, you open the msb_upload script, +change the file path to the path where you want to upload the ns CSAR package, +then execute the msb_upload script and place the ID after executing the command, +and the ID will be automatically passed in. + +# msb_onboard + +You can access the catalog interface by executing the script to implement the onboard of NS packages. + +# msb_get +If you want to query the registration status in msb, you can execute the msb_get script directly. + +# msb_delete +If you want to delete an MSB record, you can execute the msb_del script and put the ID generated +at the time of creation after execution of the command. + +Note: IP address for MSB service + MSB cannot be created repeatedly \ No newline at end of file diff --git a/resources/testscripts/E-version/ns/msb_create.py b/resources/testscripts/E-version/ns/msb_create.py new file mode 100644 index 00000000..64ad36c6 --- /dev/null +++ b/resources/testscripts/E-version/ns/msb_create.py @@ -0,0 +1,21 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import json +import httplib2 +ud_data = {'userDefinedData': {"key1": "value1"}} +headers = {'content-type': 'application/json', 'accept': 'application/json'} +http = httplib2.Http() +resp, resp_content = http.request('http://172.30.3.104:30280/api/nsd/v1/ns_descriptors', + method="POST", + body=json.dumps(ud_data), + headers=headers) +print(resp['status'], resp_content) diff --git a/resources/testscripts/E-version/ns/msb_delete.py b/resources/testscripts/E-version/ns/msb_delete.py new file mode 100644 index 00000000..5fd589f2 --- /dev/null +++ b/resources/testscripts/E-version/ns/msb_delete.py @@ -0,0 +1,17 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import requests +import sys +create_id = sys.argv[1] + +resp = requests.delete('http://10.12.5.131:30280/api/nsd/v1/ns_descriptors/' + create_id) +print(resp.status_code) diff --git a/resources/testscripts/E-version/ns/msb_get.py b/resources/testscripts/E-version/ns/msb_get.py new file mode 100644 index 00000000..5d2b65c1 --- /dev/null +++ b/resources/testscripts/E-version/ns/msb_get.py @@ -0,0 +1,14 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import requests +resp = requests.get('http://10.12.5.131:30280/api/nsd/v1/ns_descriptors') +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/E-version/ns/msb_onboard.py b/resources/testscripts/E-version/ns/msb_onboard.py new file mode 100644 index 00000000..6144cfd4 --- /dev/null +++ b/resources/testscripts/E-version/ns/msb_onboard.py @@ -0,0 +1,22 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import json +import httplib2 + +ud_data = {'csarId': 'f2f741d9-590e-40b9-9425-8f46f09e8bb6'} +headers = {'content-type': 'application/json', 'accept': 'application/json'} +http = httplib2.Http() +resp, resp_content = http.request('http://159.138.61.203:30280/api/catalog/v1/nspackages', + method="POST", + body=json.dumps(ud_data), + headers=headers) +print(resp['status'], resp_content) diff --git a/resources/testscripts/E-version/ns/msb_upload.py b/resources/testscripts/E-version/ns/msb_upload.py new file mode 100644 index 00000000..d9ee4a15 --- /dev/null +++ b/resources/testscripts/E-version/ns/msb_upload.py @@ -0,0 +1,18 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import requests +import sys +create_id = sys.argv[1] + +url = 'http://10.12.5.131:30280/api/nsd/v1/ns_descriptors/' + create_id + '/nsd_content' +resp = requests.put(url, files={'file': open(r"/home/ubuntu/test/test/ns/ns_vgw.csar", 'rb')}) +print(resp.status_code) diff --git a/resources/testscripts/E-version/ns_instance/Instrutions b/resources/testscripts/E-version/ns_instance/Instrutions new file mode 100644 index 00000000..265b1815 --- /dev/null +++ b/resources/testscripts/E-version/ns_instance/Instrutions @@ -0,0 +1,49 @@ +This process is ns instantiation process +When the NS and vnf packages are uploaded and the MSB is registered successfully. +the instantiation operation begins. +This process mainly includes ns creation, instantiation, information query acquisition, +instance termination and data deletion after termination. + +# create + +Prepare the data before instance creation according to your needs, +and replace the CSAR ID generated after uploading package management. +When the execution is completed, an instance ID and other data are returned. + +# instance + +This process also prepares the data according to the requirement of creating the instance itself, +returns the instance ID after executing the create script, +and then executes the script after executing the script command. At this point, +the instance ID will be passed into the script, and a series of instantiation operations will be started, +and the virtual machine will be created. + +# get + +If you want to get some data generated during instance creation, you can execute the script +The script can query all the instance information in the database. + +# get_one + +If you want to get some instance data during instance creation, you can execute the script +The script only queries the content of an instance information, +executes the script command and puts the created instance ID after the command, +then the query can be completed. + +# terminate + +After the instantiation process is successfully created, +if you want to terminate the instantiation, execute the script. +The virtual machine generated after the script execution will also stop, +as well as some data deletion, termination of services. +After the script command is executed, the instance ID needs to be added after the command. + +# delete + +Some data will remain after termination. Execute the script to clear the data in the database. +The instance ID is also required to execute this process. +The completion of this process indicates the end of an instance creation termination process. + +Note: IP address for MSB service + NS cannot be created repeatedly + Update test scripts of ns_instance diff --git a/resources/testscripts/E-version/ns_instance/create.py b/resources/testscripts/E-version/ns_instance/create.py new file mode 100644 index 00000000..ac1c793f --- /dev/null +++ b/resources/testscripts/E-version/ns_instance/create.py @@ -0,0 +1,30 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import json +import httplib2 + +data = { + "context": { + "globalCustomerId": "hpa_cust", + "serviceType": "vCPE" + }, + "csarId": "825f60e0-71c1-4288-8ada-cdb0a24f84dc", + "nsName": "vcpes", + "description": "description" +} +headers = {'content-type': 'application/json', 'accept': 'application/json'} +http = httplib2.Http() +resp, resp_content = http.request('http://10.12.5.131:30280/api/nslcm/v1/ns', + method="POST", + body=json.dumps(data), + headers=headers) +print(resp['status'], resp_content) diff --git a/resources/testscripts/E-version/ns_instance/delete.py b/resources/testscripts/E-version/ns_instance/delete.py new file mode 100644 index 00000000..0e699ac0 --- /dev/null +++ b/resources/testscripts/E-version/ns_instance/delete.py @@ -0,0 +1,17 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import requests +import sys + +inst_id = sys.argv[1] +resp = requests.delete('http://10.12.5.131:30280/api/nslcm/v1/ns/' + inst_id) +print(resp.status_code) diff --git a/resources/testscripts/E-version/ns_instance/get.py b/resources/testscripts/E-version/ns_instance/get.py new file mode 100644 index 00000000..d36ba142 --- /dev/null +++ b/resources/testscripts/E-version/ns_instance/get.py @@ -0,0 +1,14 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import requests +resp = requests.get('http://10.12.5.131:30280/api/nslcm/v1/ns') +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/E-version/ns_instance/get_one.py b/resources/testscripts/E-version/ns_instance/get_one.py new file mode 100644 index 00000000..5b588ea1 --- /dev/null +++ b/resources/testscripts/E-version/ns_instance/get_one.py @@ -0,0 +1,17 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import requests +import sys +inst_id = sys.argv[1] + +resp = requests.get('http://10.12.5.131:30280/api/nslcm/v1/ns/' + inst_id) +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/E-version/ns_instance/instance.py b/resources/testscripts/E-version/ns_instance/instance.py new file mode 100644 index 00000000..f2e29ffc --- /dev/null +++ b/resources/testscripts/E-version/ns_instance/instance.py @@ -0,0 +1,35 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import json +import httplib2 +import sys +inst_id = sys.argv[1] + +data = { + "additionalParamForNs": { + "sdnControllerId": "2" + }, + "locationConstraints": [{ + "vnfProfileId": "b1bb0ce7-2222-4fa7-95ed-4840d70a1177", + "locationConstraints": { + "vimId": "CloudOwner_ONAP-POD-01-Rail-07" + } + }] +} + +headers = {'content-type': 'application/json', 'accept': 'application/json'} +http = httplib2.Http() +resp, resp_content = http.request('http://10.12.5.131:30280/api/nslcm/v1/ns/' + inst_id + '/instantiate', + method="POST", + body=json.dumps(data), + headers=headers) +print(resp['status'], resp_content) diff --git a/resources/testscripts/E-version/ns_instance/terminate.py b/resources/testscripts/E-version/ns_instance/terminate.py new file mode 100644 index 00000000..21ffd81a --- /dev/null +++ b/resources/testscripts/E-version/ns_instance/terminate.py @@ -0,0 +1,27 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import json +import httplib2 +import sys +inst_data = sys.argv[1] + +data = { + "gracefulTerminationTimeout": 600, + "terminationType": "FORCEFUL" +} +headers = {'content-type': 'application/json', 'accept': 'application/json'} +http = httplib2.Http() +resp, resp_content = http.request('http://10.12.5.131:30280/api/nslcm/v1/ns/' + inst_data + '/terminate', + method="POST", + body=json.dumps(data), + headers=headers) +print(resp['status'], resp_content) diff --git a/resources/testscripts/E-version/vnf/Instructions b/resources/testscripts/E-version/vnf/Instructions new file mode 100644 index 00000000..5b0c1c29 --- /dev/null +++ b/resources/testscripts/E-version/vnf/Instructions @@ -0,0 +1,24 @@ + +# msb_create +The Python script in this folder is used to register vnf to msb. +It mainly includes the creation, upload, query acquisition and deletion of msb. + +# msb_upload +When the msb_create script is executed, an ID is obtained. +At this time, the msb_upload script is opened, the file path is changed to the path of the CSAR package +you want to upload vnf. Then the msb_upload script is executed and the ID is placed after the +command is executed, and the ID is automatically passed in. + +# msb_onboard +You can access the catalog interface by executing the script to implement the onboard of VNF packages. + + +# msb_get +If you want to query the registration status in msb, you can execute the msb_get script directly. + +# msb_delete +If you want to delete an MSB record, you can execute the msb_del script and put the ID +generated at the time of creation after execution of the command. + +Note: IP address for MSB service + MSB cannot be created repeatedly \ No newline at end of file diff --git a/resources/testscripts/E-version/vnf/msb_create.py b/resources/testscripts/E-version/vnf/msb_create.py new file mode 100644 index 00000000..62533d17 --- /dev/null +++ b/resources/testscripts/E-version/vnf/msb_create.py @@ -0,0 +1,21 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import json +import httplib2 +ud_data = {'userDefinedData': {"key2": "value2"}} +headers = {'content-type': 'application/json', 'accept': 'application/json'} +http = httplib2.Http() +resp, resp_content = http.request('http://10.12.5.131:30280/api/vnfpkgm/v1/vnf_packages', + method="POST", + body=json.dumps(ud_data), + headers=headers) +print(resp['status'], resp_content) diff --git a/resources/testscripts/E-version/vnf/msb_delete.py b/resources/testscripts/E-version/vnf/msb_delete.py new file mode 100644 index 00000000..33b3ff0a --- /dev/null +++ b/resources/testscripts/E-version/vnf/msb_delete.py @@ -0,0 +1,17 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import requests +import sys +create_id = sys.argv[1] + +resp = requests.delete('http://10.12.5.131:30280/api/vnfpkgm/v1/vnf_packages/' + create_id) +print(resp.status_code) diff --git a/resources/testscripts/E-version/vnf/msb_get.py b/resources/testscripts/E-version/vnf/msb_get.py new file mode 100644 index 00000000..486bc66c --- /dev/null +++ b/resources/testscripts/E-version/vnf/msb_get.py @@ -0,0 +1,14 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import requests +resp = requests.get('http://10.12.5.131:30280/api/vnfpkgm/v1/vnf_packages') +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/E-version/vnf/msb_onboard.py b/resources/testscripts/E-version/vnf/msb_onboard.py new file mode 100644 index 00000000..18c7a9ee --- /dev/null +++ b/resources/testscripts/E-version/vnf/msb_onboard.py @@ -0,0 +1,21 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import json +import httplib2 +ud_data = {'csarId': '20c28260-5078-4729-847f-f8b0a3bff8d9'} +headers = {'content-type': 'application/json', 'accept': 'application/json'} +http = httplib2.Http() +resp, resp_content = http.request('http://159.138.61.203:30280/api/catalog/v1/vnfpackages', + method="POST", + body=json.dumps(ud_data), + headers=headers) +print(resp['status'], resp_content) diff --git a/resources/testscripts/E-version/vnf/msb_upload.py b/resources/testscripts/E-version/vnf/msb_upload.py new file mode 100644 index 00000000..1575aaf7 --- /dev/null +++ b/resources/testscripts/E-version/vnf/msb_upload.py @@ -0,0 +1,18 @@ +# Copyright (c) 2019, CMCC Technologies Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License") +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import requests +import sys +create_id = sys.argv[1] + +url = 'http://10.12.5.131:30280/api/vnfpkgm/v1/vnf_packages/' + create_id + '/package_content' +resp = requests.put(url, files={'file': open(r"/home/ubuntu/test/test/vnf/vgw.csar", 'rb')}) +print(resp.status_code) diff --git a/resources/testscripts/F-version/ns/ns_create.py b/resources/testscripts/F-version/ns/ns_create.py new file mode 100644 index 00000000..32f39f5b --- /dev/null +++ b/resources/testscripts/F-version/ns/ns_create.py @@ -0,0 +1,13 @@ +import json +import httplib2 + +full_url = 'https://192.168.235.89:30283/api/nsd/v1/ns_descriptors' +ud_data = {'userDefinedData': {"key2": "value2"}} +headers = {'content-type': 'application/json', 'accept': 'application/json'} +ca_certs = None +auth_type = "rest_no_auth" +http = httplib2.Http(ca_certs=ca_certs, disable_ssl_certificate_validation=(auth_type == "rest_no_auth")) +http.follow_all_redirects = True +resp, resp_content = http.request(full_url, method="POST", body=json.dumps(ud_data), headers=headers) +resp_status, resp_body = resp['status'], resp_content +print(resp_status, resp_body) diff --git a/resources/testscripts/F-version/ns/ns_delete.py b/resources/testscripts/F-version/ns/ns_delete.py new file mode 100644 index 00000000..aa3eb2b5 --- /dev/null +++ b/resources/testscripts/F-version/ns/ns_delete.py @@ -0,0 +1,8 @@ +import requests +import sys + +id = sys.argv[1] + +requests.packages.urllib3.disable_warnings() +resp = requests.delete('https://192.168.235.89:30283/api/nsd/v1/ns_descriptors/' + id, verify=False) +print(resp.status_code) diff --git a/resources/testscripts/F-version/ns/ns_get.py b/resources/testscripts/F-version/ns/ns_get.py new file mode 100644 index 00000000..2ecb31bf --- /dev/null +++ b/resources/testscripts/F-version/ns/ns_get.py @@ -0,0 +1,5 @@ +import requests + +requests.packages.urllib3.disable_warnings() +resp = requests.get('https://192.168.235.89:30283/api/nsd/v1/ns_descriptors', verify=False) +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/F-version/ns/ns_get_one.py b/resources/testscripts/F-version/ns/ns_get_one.py new file mode 100644 index 00000000..c4c484cd --- /dev/null +++ b/resources/testscripts/F-version/ns/ns_get_one.py @@ -0,0 +1,8 @@ +import requests +import sys + +id = sys.argv[1] + +requests.packages.urllib3.disable_warnings() +resp = requests.get('https://192.168.235.89:30283/api/nsd/v1/ns_descriptors/' + id, verify=False) +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/F-version/ns/ns_upload.py b/resources/testscripts/F-version/ns/ns_upload.py new file mode 100644 index 00000000..f91c80b3 --- /dev/null +++ b/resources/testscripts/F-version/ns/ns_upload.py @@ -0,0 +1,6 @@ +import requests + +requests.packages.urllib3.disable_warnings() +url = 'https://192.168.235.89:30283/api/nsd/v1/ns_descriptors/84090010-6e67-4536-81cc-61ae7b0b4ecd/nsd_content' +resp = requests.put(url, files={'file': open(r"C:\Users\86187\Desktop\vfc-tests\ns\ns-new\ns_vgw.csar", 'rb')}, verify=False) +print(resp.status_code) diff --git a/resources/testscripts/F-version/ns_instance/create.py b/resources/testscripts/F-version/ns_instance/create.py new file mode 100644 index 00000000..e3fa51ef --- /dev/null +++ b/resources/testscripts/F-version/ns_instance/create.py @@ -0,0 +1,22 @@ +import json +import httplib2 + +data = { + "context": { + "globalCustomerId": "global-customer-id-test1", + "serviceType": "service-type-test1" + }, + "csarId": "d5d678dc-80ef-461e-8630-d105f43b0a18", + "nsName": "ns_vsn", + "description": "description" +} + +full_url = 'https://192.168.235.89:30283/api/nslcm/v1/ns' +headers = {'content-type': 'application/json', 'accept': 'application/json'} +ca_certs = None +auth_type = "rest_no_auth" +http = httplib2.Http(ca_certs=ca_certs, disable_ssl_certificate_validation=(auth_type == "rest_no_auth")) +http.follow_all_redirects = True +resp, resp_content = http.request(full_url, method="POST", body=json.dumps(data), headers=headers) +headers = {'content-type': 'application/json', 'accept': 'application/json'} +print(resp['status'], resp_content) diff --git a/resources/testscripts/F-version/ns_instance/del.py b/resources/testscripts/F-version/ns_instance/del.py new file mode 100644 index 00000000..04e3b2e5 --- /dev/null +++ b/resources/testscripts/F-version/ns_instance/del.py @@ -0,0 +1,6 @@ +import requests +import sys + +id = sys.argv[1] +resp = requests.delete('https://192.168.235.89:30283/api/nslcm/v1/ns/' + id, verify=False) +print(resp.status_code) diff --git a/resources/testscripts/F-version/ns_instance/get.py b/resources/testscripts/F-version/ns_instance/get.py new file mode 100644 index 00000000..ab741c35 --- /dev/null +++ b/resources/testscripts/F-version/ns_instance/get.py @@ -0,0 +1,5 @@ +import requests + +requests.packages.urllib3.disable_warnings() +resp = requests.get('https://192.168.235.89:30283/api/nslcm/v1/ns', verify=False) +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/F-version/ns_instance/get_job_id.py b/resources/testscripts/F-version/ns_instance/get_job_id.py new file mode 100644 index 00000000..4fbf7c90 --- /dev/null +++ b/resources/testscripts/F-version/ns_instance/get_job_id.py @@ -0,0 +1,9 @@ +import requests +import sys + +requests.packages.urllib3.disable_warnings() +jobId = '1' +if len(sys.argv) > 1: + jobId = sys.argv[1] +resp = requests.get('https://192.168.235.89:30283/api/nslcm/v1/jobs/%s' % jobId, verify=False) +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/F-version/ns_instance/get_one.py b/resources/testscripts/F-version/ns_instance/get_one.py new file mode 100644 index 00000000..63de7d52 --- /dev/null +++ b/resources/testscripts/F-version/ns_instance/get_one.py @@ -0,0 +1,7 @@ +import requests +import sys + +id = sys.argv[1] +requests.packages.urllib3.disable_warnings() +resp = requests.get('https://192.168.235.89:30283/api/nslcm/v1/ns/' + id, verify=False) +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/F-version/ns_instance/instance.py b/resources/testscripts/F-version/ns_instance/instance.py new file mode 100644 index 00000000..43e81e8b --- /dev/null +++ b/resources/testscripts/F-version/ns_instance/instance.py @@ -0,0 +1,23 @@ +import json +import httplib2 +import sys +ns_instance_Id = sys.argv[1] +data = { + "additionalParamForNs": { + "sdnControllerId": "2" + }, + "locationConstraints": [{ + "vnfProfileId": "45711f40-3f43-415b-bb45-46e5c6940735", + "locationConstraints": { + "vimId": "CPE-DC_RegionOne" + } + }] +} +headers = {'content-type': 'application/json', 'accept': 'application/json'} +ca_certs = None +auth_type = "rest_no_auth" +http = httplib2.Http(ca_certs=ca_certs, disable_ssl_certificate_validation=(auth_type == "rest_no_auth")) +http.follow_all_redirects = True +resp, resp_content = http.request('https://192.168.235.89:30283/api/nslcm/v1/ns/' + ns_instance_Id + '/instantiate', + method="POST", body=json.dumps(data), headers=headers) +print(resp['status'], resp_content) diff --git a/resources/testscripts/F-version/ns_instance/terminate.py b/resources/testscripts/F-version/ns_instance/terminate.py new file mode 100644 index 00000000..9d214c8c --- /dev/null +++ b/resources/testscripts/F-version/ns_instance/terminate.py @@ -0,0 +1,19 @@ +import json +import httplib2 +import sys + +id = sys.argv[1] +data = { + "gracefulTerminationTimeout": 600, + "terminationType": "FORCEFUL" +} +headers = {'content-type': 'application/json', 'accept': 'application/json'} +ca_certs = None +auth_type = "rest_no_auth" +http = httplib2.Http(ca_certs=ca_certs, disable_ssl_certificate_validation=(auth_type == "rest_no_auth")) +http.follow_all_redirects = True +resp, resp_content = http.request('https://192.168.235.89:30283/api/nslcm/v1/ns/' + id + '/terminate', + method="POST", + body=json.dumps(data), + headers=headers) +print(resp['status'], resp_content) diff --git a/resources/testscripts/F-version/vnf/vnf_create.py b/resources/testscripts/F-version/vnf/vnf_create.py new file mode 100644 index 00000000..1bc9e391 --- /dev/null +++ b/resources/testscripts/F-version/vnf/vnf_create.py @@ -0,0 +1,13 @@ +import json +import httplib2 + +full_url = 'https://192.168.235.89:30283/api/vnfpkgm/v1/vnf_packages' +ud_data = {'userDefinedData': {"key2": "value2"}} +headers = {'content-type': 'application/json', 'accept': 'application/json'} +ca_certs = None +auth_type = "rest_no_auth" +http = httplib2.Http(ca_certs=ca_certs, disable_ssl_certificate_validation=(auth_type == "rest_no_auth")) +http.follow_all_redirects = True +resp, resp_content = http.request(full_url, method="POST", body=json.dumps(ud_data), headers=headers) +resp_status, resp_body = resp['status'], resp_content +print(resp_status, resp_body) diff --git a/resources/testscripts/F-version/vnf/vnf_delete.py b/resources/testscripts/F-version/vnf/vnf_delete.py new file mode 100644 index 00000000..cd85ddf8 --- /dev/null +++ b/resources/testscripts/F-version/vnf/vnf_delete.py @@ -0,0 +1,8 @@ +import requests +import sys + +id = sys.argv[1] + +requests.packages.urllib3.disable_warnings() +resp = requests.delete('https://192.168.235.89:30283/api/vnfpkgm/v1/vnf_packages/' + id, verify=False) +print(resp.status_code) diff --git a/resources/testscripts/F-version/vnf/vnf_get.py b/resources/testscripts/F-version/vnf/vnf_get.py new file mode 100644 index 00000000..107b7dd8 --- /dev/null +++ b/resources/testscripts/F-version/vnf/vnf_get.py @@ -0,0 +1,5 @@ +import requests + +requests.packages.urllib3.disable_warnings() +resp = requests.get('https://192.168.235.89:30283/api/vnfpkgm/v1/vnf_packages', verify=False) +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/F-version/vnf/vnf_get_one.py b/resources/testscripts/F-version/vnf/vnf_get_one.py new file mode 100644 index 00000000..56998fdf --- /dev/null +++ b/resources/testscripts/F-version/vnf/vnf_get_one.py @@ -0,0 +1,8 @@ +import requests +import sys + +id = sys.argv[1] + +requests.packages.urllib3.disable_warnings() +resp = requests.get('https://192.168.235.89:30283/api/vnfpkgm/v1/vnf_packages/' + id, verify=False) +print(resp.status_code, resp.json()) diff --git a/resources/testscripts/F-version/vnf/vnf_upload.py b/resources/testscripts/F-version/vnf/vnf_upload.py new file mode 100644 index 00000000..074f298c --- /dev/null +++ b/resources/testscripts/F-version/vnf/vnf_upload.py @@ -0,0 +1,9 @@ +import requests +import sys + +id = sys.argv[1] + +requests.packages.urllib3.disable_warnings() +url = 'https://192.168.235.89:30283/api/vnfpkgm/v1/vnf_packages/' + id + '/package_content' +resp = requests.put(url, files={'file': open(r"C:\Users\86187\Desktop\vfc-tests\vgw.csar", 'rb')}, verify=False) +print(resp.status_code) diff --git a/resources/testscripts/ns/Instructions b/resources/testscripts/ns/Instructions deleted file mode 100644 index 43333767..00000000 --- a/resources/testscripts/ns/Instructions +++ /dev/null @@ -1,24 +0,0 @@ - -# msb_create -The Python script in this folder is used to register ns to msb. -It mainly includes the creation, upload, query acquisition and deletion of msb. - -# msb_upload -When you execute the msb_create script, you get an ID. At this time, you open the msb_upload script, -change the file path to the path where you want to upload the ns CSAR package, -then execute the msb_upload script and place the ID after executing the command, -and the ID will be automatically passed in. - -# msb_onboard - -You can access the catalog interface by executing the script to implement the onboard of NS packages. - -# msb_get -If you want to query the registration status in msb, you can execute the msb_get script directly. - -# msb_delete -If you want to delete an MSB record, you can execute the msb_del script and put the ID generated -at the time of creation after execution of the command. - -Note: IP address for MSB service - MSB cannot be created repeatedly \ No newline at end of file diff --git a/resources/testscripts/ns/msb_create.py b/resources/testscripts/ns/msb_create.py deleted file mode 100644 index 64ad36c6..00000000 --- a/resources/testscripts/ns/msb_create.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import json -import httplib2 -ud_data = {'userDefinedData': {"key1": "value1"}} -headers = {'content-type': 'application/json', 'accept': 'application/json'} -http = httplib2.Http() -resp, resp_content = http.request('http://172.30.3.104:30280/api/nsd/v1/ns_descriptors', - method="POST", - body=json.dumps(ud_data), - headers=headers) -print(resp['status'], resp_content) diff --git a/resources/testscripts/ns/msb_delete.py b/resources/testscripts/ns/msb_delete.py deleted file mode 100644 index 5fd589f2..00000000 --- a/resources/testscripts/ns/msb_delete.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import requests -import sys -create_id = sys.argv[1] - -resp = requests.delete('http://10.12.5.131:30280/api/nsd/v1/ns_descriptors/' + create_id) -print(resp.status_code) diff --git a/resources/testscripts/ns/msb_get.py b/resources/testscripts/ns/msb_get.py deleted file mode 100644 index 5d2b65c1..00000000 --- a/resources/testscripts/ns/msb_get.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import requests -resp = requests.get('http://10.12.5.131:30280/api/nsd/v1/ns_descriptors') -print(resp.status_code, resp.json()) diff --git a/resources/testscripts/ns/msb_onboard.py b/resources/testscripts/ns/msb_onboard.py deleted file mode 100644 index 6144cfd4..00000000 --- a/resources/testscripts/ns/msb_onboard.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import json -import httplib2 - -ud_data = {'csarId': 'f2f741d9-590e-40b9-9425-8f46f09e8bb6'} -headers = {'content-type': 'application/json', 'accept': 'application/json'} -http = httplib2.Http() -resp, resp_content = http.request('http://159.138.61.203:30280/api/catalog/v1/nspackages', - method="POST", - body=json.dumps(ud_data), - headers=headers) -print(resp['status'], resp_content) diff --git a/resources/testscripts/ns/msb_upload.py b/resources/testscripts/ns/msb_upload.py deleted file mode 100644 index d9ee4a15..00000000 --- a/resources/testscripts/ns/msb_upload.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import requests -import sys -create_id = sys.argv[1] - -url = 'http://10.12.5.131:30280/api/nsd/v1/ns_descriptors/' + create_id + '/nsd_content' -resp = requests.put(url, files={'file': open(r"/home/ubuntu/test/test/ns/ns_vgw.csar", 'rb')}) -print(resp.status_code) diff --git a/resources/testscripts/ns_instance/Instrutions b/resources/testscripts/ns_instance/Instrutions deleted file mode 100644 index 265b1815..00000000 --- a/resources/testscripts/ns_instance/Instrutions +++ /dev/null @@ -1,49 +0,0 @@ -This process is ns instantiation process -When the NS and vnf packages are uploaded and the MSB is registered successfully. -the instantiation operation begins. -This process mainly includes ns creation, instantiation, information query acquisition, -instance termination and data deletion after termination. - -# create - -Prepare the data before instance creation according to your needs, -and replace the CSAR ID generated after uploading package management. -When the execution is completed, an instance ID and other data are returned. - -# instance - -This process also prepares the data according to the requirement of creating the instance itself, -returns the instance ID after executing the create script, -and then executes the script after executing the script command. At this point, -the instance ID will be passed into the script, and a series of instantiation operations will be started, -and the virtual machine will be created. - -# get - -If you want to get some data generated during instance creation, you can execute the script -The script can query all the instance information in the database. - -# get_one - -If you want to get some instance data during instance creation, you can execute the script -The script only queries the content of an instance information, -executes the script command and puts the created instance ID after the command, -then the query can be completed. - -# terminate - -After the instantiation process is successfully created, -if you want to terminate the instantiation, execute the script. -The virtual machine generated after the script execution will also stop, -as well as some data deletion, termination of services. -After the script command is executed, the instance ID needs to be added after the command. - -# delete - -Some data will remain after termination. Execute the script to clear the data in the database. -The instance ID is also required to execute this process. -The completion of this process indicates the end of an instance creation termination process. - -Note: IP address for MSB service - NS cannot be created repeatedly - Update test scripts of ns_instance diff --git a/resources/testscripts/ns_instance/create.py b/resources/testscripts/ns_instance/create.py deleted file mode 100644 index ac1c793f..00000000 --- a/resources/testscripts/ns_instance/create.py +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import json -import httplib2 - -data = { - "context": { - "globalCustomerId": "hpa_cust", - "serviceType": "vCPE" - }, - "csarId": "825f60e0-71c1-4288-8ada-cdb0a24f84dc", - "nsName": "vcpes", - "description": "description" -} -headers = {'content-type': 'application/json', 'accept': 'application/json'} -http = httplib2.Http() -resp, resp_content = http.request('http://10.12.5.131:30280/api/nslcm/v1/ns', - method="POST", - body=json.dumps(data), - headers=headers) -print(resp['status'], resp_content) diff --git a/resources/testscripts/ns_instance/delete.py b/resources/testscripts/ns_instance/delete.py deleted file mode 100644 index 0e699ac0..00000000 --- a/resources/testscripts/ns_instance/delete.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import requests -import sys - -inst_id = sys.argv[1] -resp = requests.delete('http://10.12.5.131:30280/api/nslcm/v1/ns/' + inst_id) -print(resp.status_code) diff --git a/resources/testscripts/ns_instance/get.py b/resources/testscripts/ns_instance/get.py deleted file mode 100644 index d36ba142..00000000 --- a/resources/testscripts/ns_instance/get.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import requests -resp = requests.get('http://10.12.5.131:30280/api/nslcm/v1/ns') -print(resp.status_code, resp.json()) diff --git a/resources/testscripts/ns_instance/get_one.py b/resources/testscripts/ns_instance/get_one.py deleted file mode 100644 index 5b588ea1..00000000 --- a/resources/testscripts/ns_instance/get_one.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import requests -import sys -inst_id = sys.argv[1] - -resp = requests.get('http://10.12.5.131:30280/api/nslcm/v1/ns/' + inst_id) -print(resp.status_code, resp.json()) diff --git a/resources/testscripts/ns_instance/instance.py b/resources/testscripts/ns_instance/instance.py deleted file mode 100644 index f2e29ffc..00000000 --- a/resources/testscripts/ns_instance/instance.py +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import json -import httplib2 -import sys -inst_id = sys.argv[1] - -data = { - "additionalParamForNs": { - "sdnControllerId": "2" - }, - "locationConstraints": [{ - "vnfProfileId": "b1bb0ce7-2222-4fa7-95ed-4840d70a1177", - "locationConstraints": { - "vimId": "CloudOwner_ONAP-POD-01-Rail-07" - } - }] -} - -headers = {'content-type': 'application/json', 'accept': 'application/json'} -http = httplib2.Http() -resp, resp_content = http.request('http://10.12.5.131:30280/api/nslcm/v1/ns/' + inst_id + '/instantiate', - method="POST", - body=json.dumps(data), - headers=headers) -print(resp['status'], resp_content) diff --git a/resources/testscripts/ns_instance/terminate.py b/resources/testscripts/ns_instance/terminate.py deleted file mode 100644 index 21ffd81a..00000000 --- a/resources/testscripts/ns_instance/terminate.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import json -import httplib2 -import sys -inst_data = sys.argv[1] - -data = { - "gracefulTerminationTimeout": 600, - "terminationType": "FORCEFUL" -} -headers = {'content-type': 'application/json', 'accept': 'application/json'} -http = httplib2.Http() -resp, resp_content = http.request('http://10.12.5.131:30280/api/nslcm/v1/ns/' + inst_data + '/terminate', - method="POST", - body=json.dumps(data), - headers=headers) -print(resp['status'], resp_content) diff --git a/resources/testscripts/vnf/Instructions b/resources/testscripts/vnf/Instructions deleted file mode 100644 index 5b0c1c29..00000000 --- a/resources/testscripts/vnf/Instructions +++ /dev/null @@ -1,24 +0,0 @@ - -# msb_create -The Python script in this folder is used to register vnf to msb. -It mainly includes the creation, upload, query acquisition and deletion of msb. - -# msb_upload -When the msb_create script is executed, an ID is obtained. -At this time, the msb_upload script is opened, the file path is changed to the path of the CSAR package -you want to upload vnf. Then the msb_upload script is executed and the ID is placed after the -command is executed, and the ID is automatically passed in. - -# msb_onboard -You can access the catalog interface by executing the script to implement the onboard of VNF packages. - - -# msb_get -If you want to query the registration status in msb, you can execute the msb_get script directly. - -# msb_delete -If you want to delete an MSB record, you can execute the msb_del script and put the ID -generated at the time of creation after execution of the command. - -Note: IP address for MSB service - MSB cannot be created repeatedly \ No newline at end of file diff --git a/resources/testscripts/vnf/msb_create.py b/resources/testscripts/vnf/msb_create.py deleted file mode 100644 index 62533d17..00000000 --- a/resources/testscripts/vnf/msb_create.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import json -import httplib2 -ud_data = {'userDefinedData': {"key2": "value2"}} -headers = {'content-type': 'application/json', 'accept': 'application/json'} -http = httplib2.Http() -resp, resp_content = http.request('http://10.12.5.131:30280/api/vnfpkgm/v1/vnf_packages', - method="POST", - body=json.dumps(ud_data), - headers=headers) -print(resp['status'], resp_content) diff --git a/resources/testscripts/vnf/msb_delete.py b/resources/testscripts/vnf/msb_delete.py deleted file mode 100644 index 33b3ff0a..00000000 --- a/resources/testscripts/vnf/msb_delete.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import requests -import sys -create_id = sys.argv[1] - -resp = requests.delete('http://10.12.5.131:30280/api/vnfpkgm/v1/vnf_packages/' + create_id) -print(resp.status_code) diff --git a/resources/testscripts/vnf/msb_get.py b/resources/testscripts/vnf/msb_get.py deleted file mode 100644 index 486bc66c..00000000 --- a/resources/testscripts/vnf/msb_get.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import requests -resp = requests.get('http://10.12.5.131:30280/api/vnfpkgm/v1/vnf_packages') -print(resp.status_code, resp.json()) diff --git a/resources/testscripts/vnf/msb_onboard.py b/resources/testscripts/vnf/msb_onboard.py deleted file mode 100644 index 18c7a9ee..00000000 --- a/resources/testscripts/vnf/msb_onboard.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import json -import httplib2 -ud_data = {'csarId': '20c28260-5078-4729-847f-f8b0a3bff8d9'} -headers = {'content-type': 'application/json', 'accept': 'application/json'} -http = httplib2.Http() -resp, resp_content = http.request('http://159.138.61.203:30280/api/catalog/v1/vnfpackages', - method="POST", - body=json.dumps(ud_data), - headers=headers) -print(resp['status'], resp_content) diff --git a/resources/testscripts/vnf/msb_upload.py b/resources/testscripts/vnf/msb_upload.py deleted file mode 100644 index 1575aaf7..00000000 --- a/resources/testscripts/vnf/msb_upload.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2019, CMCC Technologies Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License") -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import requests -import sys -create_id = sys.argv[1] - -url = 'http://10.12.5.131:30280/api/vnfpkgm/v1/vnf_packages/' + create_id + '/package_content' -resp = requests.put(url, files={'file': open(r"/home/ubuntu/test/test/vnf/vgw.csar", 'rb')}) -print(resp.status_code) -- cgit 1.2.3-korg