From 7fe134264bcb57b8f58588276107a440c7dec63d Mon Sep 17 00:00:00 2001
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Thu, 13 Dec 2018 16:09:31 -0500
Subject: [PATCH] Convert NTP/PTP enabled flag to string implicitly in DC sync.

NTP/PTP enabled flag is not propagated properly to subclouds.
The root cause is the wrong boolean/string comparison of the enabled
flag. Need to to convert it to string to simplify the logic.

Change-Id: Ie9d67c567732caf5edba751fd1310b94d2c084ca
Closes-Bug: 1802530
Signed-off-by: Alex Kozyrev <alex.kozyrev@windriver.com>
---
 dcorch/drivers/openstack/sysinv_v1.py | 8 ++++----
 dcorch/engine/sync_services/sysinv.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dcorch/drivers/openstack/sysinv_v1.py b/dcorch/drivers/openstack/sysinv_v1.py
index eb9b432c3..da71c6902 100644
--- a/dcorch/drivers/openstack/sysinv_v1.py
+++ b/dcorch/drivers/openstack/sysinv_v1.py
@@ -170,11 +170,11 @@ class SysinvClient(base.DriverBase):
                 return intp
             if ntpservers == "NC":
                 ntpservers = ""
-            if intp.enabled != (enabled == "True") or \
+            if str(intp.enabled) != enabled or \
                not self._same_ntpservers(intp.ntpservers, ntpservers):
                 if ntpservers == "":
                     ntpservers = "NC"
-                patch = make_sysinv_patch({'enabled': str(enabled),
+                patch = make_sysinv_patch({'enabled': enabled,
                                            'ntpservers': ntpservers,
                                            'action': 'apply'})
                 LOG.info("region={} ntp update uuid={} patch={}".format(
@@ -223,11 +223,11 @@ class SysinvClient(base.DriverBase):
                 LOG.warn("ptp not found %s" % self.region_name)
                 return ptp
 
-            if ptp.enabled != (enabled == "True") or \
+            if str(ptp.enabled) != enabled or \
                ptp.mode != mode or \
                ptp.transport != transport or \
                ptp.mechanism != mechanism:
-                patch = make_sysinv_patch({'enabled': str(enabled),
+                patch = make_sysinv_patch({'enabled': enabled,
                                            'mode': mode,
                                            'transport': transport,
                                            'mechanism': mechanism})
diff --git a/dcorch/engine/sync_services/sysinv.py b/dcorch/engine/sync_services/sysinv.py
index 060afc54e..43628cc5e 100644
--- a/dcorch/engine/sync_services/sysinv.py
+++ b/dcorch/engine/sync_services/sysinv.py
@@ -210,7 +210,7 @@ class SysinvSyncThread(SyncThread):
                      extra=self.log_extra)
             return
 
-        intp = self.update_ntp(enabled, ntpservers)
+        intp = self.update_ntp(str(enabled), ntpservers)
 
         # Ensure subcloud resource is persisted to the DB for later
         subcloud_rsrc_id = self.persist_db_subcloud_resource(
@@ -291,7 +291,7 @@ class SysinvSyncThread(SyncThread):
                      extra=self.log_extra)
             return
 
-        ptp = self.update_ptp(enabled, mode, transport, mechanism)
+        ptp = self.update_ptp(str(enabled), mode, transport, mechanism)
 
         # Ensure subcloud resource is persisted to the DB for later
         subcloud_rsrc_id = self.persist_db_subcloud_resource(