X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=scripts%2Finitopenvim.sh;h=1bd152af76cc8504ce2266191c9060864b6f8759;hb=32213316c986310958424667ae63435ca0973f18;hp=ae839baddf7414f38c825dca94d883b4c969d9ed;hpb=4131cfb49763377fb4522e8899e4b5a9ae471a50;p=osm%2Fopenvim.git

diff --git a/scripts/initopenvim.sh b/scripts/initopenvim.sh
index ae839ba..1bd152a 100755
--- a/scripts/initopenvim.sh
+++ b/scripts/initopenvim.sh
@@ -58,7 +58,8 @@ function is_valid_uuid(){
 
 
 #process options
-source ${DIRNAME}/get-options.sh "force:f delete:d delete-all port:p= admin-port:P= screen-name= help:h dbname= insert-bashrc" $* || $_exit 1
+source ${DIRNAME}/get-options.sh \
+    "force:f delete:d delete-all port:p= admin-port:P= screen-name= help:h dbname= insert-bashrc" $* || $_exit 1
 
 #check correct arguments
 action_list=""
@@ -116,11 +117,11 @@ then
     echo "deleting deployed vm"
     ${DIRvim}/openvim vm-delete -f | grep -q deleted && sleep 10 #give some time to get virtual machines deleted
     echo "Stopping openvim${screen_name_param}${openvim_param}"
-    $DIRNAME/service-openvim.sh stop${screen_name_param}${openvim_param} 
+    $DIRNAME/service-openvim stop${screen_name_param}${openvim_param}
     echo "Initializing databases $db_name"
     $DIRvim/database_utils/init_vim_db.sh -u vim -p vimpw -d $db_name
     echo "Starting openvim${screen_name_param}${openvim_param}"
-    $DIRNAME/service-openvim.sh start${screen_name_param}${openvim_param}
+    $DIRNAME/service-openvim start${screen_name_param}${openvim_param}
 
 elif [[ $action == delete-all ]] 
 then
@@ -173,12 +174,12 @@ then
     ${DIRvim}/openvim host-remove -f fake-host-1      || echo "fail"
     ${DIRvim}/openvim host-remove -f fake-host-2      || echo "fail"
     ${DIRvim}/openvim host-remove -f fake-host-3      || echo "fail"
-    result=`openvim tenant-list TEST-admin`
+    result=`openvim tenant-list osm`
     vimtenant=`echo $result |gawk '{print $1}'`
     #check a valid uuid is obtained
-    is_valid_uuid $vimtenant || ! echo "Tenant TEST-admin not found. Already delete?" >&2 || $_exit 1
+    is_valid_uuid $vimtenant || ! echo "Tenant 'osm' not found. Already delete?" >&2 || $_exit 1
     export OPENVIM_TENANT=$vimtenant
-    ${DIRvim}/openvim tenant-delete -f TEST-admin     || echo "fail"
+    ${DIRvim}/openvim tenant-delete -f osm     || echo "fail"
     echo
 
 elif [[ $action == "create" ]]
@@ -194,8 +195,8 @@ then
     ${DIRvim}/openvim net-create $DIRvim/test/networks/net-example2.yaml || ! echo "fail" >&2 || $_exit 1
     ${DIRvim}/openvim net-create $DIRvim/test/networks/net-example3.yaml || ! echo "fail" >&2 || $_exit 1
 
-    printf "%-50s" "Creating openvim tenant 'TEST-admin': "
-    result=`${DIRvim}/openvim tenant-create '{"tenant": {"name":"TEST-admin", "description":"admin"}}'`
+    printf "%-50s" "Creating openvim tenant 'osm': "
+    result=`openvim tenant-create '{tenant: {name: osm, description: admin}}'`
     vimtenant=`echo $result |gawk '{print $1}'`
     #check a valid uuid is obtained
     ! is_valid_uuid $vimtenant && echo "FAIL" && echo "    $result" && $_exit 1