Merge "Enhancing Grafana sample dashboard"

diff --git a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
index 94fa5f1..6d5da86 100644 (file)
--- a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
+++ b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
@@ -29,8 +29,8 @@ vnfd-catalog:
                 storage-gb: 2
 
             # Image/checksum or image including the full path
-            image: 'cirros034'
-            #checksum: 
+            image: 'cirros-0.3.5-x86_64-disk.img'
+            #checksum:
 
             interface:
             # Specify the external interfaces

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index ce3aef6..724daad 100644 (file)
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -256,6 +256,8 @@ node("${params.NODE}") {
             }
 
             if ( params.DO_STAGE_4 ) {
+                // override stage_archive to only archive on stable
+                stage_archive = false
                 stage("stage_4") {
                     run_systest(container_name,container_name,"openstack_stage_4",params.HIVE_VIM_1)
 

diff --git a/systest/testcases/vnfs/test_vnfs.py b/systest/testcases/vnfs/test_vnfs.py
index 3eee94d..53f39ac 100644 (file)
--- a/systest/testcases/vnfs/test_vnfs.py
+++ b/systest/testcases/vnfs/test_vnfs.py
@@ -79,6 +79,10 @@ class TestClass(object):
         time.sleep(5)
 
     def vnf_test(self,osm, openstack, vim, vmware, vnfd_file_list, nsd_file_list, ns_scale=False):
+
+        # FIXME: need sleep after vim creation. Need a way to validate vim is ready to handle requests
+        time.sleep(20)
+
         for file in nsd_file_list:
             nsd_desc = osm.get_api().package.get_key_val_from_pkg(file)
 
@@ -92,7 +96,7 @@ class TestClass(object):
                 assert Fail, "operational-status != init"
 
             # make sure ns is running
-            if not utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='running',wait_time=30):
+            if not utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='running',wait_time=240):
                 nsr=osm.get_api().ns.get(ns_name)
                 pprint.pprint(nsr)
                 assert Fail, "operational-status != running"