From a84c8a335a496627881401400b801de859efc9cb Mon Sep 17 00:00:00 2001 From: yangyan Date: Thu, 20 Feb 2020 18:01:26 +0800 Subject: [PATCH] Add test scripts of F version Change-Id: Id7508c41af929e1385f5ede99fd45cf9fcb84cae Issue-ID: VFC-1621 Signed-off-by: yangyan --- .../testscripts/{ => E-version}/ns/Instructions | 0 .../testscripts/{ => E-version}/ns/msb_create.py | 0 .../testscripts/{ => E-version}/ns/msb_delete.py | 0 .../testscripts/{ => E-version}/ns/msb_get.py | 0 .../testscripts/{ => E-version}/ns/msb_onboard.py | 0 .../testscripts/{ => E-version}/ns/msb_upload.py | 0 .../{ => E-version}/ns_instance/Instrutions | 0 .../{ => E-version}/ns_instance/create.py | 0 .../{ => E-version}/ns_instance/delete.py | 0 .../testscripts/{ => E-version}/ns_instance/get.py | 0 .../{ => E-version}/ns_instance/get_one.py | 0 .../{ => E-version}/ns_instance/instance.py | 0 .../{ => E-version}/ns_instance/terminate.py | 0 .../testscripts/{ => E-version}/vnf/Instructions | 0 .../testscripts/{ => E-version}/vnf/msb_create.py | 0 .../testscripts/{ => E-version}/vnf/msb_delete.py | 0 .../testscripts/{ => E-version}/vnf/msb_get.py | 0 .../testscripts/{ => E-version}/vnf/msb_onboard.py | 0 .../testscripts/{ => E-version}/vnf/msb_upload.py | 0 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 +++++++++ 36 files changed, 174 insertions(+) rename resources/testscripts/{ => E-version}/ns/Instructions (100%) rename resources/testscripts/{ => E-version}/ns/msb_create.py (100%) rename resources/testscripts/{ => E-version}/ns/msb_delete.py (100%) rename resources/testscripts/{ => E-version}/ns/msb_get.py (100%) rename resources/testscripts/{ => E-version}/ns/msb_onboard.py (100%) rename resources/testscripts/{ => E-version}/ns/msb_upload.py (100%) rename resources/testscripts/{ => E-version}/ns_instance/Instrutions (100%) rename resources/testscripts/{ => E-version}/ns_instance/create.py (100%) rename resources/testscripts/{ => E-version}/ns_instance/delete.py (100%) rename resources/testscripts/{ => E-version}/ns_instance/get.py (100%) rename resources/testscripts/{ => E-version}/ns_instance/get_one.py (100%) rename resources/testscripts/{ => E-version}/ns_instance/instance.py (100%) rename resources/testscripts/{ => E-version}/ns_instance/terminate.py (100%) rename resources/testscripts/{ => E-version}/vnf/Instructions (100%) rename resources/testscripts/{ => E-version}/vnf/msb_create.py (100%) rename resources/testscripts/{ => E-version}/vnf/msb_delete.py (100%) rename resources/testscripts/{ => E-version}/vnf/msb_get.py (100%) rename resources/testscripts/{ => E-version}/vnf/msb_onboard.py (100%) rename resources/testscripts/{ => E-version}/vnf/msb_upload.py (100%) 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 diff --git a/resources/testscripts/ns/Instructions b/resources/testscripts/E-version/ns/Instructions similarity index 100% rename from resources/testscripts/ns/Instructions rename to resources/testscripts/E-version/ns/Instructions diff --git a/resources/testscripts/ns/msb_create.py b/resources/testscripts/E-version/ns/msb_create.py similarity index 100% rename from resources/testscripts/ns/msb_create.py rename to resources/testscripts/E-version/ns/msb_create.py diff --git a/resources/testscripts/ns/msb_delete.py b/resources/testscripts/E-version/ns/msb_delete.py similarity index 100% rename from resources/testscripts/ns/msb_delete.py rename to resources/testscripts/E-version/ns/msb_delete.py diff --git a/resources/testscripts/ns/msb_get.py b/resources/testscripts/E-version/ns/msb_get.py similarity index 100% rename from resources/testscripts/ns/msb_get.py rename to resources/testscripts/E-version/ns/msb_get.py diff --git a/resources/testscripts/ns/msb_onboard.py b/resources/testscripts/E-version/ns/msb_onboard.py similarity index 100% rename from resources/testscripts/ns/msb_onboard.py rename to resources/testscripts/E-version/ns/msb_onboard.py diff --git a/resources/testscripts/ns/msb_upload.py b/resources/testscripts/E-version/ns/msb_upload.py similarity index 100% rename from resources/testscripts/ns/msb_upload.py rename to resources/testscripts/E-version/ns/msb_upload.py diff --git a/resources/testscripts/ns_instance/Instrutions b/resources/testscripts/E-version/ns_instance/Instrutions similarity index 100% rename from resources/testscripts/ns_instance/Instrutions rename to resources/testscripts/E-version/ns_instance/Instrutions diff --git a/resources/testscripts/ns_instance/create.py b/resources/testscripts/E-version/ns_instance/create.py similarity index 100% rename from resources/testscripts/ns_instance/create.py rename to resources/testscripts/E-version/ns_instance/create.py diff --git a/resources/testscripts/ns_instance/delete.py b/resources/testscripts/E-version/ns_instance/delete.py similarity index 100% rename from resources/testscripts/ns_instance/delete.py rename to resources/testscripts/E-version/ns_instance/delete.py diff --git a/resources/testscripts/ns_instance/get.py b/resources/testscripts/E-version/ns_instance/get.py similarity index 100% rename from resources/testscripts/ns_instance/get.py rename to resources/testscripts/E-version/ns_instance/get.py diff --git a/resources/testscripts/ns_instance/get_one.py b/resources/testscripts/E-version/ns_instance/get_one.py similarity index 100% rename from resources/testscripts/ns_instance/get_one.py rename to resources/testscripts/E-version/ns_instance/get_one.py diff --git a/resources/testscripts/ns_instance/instance.py b/resources/testscripts/E-version/ns_instance/instance.py similarity index 100% rename from resources/testscripts/ns_instance/instance.py rename to resources/testscripts/E-version/ns_instance/instance.py diff --git a/resources/testscripts/ns_instance/terminate.py b/resources/testscripts/E-version/ns_instance/terminate.py similarity index 100% rename from resources/testscripts/ns_instance/terminate.py rename to resources/testscripts/E-version/ns_instance/terminate.py diff --git a/resources/testscripts/vnf/Instructions b/resources/testscripts/E-version/vnf/Instructions similarity index 100% rename from resources/testscripts/vnf/Instructions rename to resources/testscripts/E-version/vnf/Instructions diff --git a/resources/testscripts/vnf/msb_create.py b/resources/testscripts/E-version/vnf/msb_create.py similarity index 100% rename from resources/testscripts/vnf/msb_create.py rename to resources/testscripts/E-version/vnf/msb_create.py diff --git a/resources/testscripts/vnf/msb_delete.py b/resources/testscripts/E-version/vnf/msb_delete.py similarity index 100% rename from resources/testscripts/vnf/msb_delete.py rename to resources/testscripts/E-version/vnf/msb_delete.py diff --git a/resources/testscripts/vnf/msb_get.py b/resources/testscripts/E-version/vnf/msb_get.py similarity index 100% rename from resources/testscripts/vnf/msb_get.py rename to resources/testscripts/E-version/vnf/msb_get.py diff --git a/resources/testscripts/vnf/msb_onboard.py b/resources/testscripts/E-version/vnf/msb_onboard.py similarity index 100% rename from resources/testscripts/vnf/msb_onboard.py rename to resources/testscripts/E-version/vnf/msb_onboard.py diff --git a/resources/testscripts/vnf/msb_upload.py b/resources/testscripts/E-version/vnf/msb_upload.py similarity index 100% rename from resources/testscripts/vnf/msb_upload.py rename to resources/testscripts/E-version/vnf/msb_upload.py 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) -- 2.16.6