From 9d5b4fe212348bc6c3bb007b1d957aaff1bb9a72 Mon Sep 17 00:00:00 2001
From: Kei Nohguchi <kei@nohguchi.com>
Date: Thu, 21 Apr 2016 14:23:43 -0700
Subject: [PATCH] openswitch.py: Use new ops.dc declarative Config(DC) module
 (#15489)

Instead of using the old OpenSwitch runconfig, we'll use
Mir's new ops.dc declarative config for the DC interaction
with OpenSwitch.  This gives us the clearer separation between
ansible and the OpenSwitch, as well as the performance
improvement done inside the ops.dc module itself.

Squashed the original Mir's change into single commit.

Tested-by: Kei Nohguchi <kei@nohguchi.com>
---
 lib/ansible/module_utils/openswitch.py | 51 +++++++++++++-------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/lib/ansible/module_utils/openswitch.py b/lib/ansible/module_utils/openswitch.py
index 2e30028af68..5a3669fcac0 100644
--- a/lib/ansible/module_utils/openswitch.py
+++ b/lib/ansible/module_utils/openswitch.py
@@ -21,9 +21,9 @@ import time
 import json
 
 try:
-    from runconfig import runconfig
-    from opsrest.settings import settings
-    from opsrest.manager import OvsdbConnectionManager
+    import ovs.poller
+    import ops.dc
+    from ops.settings import settings
     from opslib import restparser
     HAS_OPS = True
 except ImportError:
@@ -55,24 +55,22 @@ def to_list(val):
     else:
         return list()
 
-def get_runconfig():
-    manager = OvsdbConnectionManager(settings.get('ovs_remote'),
-                                     settings.get('ovs_schema'))
-    manager.start()
+def get_opsidl():
+    extschema = restparser.parseSchema(settings.get('ext_schema'))
+    ovsschema = settings.get('ovs_schema')
+    ovsremote = settings.get('ovs_remote')
+    opsidl = ops.dc.register(extschema, ovsschema, ovsremote)
 
-    timeout = 10
-    interval = 0
-    init_seq_no = manager.idl.change_seqno
+    init_seqno = opsidl.change_seqno
+    while True:
+        opsidl.run()
+        if init_seqno != opsidl.change_seqno:
+            break
+        poller = ovs.poller.Poller()
+        opsidl.wait(poller)
+        poller.block()
 
-    while (init_seq_no == manager.idl.change_seqno):
-        if interval > timeout:
-            raise TypeError('timeout')
-        manager.idl.run()
-        interval += 1
-        time.sleep(1)
-
-    schema = restparser.parseSchema(settings.get('ext_schema'))
-    return runconfig.RunConfigUtil(manager.idl, schema)
+    return (extschema, opsidl)
 
 class Response(object):
 
@@ -169,7 +167,8 @@ class NetworkModule(AnsibleModule):
         super(NetworkModule, self).__init__(*args, **kwargs)
         self.connection = None
         self._config = None
-        self._runconfig = None
+        self._opsidl = None
+        self._extschema = None
 
     @property
     def config(self):
@@ -204,9 +203,9 @@ class NetworkModule(AnsibleModule):
             path = '/system/full-configuration'
             return self.connection.put(path, data=config)
         else:
-            if not self._runconfig:
-                self._runconfig = get_runconfig()
-            self._runconfig.write_config_to_db(config)
+            if not self._opsidl:
+                (self._extschema, self._opsidl) = get_opsidl()
+            ops.dc.write(config, self._extschema, self._opsidl)
 
     def execute(self, commands, **kwargs):
         try:
@@ -229,9 +228,9 @@ class NetworkModule(AnsibleModule):
             return resp.json
 
         else:
-            if not self._runconfig:
-                self._runconfig = get_runconfig()
-            return self._runconfig.get_running_config()
+            if not self._opsidl:
+                (self._extschema, self._opsidl) = get_opsidl()
+            return ops.dc.read(self._extschema, self._opsidl)
 
 
 def get_module(**kwargs):