From 5a24e462553736b2179bc87dc66d812c3a467151 Mon Sep 17 00:00:00 2001 From: tierno Date: Fri, 8 Jul 2016 12:14:12 +0200 Subject: [PATCH] minor updates to v0.4.38 --- openmanod.py | 6 +++--- test/test_os.sh | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/openmanod.py b/openmanod.py index 0df8202d..01ac0f5f 100755 --- a/openmanod.py +++ b/openmanod.py @@ -33,8 +33,8 @@ It loads the configuration file and launches the http_server thread that will li ''' __author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ ="$26-aug-2014 11:09:29$" -__version__="0.4.36-r467" -version_date="Mar 2016" +__version__="0.4.38-r470" +version_date="Apr 2016" database_version="0.10" #expected database schema version import httpserver @@ -123,7 +123,7 @@ if __name__=="__main__": # Read parameters and configuration file try: opts, args = getopt.getopt(sys.argv[1:], "hvc:V:p:P:", ["config", "help", "version", "port", "vnf-repository", "adminport"]) - except getopt.GetoptError, err: + except getopt.GetoptError as err: # print help information and exit: print "Error:", err # will print something like "option -a not recognized" usage() diff --git a/test/test_os.sh b/test/test_os.sh index ae092c29..26812269 100755 --- a/test/test_os.sh +++ b/test/test_os.sh @@ -156,7 +156,9 @@ then echo OK printf "%-50s" "Updating external nets in openmano: " - result=`openmano datacenter-net-update -f TOS-dc` + result=`openmano datacenter-netmap-delete -f --all` + [[ $? != 0 ]] && echo "FAIL" && echo " $result" && $_exit 1 + result=`openmano datacenter-netmap-upload -f` [[ $? != 0 ]] && echo "FAIL" && echo " $result" && $_exit 1 echo OK @@ -240,7 +242,7 @@ then for sce in simple complex2 do printf "%-50s" "Deploying scenario '$sce':" - result=`openmano scenario-deploy $sce ${sce}-instance` + result=`openmano instance-scenario-create --scenario $sce --name ${sce}-instance` instance=`echo $result |gawk '{print $1}'` ! is_valid_uuid $instance && echo FAIL && echo " $result" && $_exit 1 echo $instance -- 2.17.1