Correcting networking-odl to mitaka/stable + app topology patch

Change-Id: Iddcd8dda2d49fcdd8e0f37a1d052a6fa8a24b035
Signed-off-by: Wojciech Dec <wdec@cisco.com>

1 files changed, 13 insertions, 45 deletions

diff --git a/networking-odl/networking_odl/lbaas/driver_v1.py b/networking-odl/networking_odl/lbaas/driver_v1.py
index aaf3dcf..0d66f70 100644
--- a/networking-odl/networking_odl/lbaas/driver_v1.py
+++ b/networking-odl/networking_odl/lbaas/driver_v1.py
@@ -20,13 +20,10 @@ from oslo_log import log as logging
 from neutron_lbaas.services.loadbalancer.drivers import abstract_driver
 
 from networking_odl.common import client as odl_client
-from networking_odl.common import constants as odl_const
+
 
 cfg.CONF.import_group('ml2_odl', 'networking_odl.common.config')
 LOG = logging.getLogger(__name__)
-LBAAS = "lbaas"
-POOLS_URL_PATH = LBAAS + '/' + odl_const.ODL_POOLS
-HEALTHMONITORS_URL_PATH = LBAAS + '/' + odl_const.ODL_HEALTHMONITORS
 
 
 class OpenDaylightLbaasDriverV1(abstract_driver.LoadBalancerAbstractDriver):
@@ -43,82 +40,53 @@ class OpenDaylightLbaasDriverV1(abstract_driver.LoadBalancerAbstractDriver):
         self.client = odl_client.OpenDaylightRestClient.create_client()
 
     def create_vip(self, context, vip):
-        """Create a vip on the OpenDaylight Controller.
-
-        No code related to vip in the OpenDayLight neutronNorthbound,
-        so pass this method.
-        """
+        """Create a vip on the OpenDaylight Controller."""
         pass
 
     def update_vip(self, context, old_vip, vip):
-        """Update a vip on the OpenDaylight Controller.
-
-        No code related to vip in the OpenDayLight neutronNorthbound,
-        so pass this method.
-        """
+        """Update a vip on the OpenDaylight Controller."""
         pass
 
     def delete_vip(self, context, vip):
-        """Delete a vip on the OpenDaylight Controller.
-
-        No code related to vip in the OpenDayLight neutronNorthbound,
-        so pass this method.
-        """
+        """Delete a vip on the OpenDaylight Controller."""
         pass
 
     def create_pool(self, context, pool):
         """Create a pool on the OpenDaylight Controller."""
-        url = POOLS_URL_PATH
-        self.client.sendjson('post', url, {odl_const.ODL_POOL: pool})
+        pass
 
     def update_pool(self, context, old_pool, pool):
         """Update a pool on the OpenDaylight Controller."""
-        url = POOLS_URL_PATH + "/" + old_pool['id']
-        self.client.sendjson('put', url, {odl_const.ODL_POOL: pool})
+        pass
 
     def delete_pool(self, context, pool):
         """Delete a pool on the OpenDaylight Controller."""
-        url = POOLS_URL_PATH + "/" + pool['id']
-        self.client.sendjson('delete', url, None)
+        pass
 
     def create_member(self, context, member):
         """Create a pool member on the OpenDaylight Controller."""
-        url = (
-            POOLS_URL_PATH + '/' + member['pool_id'] +
-            '/' + odl_const.ODL_MEMBERS)
-        self.client.sendjson('post', url, {odl_const.ODL_MEMBER: member})
+        pass
 
     def update_member(self, context, old_member, member):
         """Update a pool member on the OpenDaylight Controller."""
-        url = (
-            POOLS_URL_PATH + '/' + member['pool_id'] +
-            '/' + odl_const.ODL_MEMBERS + "/" + old_member['id'])
-        self.client.sendjson('put', url, {odl_const.ODL_MEMBER: member})
+        pass
 
     def delete_member(self, context, member):
         """Delete a pool member on the OpenDaylight Controller."""
-        url = (
-            POOLS_URL_PATH + '/' + member['pool_id'] +
-            '/' + odl_const.ODL_MEMBERS + "/" + member['id'])
-        self.client.sendjson('delete', url, None)
+        pass
 
     def create_pool_health_monitor(self, context, health_monitor, pool_id):
         """Create a pool health monitor on the OpenDaylight Controller."""
-        url = HEALTHMONITORS_URL_PATH
-        self.client.sendjson(
-            'post', url, {odl_const.ODL_HEALTHMONITOR: health_monitor})
+        pass
 
     def update_pool_health_monitor(self, context, old_health_monitor,
                                    health_monitor, pool_id):
         """Update a pool health monitor on the OpenDaylight Controller."""
-        url = HEALTHMONITORS_URL_PATH + "/" + old_health_monitor['id']
-        self.client.sendjson(
-            'put', url, {odl_const.ODL_HEALTHMONITOR: health_monitor})
+        pass
 
     def delete_pool_health_monitor(self, context, health_monitor, pool_id):
         """Delete a pool health monitor on the OpenDaylight Controller."""
-        url = HEALTHMONITORS_URL_PATH + "/" + health_monitor['id']
-        self.client.sendjson('delete', url, None)
+        pass
 
     def stats(self, context, pool_id):
         """Retrieve pool statistics from the OpenDaylight Controller."""