Merge "Fixes:Analytics nodes incorrectly point to database nodes Desc…

…ription: While provisioning, provision_issu.py was wrongly taking db node info instead of analytics node info. Correct it. Also, some corrections in issu_process.sh Closes-Bug:1647845" into R3.1
Juniper · Mar 22, 2017 · 058cba6 · 058cba6
2 parents 2ff6de3 + 258673f
commit 058cba6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/config/utils/issu_process.sh b/src/config/utils/issu_process.sh
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env bash
 
 function issu_contrail_switch_compute_node {
@@ -14,9 +13,9 @@ function issu_contrail_switch_compute_node {
 
 function issu_contrail_prepare_compute_node {
             route -n
-            #openstack-config --del /etc/contrail/supervisord_vrouter_files/contrail-vrouter-agent.ini program:contrail-vrouter-agent autostart
-            #openstack-config --del /etc/contrail/supervisord_vrouter_files/contrail-vrouter-agent.ini program:contrail-vrouter-agent killasgroup
-            #contrail-status
+            openstack-config --del /etc/contrail/supervisord_vrouter_files/contrail-vrouter-agent.ini program:contrail-vrouter-agent autostart
+            openstack-config --del /etc/contrail/supervisord_vrouter_files/contrail-vrouter-agent.ini program:contrail-vrouter-agent killasgroup
+            contrail-status
 }
 
 function issu_contrail_set_supervisord_config_files {

diff --git a/src/config/utils/provision_issu.py b/src/config/utils/provision_issu.py
@@ -171,7 +171,7 @@ def add_nodes(self):
                 print "created config"
                 self._vnc_lib.config_node_create(config_node_obj)
 
-        for k,v in self._args.db_host_info.items():
+        for k,v in self._args.analytics_host_info.items():
             analytics_node_obj = AnalyticsNode(
                 v, gsc_obj,
                 analytics_node_ip_address=k)
@@ -239,9 +239,11 @@ def del_nodes(self):
         for k,v in self._args.control_host_info.items():
             control_name_list.append(v)
         for node_list_value in node_list_values[0]:
-            if node_list_value['fq_name'][4] in control_name_list:
+            router_info = self._vnc_lib.bgp_router_read(id=node_list_value['uuid'])
+            print "control name lists %s " %(control_name_list)
+            if node_list_value['fq_name'][4] in control_name_list or router_info.bgp_router_parameters.router_type != 'control-node':
                 continue;
-            print "deleting %s" %(node_list_value['fq_name'][4])
+            print "deleting %s %s" %(node_list_value['fq_name'][4], router_info.bgp_router_parameters.router_type)
             self._vnc_lib.bgp_router_delete(id=node_list_value['uuid'])
 
     # end del_node