Update test scripts of vnf msb_create

Change-Id: I229175f5352ddd71fb46cef9c86e39b2df2d79d9
Issue-ID: VFC-1510
Signed-off-by: yangyan <yangyanyj@chinamobile.com>

diff --git a/resources/testscripts/ns/Instructions b/resources/testscripts/ns/Instructions
index 9c40834..2353d76 100644 (file)
--- a/resources/testscripts/ns/Instructions
+++ b/resources/testscripts/ns/Instructions
@@ -1,14 +1,20 @@
 
 # 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.
+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 CSAR package,
+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_get
 If you want to query the registration status in msb, you can execute the msb_get script directly.
-# msb_del
+
+# 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.
\ No newline at end of file
+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
index cc8b610..0c38d9b 100644 (file)
--- a/resources/testscripts/ns/msb_create.py
+++ b/resources/testscripts/ns/msb_create.py
@@ -1,3 +1,14 @@
+# Copyright (c) 2020, 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"}}

diff --git a/resources/testscripts/ns/msb_del.py b/resources/testscripts/ns/msb_del.py
deleted file mode 100644 (file)
index 5765773..0000000
--- a/resources/testscripts/ns/msb_del.py
+++ /dev/null
@@ -1,6 +0,0 @@
-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_delete.py b/resources/testscripts/ns/msb_delete.py
new file mode 100644 (file)
index 0000000..ec4d053
--- /dev/null
+++ b/resources/testscripts/ns/msb_delete.py
@@ -0,0 +1,17 @@
+# Copyright (c) 2020, 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
index 575bf8c..4377077 100644 (file)
--- a/resources/testscripts/ns/msb_get.py
+++ b/resources/testscripts/ns/msb_get.py
@@ -1,3 +1,14 @@
+# Copyright (c) 2020, 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_upload.py b/resources/testscripts/ns/msb_upload.py
index 82abfb3..1697e4f 100644 (file)
--- a/resources/testscripts/ns/msb_upload.py
+++ b/resources/testscripts/ns/msb_upload.py
@@ -1,3 +1,14 @@
+# Copyright (c) 2020, 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]

diff --git a/resources/testscripts/vnf/Instructions b/resources/testscripts/vnf/Instructions
new file mode 100644 (file)
index 0000000..0961862
--- /dev/null
+++ b/resources/testscripts/vnf/Instructions
@@ -0,0 +1,20 @@
+
+# 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_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
new file mode 100644 (file)
index 0000000..e3653dc
--- /dev/null
+++ b/resources/testscripts/vnf/msb_create.py
@@ -0,0 +1,21 @@
+# Copyright (c) 2020, 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
new file mode 100644 (file)
index 0000000..63f8495
--- /dev/null
+++ b/resources/testscripts/vnf/msb_delete.py
@@ -0,0 +1,17 @@
+# Copyright (c) 2020, 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
new file mode 100644 (file)
index 0000000..c90e626
--- /dev/null
+++ b/resources/testscripts/vnf/msb_get.py
@@ -0,0 +1,14 @@
+# Copyright (c) 2020, 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_upload.py b/resources/testscripts/vnf/msb_upload.py
new file mode 100644 (file)
index 0000000..c9efad6
--- /dev/null
+++ b/resources/testscripts/vnf/msb_upload.py
@@ -0,0 +1,18 @@
+# Copyright (c) 2020, 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)