X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Futility-functions.sh;h=c12619ae9dfa0decfd9a03c33f4873a2a40f02be;hb=bc60e373f9784f6e2dd13a958a653563d80c4347;hp=f73a2d8586c007973edecdbde585e84ade69d1fe;hpb=6ee3eda280fca9c701056a8d4c5d9cf79fc1cfb7;p=apex.git

diff --git a/lib/utility-functions.sh b/lib/utility-functions.sh
index f73a2d85..c12619ae 100644
--- a/lib/utility-functions.sh
+++ b/lib/utility-functions.sh
@@ -24,7 +24,7 @@ function undercloud_connect {
 ##outputs the Undercloud's IP address
 ##params: none
 function get_undercloud_ip {
-  echo $(arp -a | grep $(virsh domiflist undercloud | grep default |\
+  echo $(arp -an | grep $(virsh domiflist undercloud | grep default |\
     awk '{print $5}') | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
 }
 
@@ -61,29 +61,25 @@ controller<number> or compute<number>"
   fi
 }
 
+##connects to opendaylight karaf console
+##params: None
+function opendaylight_connect {
+  local opendaylight_ip
+  opendaylight_ip=$(undercloud_connect "stack" "cat overcloudrc | grep SDN_CONTROLLER_IP | grep -Eo [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
+
+  if [ "$opendaylight_ip" == "" ]; then
+    echo -e "Unable to find IP for OpenDaylight in overcloudrc"
+    return 1
+  else
+    echo -e "Connecting to ODL Karaf console.  Default password is 'karaf'"
+  fi
+
+  ssh -p 8101 ${SSH_OPTIONS[@]} karaf@${opendaylight_ip}
+}
+
 ##outputs heat stack deployment failures
 ##params: none
 function debug_stack {
-  local failure_output
-  local phys_id
-  declare -a resource_arr
-  declare -a phys_id_arr
-
   source ~/stackrc
-
-  IFS=$'\n'
-  for resource in $(heat resource-list -n 5 overcloud | grep FAILED); do
-    unset IFS
-    resource_arr=(${resource//|/ })
-    phys_id=$(heat resource-show ${resource_arr[-1]} ${resource_arr[0]} | grep physical_resource_id 2> /dev/null)
-    if [ -n "$phys_id" ]; then
-      phys_id_arr=(${phys_id//|/ })
-      failure_output+="******************************************************"
-      failure_output+="\n${resource}:\n\n$(heat deployment-show ${phys_id_arr[-1]} 2> /dev/null)"
-      failure_output+="\n******************************************************"
-    fi
-    unset phys_id
-  done
-
-  echo -e $failure_output
+  openstack stack failures list overcloud --long
 }