Merge pull request #35 from stackhpc/upstream/yoga-2023-03-13

Synchronise yoga with upstream

Author: markgoddard

doc/source/ovn/migration.rst

@@ -21,9 +21,9 @@ adjustments, prepare the environment for the procedure.
 
 Subsequent steps start the migration via Ansible.
 
-Plan for a 24-hour wait after the setup-mtu-t1 step to allow VMs to catch up
-with the new MTU size. The default neutron ML2/OVS configuration has a
-dhcp_lease_duration of 86400 seconds (24h).
+Plan for a 24-hour wait after the reduce-dhcp-t1 step to allow VMs to catch up
+with the new MTU size from the DHCP server. The default neutron ML2/OVS
+configuration has a dhcp_lease_duration of 86400 seconds (24h).
 
 Also, if there are instances using static IP assignment, the administrator
 should be ready to update the MTU of those instances to the new value of 8
@@ -182,11 +182,11 @@ Perform the following steps in the undercloud
    with the migration playbooks.
 
 
-6. Run ``ovn_migration.sh setup-mtu-t1``
+6. Run ``ovn_migration.sh reduce-dhcp-t1``
 
    .. code-block:: console
 
-      $ ovn_migration.sh setup-mtu-t1
+      $ ovn_migration.sh reduce-dhcp-t1
 
 
    This lowers the T1 parameter

neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py

@@ -143,7 +143,7 @@ def _create_metadata_port(self, txn, lswitch_name):
                 external_ids={
                     ovn_const.OVN_CIDRS_EXT_ID_KEY: '192.168.122.123/24'}))
 
-    def _create_logical_switch_port(self, type_=None):
+    def _create_logical_switch_port(self, type_=None, addresses=None):
         lswitch_name = 'ovn-' + uuidutils.generate_uuid()
         lswitchport_name = 'ovn-port-' + uuidutils.generate_uuid()
         # It may take some time to ovn-northd to translate from OVN NB DB to
@@ -153,6 +153,8 @@ def _create_logical_switch_port(self, type_=None):
         self.handler.watch_event(pb_event)
 
         lswitch_port_columns = {}
+        if addresses:
+            lswitch_port_columns['addresses'] = addresses
         if type_:
             lswitch_port_columns['type'] = type_
 
@@ -167,30 +169,33 @@ def _create_logical_switch_port(self, type_=None):
 
         return lswitchport_name, lswitch_name
 
-    @mock.patch.object(agent.PortBindingChassisCreatedEvent, 'run')
-    def test_agent_resync_on_non_existing_bridge(self, mock_pbinding):
+    def test_agent_resync_on_non_existing_bridge(self):
+        BR_NEW = 'br-new'
+        self._mock_get_ovn_br.return_value = BR_NEW
+        self.agent.ovs_idl.list_br.return_value.execute.return_value = [BR_NEW]
         # The agent has initialized with br-int and above list_br doesn't
         # return it, hence the agent should trigger reconfiguration and store
         # new br-new value to its attribute.
         self.assertEqual(self.OVN_BRIDGE, self.agent.ovn_bridge)
 
-        lswitchport_name, _ = self._create_logical_switch_port()
+        # NOTE: The IP address is specifically picked such that it fits the
+        # metadata port external_ids: { neutron:cidrs }. This is because agent
+        # will only trigger if the logical port is part of a neutron subnet
+        lswitchport_name, _ = self._create_logical_switch_port(
+            addresses='AA:AA:AA:AA:AA:AB 192.168.122.125'
+        )
 
         # Trigger PortBindingChassisCreatedEvent
         self.sb_api.lsp_bind(lswitchport_name, self.chassis_name).execute(
             check_error=True, log_errors=True)
-        exc = Exception('PortBindingChassisCreatedEvent was not called')
 
-        def check_mock_pbinding():
-            if mock_pbinding.call_count < 1:
-                return False
-            args = mock_pbinding.call_args[0]
-            self.assertEqual('update', args[0])
-            self.assertEqual(lswitchport_name, args[1].logical_port)
-            self.assertEqual(self.chassis_name, args[1].chassis[0].name)
-            return True
-
-        n_utils.wait_until_true(check_mock_pbinding, timeout=10, exception=exc)
+        exc = Exception("Agent bridge hasn't changed from %s to %s "
+                        "in 10 seconds after Port_Binding event" %
+                        (self.agent.ovn_bridge, BR_NEW))
+        n_utils.wait_until_true(
+            lambda: BR_NEW == self.agent.ovn_bridge,
+            timeout=10,
+            exception=exc)
 
     def _test_agent_events(self, delete, type_=None):
         m_pb_created = mock.patch.object(

tools/ovn_migration/infrared/tripleo-ovn-migration/main.yml

@@ -166,10 +166,10 @@
                   set -o pipefail &&
                   {{ ovn_migration_working_dir }}/start-ovn-migration.sh generate-inventory 2>&1 > {{ ovn_migration_working_dir}}/generate-inventory.log
 
-            - name: Set MTU T1
+            - name: Set DHCP T1 timer
               shell:
                   set -o pipefail &&
-                  {{ ovn_migration_working_dir }}/start-ovn-migration.sh setup-mtu-t1 2>&1 > {{ ovn_migration_working_dir}}/setup-mtu-t1.log
+                  {{ ovn_migration_working_dir }}/start-ovn-migration.sh reduce-dhcp-t1 2>&1 > {{ ovn_migration_working_dir}}/reduce-dhcp-t1.log
 
             - name: Reduce mtu of the pre migration networks
               shell:

tools/ovn_migration/tripleo_environment/ovn_migration.sh

@@ -238,7 +238,7 @@ EOF
     cat hosts_for_migration
     echo "***************************************"
     echo "Generated the inventory file - hosts_for_migration"
-    echo "Please review the file before running the next command - setup-mtu-t1"
+    echo "Please review the file before running the next command - reduce-dhcp-t1"
 }
 
 # Check if source inventory exists
@@ -283,7 +283,7 @@ oc_check_network_mtu() {
     return $?
 }
 
-setup_mtu_t1() {
+reduce_dhcp_t1() {
     # Run the ansible playbook to reduce the DHCP T1 parameter in
     # dhcp_agent.ini in all the overcloud nodes where dhcp agent is running.
     ansible-playbook  -vv $OPT_WORKDIR/playbooks/reduce-dhcp-renewal-time.yml \
@@ -349,7 +349,7 @@ complete details. This script needs to be run in 5 steps.
 
            Generates the inventory file
 
- Step 2 -> ovn_migration.sh setup-mtu-t1
+ Step 2 -> ovn_migration.sh reduce-dhcp-t1 (deprecated name setup-mtu-t1)
 
            Sets the DHCP renewal T1 to 30 seconds. After this step you will
            need to wait at least 24h for the change to be propagated to all
@@ -386,9 +386,13 @@ case $command in
         ret_val=$?
         ;;
 
-    setup-mtu-t1)
+    reduce-dhcp-t1 | setup-mtu-t1)
+        if [[ $command = 'setup-mtu-t1' ]]; then
+            echo -e "Warning: setup-mtu-t1 argument was renamed."\
+                    "Use reduce-dhcp-t1 argument instead."
+        fi
         check_for_necessary_files
-        setup_mtu_t1
+        reduce_dhcp_t1
         ret_val=$?;;
 
     reduce-mtu)