From 106a2327edd9aa649bd0634533f6a61f9a6d7519 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Sun, 23 Sep 2018 15:57:46 -0400
Subject: [PATCH] Fix up some logic errors with function calls

---
 router-daemon/pvcrd/VXNetworkInstance.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/router-daemon/pvcrd/VXNetworkInstance.py b/router-daemon/pvcrd/VXNetworkInstance.py
index 72b263e2..d69a13c2 100644
--- a/router-daemon/pvcrd/VXNetworkInstance.py
+++ b/router-daemon/pvcrd/VXNetworkInstance.py
@@ -42,7 +42,7 @@ class VXNetworkInstance():
         self.watch_change = False
 
         self.update_timer = apscheduler.schedulers.background.BackgroundScheduler()
-        self.update_timer.add_job(updateCorosyncResource, 'interval', seconds=1)
+        self.update_timer.add_job(self.updateCorosyncResource, 'interval', seconds=1)
 
         # Zookeper handlers for changed states
         @zk_conn.DataWatch('/networks/{}/description'.format(self.vni))
@@ -86,7 +86,6 @@ class VXNetworkInstance():
             self.watch_change = True
 
     def createCorosyncResource(self):
-        self.corosync_provisioned = True
         ansiiprint.echo('Creating Corosync resource for gateway {} on interface {}'.format(self.ip_gateway, self.vni), '', 'o')
         os.system(
             """
@@ -105,6 +104,7 @@ class VXNetworkInstance():
                 self.bridge_nic
             )
         )
+        self.corosync_provisioned = True
 
     def removeCorosyncResource(self):
         ansiiprint.echo('Removing Corosync resource for gateway {} on interface {}'.format(self.ip_gateway, self.vni), '', 'o')
@@ -186,15 +186,17 @@ class VXNetworkInstance():
 
     def updateCorosyncResource(self):
         if self.corosync_provisioned and self.watch_change:
+            self.watch_change = False
             # Rebuild the resource
-            removeCorosyncResource()
-            createCorosyncResource()
+            self.removeCorosyncResource()
+            self.createCorosyncResource()
 
     def provision(self):
-        createNetwork()
-        createCorosyncConfig()
+        self.createNetwork()
+        self.createCorosyncResource()
         self.update_timer.start()
 
     def deprovision(self):
         self.update_timer.shutdown()
-        removeCorosyncConfig()
+        removeCorosyncResource()
+        removeNetwork()