Revert "Added fabric_type field in journal database"

Using UFM is not in the POR at the moment, so we revert
it for now.

This reverts commit 6b5eae7.

Change-Id: Idcfc4d07f2a73b556ebfdedd0d083e7bbc5e5682

Author: moshe010

networking_mlnx/db/db.py

@@ -78,11 +78,10 @@ def get_all_db_rows_by_state(session, state):
 # might both succeed in changing the same row to pending, but at least one
 # of them will get a deadlock from Galera and will have to retry the operation.
 @db_api.retry_db_errors
-def get_oldest_pending_db_row_with_lock(session,
-                                        fabric_type=sdn_const.FABRIC_ETH):
+def get_oldest_pending_db_row_with_lock(session):
     with session.begin():
         row = session.query(sdn_journal_db.SdnJournal).filter_by(
-            state=sdn_const.PENDING, fabric_type=fabric_type).order_by(
+            state=sdn_const.PENDING).order_by(
             asc(sdn_journal_db.SdnJournal.last_retried)).with_for_update(
         ).first()
         if row:
@@ -136,14 +135,13 @@ def delete_row(session, row=None, row_id=None):
 
 @oslo_db_api.wrap_db_retry(max_retries=db_api.MAX_RETRIES)
 def create_pending_row(session, object_type, object_uuid,
-                       operation, data, fabric_type=sdn_const.FABRIC_ETH):
+                       operation, data):
     data = jsonutils.dumps(data)
     row = sdn_journal_db.SdnJournal(object_type=object_type,
                                     object_uuid=object_uuid,
                                     operation=operation, data=data,
                                     created_at=func.now(),
-                                    state=sdn_const.PENDING,
-                                    fabric_type=fabric_type)
+                                    state=sdn_const.PENDING)
     session.add(row)
     # Keep session flush for unit tests. NOOP for L2/L3 events since calls are
     # made inside database session transaction with subtransactions=True.

networking_mlnx/db/migration/alembic_migrations/versions/EXPAND_HEAD

@@ -1 +1 @@
-25233f351591
+5d5e04ea01d5

networking_mlnx/db/migration/alembic_migrations/versions/ussuri/expand/25233f351591_add_fabric_type.py

@@ -35,5 +35,3 @@ class SdnJournal(model_base.BASEV2, model_base.HasId):
     created_at = sa.Column(sa.DateTime, server_default=sa.func.now())
     last_retried = sa.Column(sa.TIMESTAMP, server_default=sa.func.now(),
                              onupdate=sa.func.now())
-    fabric_type = sa.Column(sa.Enum(sdn_const.FABRIC_ETH, sdn_const.FABRIC_IB),
-                            nullable=False, default=sdn_const.FABRIC_ETH)

networking_mlnx/db/models/sdn_journal_db.py

@@ -42,9 +42,9 @@ def new_func(obj, *args, **kwargs):
 
 
 def record(db_session, object_type, object_uuid, operation, data,
-           context=None, fabric_type=sdn_const.FABRIC_ETH):
+           context=None):
     db.create_pending_row(db_session, object_type, object_uuid, operation,
-                          data, fabric_type)
+                          data)
 
 
 class SdnJournalThread(object):

networking_mlnx/journal/journal.py

@@ -38,7 +38,3 @@
 
 # Constants for physical_networks option
 ANY = '*'
-
-# fabric types
-FABRIC_ETH = 'ETH'
-FABRIC_IB = 'IB'

networking_mlnx/plugins/ml2/drivers/sdn/constants.py

@@ -18,7 +18,6 @@
 from neutron.objects.qos import policy as policy_object
 from neutron_lib.api.definitions import extra_dhcp_opt as edo_ext
 from neutron_lib.api.definitions import portbindings
-from neutron_lib.api.definitions import provider_net
 from neutron_lib import constants as neutron_const
 from neutron_lib.db import api as db_api
 from neutron_lib.plugins.ml2 import api
@@ -163,13 +162,8 @@ def _record_in_journal(context, object_type, operation, data=None):
             SDNMechanismDriver._replace_port_dhcp_opt_name(
                 data, edo_ext.DHCP_OPT_CLIENT_ID_NUM,
                 edo_ext.DHCP_OPT_CLIENT_ID)
-            fabric_type = (SDNMechanismDriver.
-                           _get_fabric_type(context.network.current))
-        else:
-            fabric_type = SDNMechanismDriver._get_fabric_type(context.current)
         journal.record(context._plugin_context.session, object_type,
-                       context.current['id'], operation, data,
-                       fabric_type=fabric_type)
+                       context.current['id'], operation, data)
 
     @context_validator(sdn_const.NETWORK)
     @error_handler
@@ -427,25 +421,3 @@ def check_segments(self, segments):
     def _get_network_qos_policy(self, context, net_id):
         return policy_object.QosPolicy.get_network_policy(
             context._plugin_context, net_id)
-
-    @staticmethod
-    def _get_network_physnet(network_context):
-        if (provider_net.PHYSICAL_NETWORK in network_context and
-                network_context[provider_net.PHYSICAL_NETWORK]):
-            return network_context[provider_net.PHYSICAL_NETWORK]
-
-    @staticmethod
-    def _get_ib_physnets():
-        """Returns a list of InfiniBand physnets which is represented by
-        the configuration option `bind_normal_ports_physnets`.
-
-        :return: list of InfiniBand physnets
-        """
-        return cfg.CONF.sdn.bind_normal_ports_physnets
-
-    @staticmethod
-    def _get_fabric_type(network_context):
-        physnet = SDNMechanismDriver._get_network_physnet(network_context)
-        if physnet in SDNMechanismDriver._get_ib_physnets():
-            return sdn_const.FABRIC_IB
-        return sdn_const.FABRIC_ETH

networking_mlnx/plugins/ml2/drivers/sdn/sdn_mech_driver.py

@@ -113,13 +113,6 @@ def test_get_oldest_pending_row_none_when_no_rows(self):
         row = db.get_oldest_pending_db_row_with_lock(self.db_session)
         self.assertIsNone(row)
 
-    def test_get_oldest_pending_row_none_when_rows_are_eth(self):
-        db.create_pending_row(self.db_session, *self.UPDATE_ROW,
-                              fabric_type=sdn_const.FABRIC_ETH)
-        row = db.get_oldest_pending_db_row_with_lock(
-            self.db_session, fabric_type=sdn_const.FABRIC_IB)
-        self.assertIsNone(row)
-
     def _test_get_oldest_pending_row_none(self, state):
         db.create_pending_row(self.db_session, *self.UPDATE_ROW)
         row = db.get_all_db_rows(self.db_session)[0]
@@ -157,17 +150,6 @@ def test_get_oldest_pending_row_order(self):
         row = db.get_oldest_pending_db_row_with_lock(self.db_session)
         self.assertEqual(older_row, row)
 
-    def test_get_oldest_pending_row_fabric_default(self):
-        db.create_pending_row(self.db_session, *self.UPDATE_ROW)
-        row = db.get_all_db_rows(self.db_session)[0]
-        self.assertEqual(sdn_const.FABRIC_ETH, row.fabric_type)
-
-    def test_get_oldest_pending_row_fabric_ib(self):
-        args = self.UPDATE_ROW + [sdn_const.FABRIC_IB]
-        db.create_pending_row(self.db_session, *args)
-        row = db.get_all_db_rows(self.db_session)[0]
-        self.assertEqual(sdn_const.FABRIC_IB, row.fabric_type)
-
     def test_get_all_monitoring_db_row_by_oldest_order(self):
         db.create_pending_row(self.db_session, *self.UPDATE_ROW)
         db.create_pending_row(self.db_session, *self.UPDATE_ROW)

networking_mlnx/tests/unit/db/test_db.py

@@ -203,18 +203,10 @@ def _get_mock_port_operation_context(self):
                     'network_id': 'c13bba05-eb07-45ba-ace2-765706b2d701',
                     'network_qos_policy': None}
 
-        current_network = {'provider:segmentation_id': SEG_ID,
-                           'id': 'c13bba05-eb07-45ba-ace2-765706b2d701',
-                           'name': 'net1',
-                           'provider:network_type': 'vlan',
-                           'provider:physical_network': 'default',
-                           'network_qos_policy': None}
-
         # The port context should have NetwrokContext object that contain
         # the segments list
         network_context = type('NetworkContext', (object,),
-                               {"network_segments": self._get_segments_list(),
-                                'current': current_network})
+                            {"network_segments": self._get_segments_list()})
 
         context = mock.Mock(current=current, _port=current,
                             original=original,
@@ -235,19 +227,10 @@ def _get_mock_bind_operation_context(self):
                    'device_owner': DEVICE_OWNER_COMPUTE,
                    'network_id': 'c13bba05-eb07-45ba-ace2-765706b2d701',
                    'network_qos_policy': None}
-
-        current_network = {'provider:segmentation_id': SEG_ID,
-                           'id': 'c13bba05-eb07-45ba-ace2-765706b2d701',
-                           'name': 'net1',
-                           'provider:network_type': 'vlan',
-                           'provider:physical_network': 'default',
-                           'network_qos_policy': None}
-
         # The port context should have NetwrokContext object that contain
         # the segments list
         network_context = type('NetworkContext', (object,),
-                               {"network_segments": self._get_segments_list(),
-                                'current': current_network})
+                            {"network_segments": self._get_segments_list()})
         context = mock.Mock(current=current, _port=current,
                             segments_to_bind=self._get_segments_list(),
                             network=network_context)
@@ -620,28 +603,3 @@ def _test_filtered_object_type(self, object_type):
             self._call_operation_object(operation, object_type)
             rows = db.get_all_db_rows(self.db_session)
             self.assertEqual(0, len(rows))
-
-    def test_get_fabric_type_default(self):
-        network_context = {'provider:segmentation_id': SEG_ID,
-                           'id': 'c13bba05-eb07-45ba-ace2-765706b2d701',
-                           'name': 'net1',
-                           'provider:network_type': 'vlan',
-                           'provider:physical_network': 'default',
-                           'network_qos_policy': None}
-        self.mech = sdn_mech_driver.SDNMechanismDriver()
-        self.assertEqual(sdn_const.FABRIC_ETH,
-                         self.mech._get_fabric_type(network_context))
-
-    def test_get_fabric_type_ib(self):
-        self.conf.set_override(
-            'bind_normal_ports_physnets', ['ibnet'], sdn_const.GROUP_OPT)
-
-        network_context = {'provider:segmentation_id': SEG_ID,
-                           'id': 'c13bba05-eb07-45ba-ace2-765706b2d701',
-                           'name': 'net1',
-                           'provider:network_type': 'vlan',
-                           'provider:physical_network': 'ibnet',
-                           'network_qos_policy': None}
-        self.mech = sdn_mech_driver.SDNMechanismDriver()
-        self.assertEqual(sdn_const.FABRIC_IB,
-                         self.mech._get_fabric_type(network_context))