Use the gitlab repo for OSM packages

Change-Id: I5244bee028a7efc27959443f027c8ac3a1db3c04
Signed-off-by: limon <alimonj@indra.es>

diff --git a/robot-systest/README.md b/robot-systest/README.md
index a81da8a..084ef50 100644 (file)
--- a/robot-systest/README.md
+++ b/robot-systest/README.md
@@ -24,7 +24,7 @@
   - `OS_CLOUD`: Cloud credentialss.
   - `VIM_TARGET`: VIM where tests will be run.
   - `VIM_MGMT_NET`: VIM management network, reachable from robot.
-  - `PACKAGES_FOLDER`: Where descriptor packages are located.
+  - `PACKAGES_FOLDER`: Path where descriptor packages repository are cloned: https://osm.etsi.org/gitlab/vnf-onboarding/osm-packages/
   - `ROBOT_DEVOPS_FOLDER`: Where the devops repository is located.
   - `ROBOT_REPORT_FOLDER`: Where robot outpul will be placed.
 

diff --git a/robot-systest/lib/nsd_lib.robot b/robot-systest/lib/nsd_lib.robot
index 8af1379..5687309 100644 (file)
--- a/robot-systest/lib/nsd_lib.robot
+++ b/robot-systest/lib/nsd_lib.robot
@@ -22,6 +22,10 @@
 # 1. Feature 7829: Jayant Madavi, Mrityunjay Yadav : MY00514913@techmahindra.com : 06-sep-2019
 ##
 
+*** Settings ***
+Library   String
+
+
 *** Variables ***
 ${success_return_code}   0
 ${delete_max_wait_time}   1min
@@ -41,7 +45,10 @@ Create NSD
     ${rc}   ${stdout}=   Run and Return RC and Output   osm nsd-create ${nsd_pkg}
     log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
-    [Return]  ${stdout}
+    ${lines}=  Get Line Count  ${stdout}
+    ${last}=  Evaluate  ${lines} - 1
+    ${id}=  Get Line  ${stdout}  ${last}
+    [Return]  ${id}
 
 
 Delete NSD

diff --git a/robot-systest/lib/vnfd_lib.robot b/robot-systest/lib/vnfd_lib.robot
index 828ea0a..fdef1ac 100644 (file)
--- a/robot-systest/lib/vnfd_lib.robot
+++ b/robot-systest/lib/vnfd_lib.robot
@@ -22,6 +22,10 @@
 # 1. Feature 7829: Jayant Madavi, Mrityunjay Yadav : MY00514913@techmahindra.com : 06-sep-2019
 ##
 
+*** Settings ***
+Library   String
+
+
 *** Variables ***
 ${success_return_code}   0
 ${delete_max_wait_time}   1min
@@ -42,7 +46,10 @@ Create VNFD
     ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfd-create ${vnfd_pkg}
     log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
-    [Return]  ${stdout}
+    ${lines}=  Get Line Count  ${stdout}
+    ${last}=  Evaluate  ${lines} - 1
+    ${id}=  Get Line  ${stdout}  ${last}
+    [Return]  ${id}
 
 
 Delete VNFD

diff --git a/robot-systest/resources/basic_05-instantiation_parameters_in_cloud_init_data.py b/robot-systest/resources/basic_05-instantiation_parameters_in_cloud_init_data.py
index 1c3a6d7..d4e5312 100644 (file)
--- a/robot-systest/resources/basic_05-instantiation_parameters_in_cloud_init_data.py
+++ b/robot-systest/resources/basic_05-instantiation_parameters_in_cloud_init_data.py
@@ -14,11 +14,11 @@ from pathlib import Path
 
 # Get ${HOME} from local machine
 home = str(Path.home())
-# NS and VNF descriptor package files
-vnfd_pkg = 'ubuntu-cloudinit_vnfd.tar.gz'
-nsd_pkg = 'ubuntu-cloudinit_nsd.tar.gz'
-# NS and VNF descriptor names
-vnfd_name = 'ubuntu-cloudinit_vnfd'
-nsd_name = 'ubuntu-cloudinit_nsd'
+# NS and VNF descriptor package folder
+vnfd_pkg = 'ubuntu_cloudinit_vnf'
+nsd_pkg = 'ubuntu_cloudinit_ns'
+# NS and VNF descriptor id
+vnfd_name = 'ubuntu_cloudinit-vnf'
+nsd_name = 'ubuntu_cloudinit-ns'
 # NS instance name
 ns_name = 'basic_05_instantiation_params_cloud_init'

diff --git a/robot-systest/resources/basic_06-vnf_with_charm_data.py b/robot-systest/resources/basic_06-vnf_with_charm_data.py
index b044815..c1a154c 100644 (file)
--- a/robot-systest/resources/basic_06-vnf_with_charm_data.py
+++ b/robot-systest/resources/basic_06-vnf_with_charm_data.py
@@ -14,10 +14,10 @@ from pathlib import Path
 
 # Get ${HOME} from local machine
 home = str(Path.home())
-# NS and VNF descriptor package files
-vnfd_pkg = 'hackfest_proxycharm_vnf.tar.gz'
-nsd_pkg = 'hackfest_proxycharm_ns.tar.gz'
-# NS and VNF descriptor names
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_proxycharm_vnf'
+nsd_pkg = 'hackfest_proxycharm_ns'
+# NS and VNF descriptor id
 vnfd_name = 'hackfest_proxycharm-vnf'
 nsd_name = 'hackfest_proxycharm-ns'
 # NS instance name

diff --git a/robot-systest/resources/basic_07-secure_key_management_data.py b/robot-systest/resources/basic_07-secure_key_management_data.py
index c94be1d..8bd8b38 100644 (file)
--- a/robot-systest/resources/basic_07-secure_key_management_data.py
+++ b/robot-systest/resources/basic_07-secure_key_management_data.py
@@ -14,11 +14,11 @@ from pathlib import Path
 
 # Get ${HOME} from local machine
 home = str(Path.home())
-# NS and VNF descriptor package files
-vnfd_pkg = 'simple_nopasswd_vnf.tar.gz'
-nsd_pkg = 'simple_nopasswd_ns.tar.gz'
-# NS and VNF descriptor names
-vnfd_name = 'simple-nopasswd-vnf'
-nsd_name = 'simple-nopasswd-ns'
+# NS and VNF descriptor package folder
+vnfd_pkg = 'simple_nopasswd_vnf'
+nsd_pkg = 'simple_nopasswd_ns'
+# NS and VNF descriptor id
+vnfd_name = 'simple_nopasswd-vnf'
+nsd_name = 'simple_nopasswd-ns'
 # NS instance name
 ns_name = 'basic_07_secure_key_management'

diff --git a/robot-systest/resources/basic_09-manual_vdu_scaling_data.py b/robot-systest/resources/basic_09-manual_vdu_scaling_data.py
index 2c64916..31b45a2 100644 (file)
--- a/robot-systest/resources/basic_09-manual_vdu_scaling_data.py
+++ b/robot-systest/resources/basic_09-manual_vdu_scaling_data.py
@@ -14,10 +14,10 @@ from pathlib import Path
 
 # Get ${HOME} from local machine
 home = str(Path.home())
-# NS and VNF descriptor package files
-vnfd_pkg = 'hackfest_basic_metrics_vnf.tar.gz'
-nsd_pkg = 'hackfest_basic_metrics_ns.tar.gz'
-# NS and VNF descriptor names
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_basic_metrics_vnf'
+nsd_pkg = 'hackfest_basic_metrics_ns'
+# NS and VNF descriptor id
 vnfd_name = 'hackfest_basic_metrics-vnf'
 nsd_name = 'hackfest_basic-ns-metrics'
 # NS instance name

diff --git a/robot-systest/resources/hackfest_basic_ns_data.py b/robot-systest/resources/hackfest_basic_ns_data.py
index 5d3b856..0f927ed 100644 (file)
--- a/robot-systest/resources/hackfest_basic_ns_data.py
+++ b/robot-systest/resources/hackfest_basic_ns_data.py
@@ -14,10 +14,10 @@ from pathlib import Path
 
 # Get ${HOME} from local machine
 home = str(Path.home())
-# NS and VNF descriptor package files
-vnfd_pkg = 'hackfest_basic_vnf.tar.gz'
-nsd_pkg = 'hackfest_basic_ns.tar.gz'
-# NS and VNF descriptor package files
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_basic_vnf'
+nsd_pkg = 'hackfest_basic_ns'
+# NS and VNF descriptor package id
 vnfd_name = 'hackfest_basic-vnf'
 nsd_name = 'hackfest_basic-ns'
 # NS instance name

diff --git a/robot-systest/resources/hackfest_cloudinit_ns_data.py b/robot-systest/resources/hackfest_cloudinit_ns_data.py
index 6d2994b..d914c49 100644 (file)
--- a/robot-systest/resources/hackfest_cloudinit_ns_data.py
+++ b/robot-systest/resources/hackfest_cloudinit_ns_data.py
@@ -14,10 +14,10 @@ from pathlib import Path
 
 # Get ${HOME} from local machine
 home = str(Path.home())
-# NS and VNF descriptor package files
-vnfd_pkg = 'hackfest_cloudinit_vnf.tar.gz'
-nsd_pkg = 'hackfest_cloudinit_ns.tar.gz'
-# NS and VNF descriptor package files
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_cloudinit_vnf'
+nsd_pkg = 'hackfest_cloudinit_ns'
+# NS and VNF descriptor package id
 vnfd_name = 'hackfest_cloudinit-vnf'
 nsd_name = 'hackfest_cloudinit-ns'
 # NS instance name

diff --git a/robot-systest/resources/hackfest_multivdu_ns_data.py b/robot-systest/resources/hackfest_multivdu_ns_data.py
index b8bc7fb..7c75b67 100644 (file)
--- a/robot-systest/resources/hackfest_multivdu_ns_data.py
+++ b/robot-systest/resources/hackfest_multivdu_ns_data.py
@@ -14,10 +14,10 @@ from pathlib import Path
 
 # Get ${HOME} from local machine
 home = str(Path.home())
-# NS and VNF descriptor package files
-vnfd_pkg = 'hackfest_multivdu_vnf.tar.gz'
-nsd_pkg = 'hackfest_multivdu_ns.tar.gz'
-# NS and VNF descriptor package files
+# NS and VNF descriptor package folder
+vnfd_pkg = 'hackfest_multivdu_vnf'
+nsd_pkg = 'hackfest_multivdu_ns'
+# NS and VNF descriptor package id
 vnfd_name = 'hackfest_multivdu-vnf'
 nsd_name = 'hackfest_multivdu-ns'
 # NS instance name