From: yadavmr <my00514913@techmahindra.com>
Date: Mon, 22 Jul 2019 08:45:30 +0000 (+0530)
Subject: Bug 806, System test exception handled!
X-Git-Tag: v7.0.0rc1~88^2
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=9de4ec10ffdc139ae00704091978bbb40011dc2d

Bug 806, System test exception handled!

Change-Id: I4161afd764ab381999ef78754c8348fa1c25521d
Signed-off-by: yadavmr <my00514913@techmahindra.com>
---

diff --git a/descriptor-packages/tools/generate_descriptor_pkg.sh b/descriptor-packages/tools/generate_descriptor_pkg.sh
index bff87854..704f77f6 100755
--- a/descriptor-packages/tools/generate_descriptor_pkg.sh
+++ b/descriptor-packages/tools/generate_descriptor_pkg.sh
@@ -791,7 +791,8 @@ if [ $CREATE == false ]; then
 
     cd $BASE_DIR
     # Mrityunjay Yadav: Validate descriptor
-    python /usr/share/osm-devops/descriptor-packages/tools/validate_descriptor.py $DEST_DIR/$PKG/$descriptor
+    GEN_BASEDIR=$(dirname "$0")
+    python $GEN_BASEDIR/validate_descriptor.py $DEST_DIR/$PKG/$descriptor
     if [ $? -ne 0 ]; then
         rc=$?
         echo "ERROR: validating descriptor for $PKG ($rc)" >&2
diff --git a/descriptor-packages/tools/validate_descriptor.py b/descriptor-packages/tools/validate_descriptor.py
index 1c67195f..9fe751a6 100755
--- a/descriptor-packages/tools/validate_descriptor.py
+++ b/descriptor-packages/tools/validate_descriptor.py
@@ -173,7 +173,7 @@ if __name__ == "__main__":
                     validate_charm(vnfd["vnf-configuration"], input_file_name)
 
             if not mgmt_iface:
-                raise KeyError("'mgmt-iface' is a mandatory field and it is not defined")
+                raise KeyError("'mgmt-interface' is a mandatory field and it is not defined")
             myvnfd = vnfd_catalog.vnfd()
             pybindJSONDecoder.load_ietf_json(data, None, None, obj=myvnfd)
         elif "nsd:nsd-catalog" in data or "nsd-catalog" in data:
diff --git a/systest/testcases/vnfs/test_vnfs.py b/systest/testcases/vnfs/test_vnfs.py
index 6096a544..e7e1dce9 100644
--- a/systest/testcases/vnfs/test_vnfs.py
+++ b/systest/testcases/vnfs/test_vnfs.py
@@ -93,13 +93,13 @@ class TestClass(object):
             if not utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='init', wait_time=30):
                 nsr=osm.get_api().ns.get(ns_name)
                 pprint.pprint(nsr)
-                assert Fail, "operational-status != init"
+                assert True, "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=240):
                 nsr=osm.get_api().ns.get(ns_name)
                 pprint.pprint(nsr)
-                assert Fail, "operational-status != running"
+                assert True, "operational-status != running"
 
             if ns_scale:
                 # for each descriptor, scale it