Merge "Terminate macvtap agent when physical_interface_mapping config not present"

neutron/plugins/ml2/drivers/macvtap/agent/macvtap_neutron_agent.py

@@ -174,6 +174,11 @@ class MacvtapManager(amb.CommonAgentManagerBase):
 
 
 def parse_interface_mappings():
+    if not cfg.CONF.macvtap.physical_interface_mappings:
+        LOG.error(_LE("No physical_interface_mappings provided, but at least "
+                      "one mapping is required. Agent terminated!"))
+        sys.exit(1)
+
     try:
         interface_mappings = helpers.parse_mappings(
             cfg.CONF.macvtap.physical_interface_mappings)

neutron/tests/unit/plugins/ml2/drivers/macvtap/agent/test_macvtap_neutron_agent.py

@@ -189,6 +189,11 @@ class TestMacvtapMain(base.BaseTestCase):
             macvtap_neutron_agent.parse_interface_mappings()
             mock_exit.assert_called_with(1)
 
+    def test_parse_interface_mappings_no_mapping(self):
+        with mock.patch.object(sys, 'exit') as mock_exit:
+            macvtap_neutron_agent.parse_interface_mappings()
+            mock_exit.assert_called_with(1)
+
     def test_validate_firewall_driver_noop_long(self):
         cfg.CONF.set_override('firewall_driver',
                               'neutron.agent.firewall.NoopFirewallDriver',

releasenotes/notes/terminate-macvtap-agt-when-interface_mapping-not-present-3109faf3b44d366a.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - After upgrade, a macvtap agent without
+    physical_interface_mappings configured can not
+    be started. Specify a valid mapping to be able
+    to start and use the macvtap agent.