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

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

1 files changed, 0 insertions, 114 deletions

diff --git a/networking-odl/networking_odl/journal/full_sync.py b/networking-odl/networking_odl/journal/full_sync.py
deleted file mode 100644
index dad7215..0000000
--- a/networking-odl/networking_odl/journal/full_sync.py
+++ /dev/null
@@ -1,114 +0,0 @@
-#
-# Copyright (C) 2016 Red Hat, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License"); you may
-#  not use this file except in compliance with the License. You may obtain
-#  a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#  License for the specific language governing permissions and limitations
-#  under the License.
-#
-
-import requests
-
-from neutron import context as neutron_context
-from neutron import manager
-from neutron.plugins.common import constants
-from neutron_lib import constants as l3_constants
-
-from networking_odl.common import client
-from networking_odl.common import constants as odl_const
-from networking_odl.db import db
-
-# Define which pending operation types should be deleted
-_CANARY_NETWORK_ID = "bd8db3a8-2b30-4083-a8b3-b3fd46401142"
-_CANARY_TENANT_ID = "bd8db3a8-2b30-4083-a8b3-b3fd46401142"
-_CANARY_NETWORK_DATA = {'id': _CANARY_NETWORK_ID,
-                        'tenant_id': _CANARY_TENANT_ID,
-                        'name': 'Sync Canary Network',
-                        'admin_state_up': False}
-_OPS_TO_DELETE_ON_SYNC = (odl_const.ODL_CREATE, odl_const.ODL_UPDATE)
-_L2_RESOURCES_TO_SYNC = [(odl_const.ODL_SG, odl_const.ODL_SGS),
-                         (odl_const.ODL_SG_RULE, odl_const.ODL_SG_RULES),
-                         (odl_const.ODL_NETWORK, odl_const.ODL_NETWORKS),
-                         (odl_const.ODL_SUBNET, odl_const.ODL_SUBNETS),
-                         (odl_const.ODL_PORT, odl_const.ODL_PORTS)]
-_L3_RESOURCES_TO_SYNC = [(odl_const.ODL_ROUTER, odl_const.ODL_ROUTERS),
-                         (odl_const.ODL_FLOATINGIP, odl_const.ODL_FLOATINGIPS)]
-_CLIENT = client.OpenDaylightRestClient.create_client()
-
-
-def full_sync(session):
-    if not _full_sync_needed(session):
-        return
-
-    db.delete_pending_rows(session, _OPS_TO_DELETE_ON_SYNC)
-
-    dbcontext = neutron_context.get_admin_context()
-    plugin = manager.NeutronManager.get_plugin()
-    for resource_type, collection_name in _L2_RESOURCES_TO_SYNC:
-        _sync_resources(session, plugin, dbcontext, resource_type,
-                        collection_name)
-
-    l3plugin = manager.NeutronManager.get_service_plugins().get(
-        constants.L3_ROUTER_NAT)
-    for resource_type, collection_name in _L3_RESOURCES_TO_SYNC:
-        _sync_resources(session, l3plugin, dbcontext, resource_type,
-                        collection_name)
-    _sync_router_ports(session, plugin, dbcontext)
-
-    db.create_pending_row(session, odl_const.ODL_NETWORK, _CANARY_NETWORK_ID,
-                          odl_const.ODL_CREATE, _CANARY_NETWORK_DATA)
-
-
-def _full_sync_needed(session):
-    return (_canary_network_missing_on_odl() and
-            _canary_network_not_in_journal(session))
-
-
-def _canary_network_missing_on_odl():
-    # Try to reach the ODL server, sometimes it might be up & responding to
-    # HTTP calls but inoperative..
-    response = _CLIENT.get(odl_const.ODL_NETWORKS)
-    response.raise_for_status()
-
-    response = _CLIENT.get(odl_const.ODL_NETWORKS + "/" + _CANARY_NETWORK_ID)
-    if response.status_code == requests.codes.not_found:
-        return True
-
-    # In case there was an error raise it up because we don't know how to deal
-    # with it..
-    response.raise_for_status()
-    return False
-
-
-def _canary_network_not_in_journal(session):
-    return not db.check_for_pending_or_processing_ops(session,
-                                                      _CANARY_NETWORK_ID,
-                                                      odl_const.ODL_CREATE)
-
-
-def _sync_resources(session, plugin, dbcontext, object_type, collection_name):
-    obj_getter = getattr(plugin, 'get_%s' % collection_name)
-    resources = obj_getter(dbcontext)
-
-    for resource in resources:
-        db.create_pending_row(session, object_type, resource['id'],
-                              odl_const.ODL_CREATE, resource)
-
-
-def _sync_router_ports(session, plugin, dbcontext):
-    filters = {'device_owner': [l3_constants.DEVICE_OWNER_ROUTER_INTF]}
-    router_ports = plugin.get_ports(dbcontext, filters=filters)
-    for port in router_ports:
-        resource = {'subnet_id': port['fixed_ips'][0]['subnet_id'],
-                    'port_id': port['id'],
-                    'id': port['device_id'],
-                    'tenant_id': port['tenant_id']}
-        db.create_pending_row(session, odl_const.ODL_ROUTER_INTF, port['id'],
-                              odl_const.ODL_ADD, resource)