Merge "undercloud: support noop management interface for snmp and ipmi"

tripleoclient/tests/v1/undercloud/test_undercloud_config.py

@@ -46,7 +46,8 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
             'IronicEnabledHardwareTypes': ['idrac', 'ilo', 'ipmi', 'redfish'],
             'IronicEnabledBootInterfaces': ['ilo-pxe', 'pxe'],
             'IronicEnabledManagementInterfaces': ['fake', 'idrac', 'ilo',
-                                                  'ipmitool', 'redfish'],
+                                                  'ipmitool', 'noop',
+                                                  'redfish'],
             'IronicEnabledPowerInterfaces': ['fake', 'idrac', 'ilo',
                                              'ipmitool', 'redfish'],
             'IronicEnabledRaidInterfaces': ['idrac', 'no-raid'],
@@ -64,7 +65,7 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
             'IronicEnabledHardwareTypes': ['ipmi', 'redfish'],
             'IronicEnabledBootInterfaces': ['pxe'],
             'IronicEnabledManagementInterfaces': ['fake', 'ipmitool',
-                                                  'redfish'],
+                                                  'noop', 'redfish'],
             'IronicEnabledPowerInterfaces': ['fake', 'ipmitool', 'redfish'],
             'IronicEnabledRaidInterfaces': ['no-raid'],
             'IronicEnabledVendorInterfaces': ['ipmitool', 'no-vendor'],
@@ -91,7 +92,8 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
             'IronicEnabledBootInterfaces': ['ilo-pxe', 'irmc-pxe', 'pxe'],
             'IronicEnabledManagementInterfaces': ['cimc', 'fake', 'idrac',
                                                   'ilo', 'ipmitool', 'irmc',
-                                                  'redfish', 'staging-ovirt',
+                                                  'noop', 'redfish',
+                                                  'staging-ovirt',
                                                   'ucsm', 'xclarity'],
             'IronicEnabledPowerInterfaces': ['cimc', 'fake', 'idrac',
                                              'ilo', 'ipmitool', 'irmc',

tripleoclient/v1/undercloud_config.py

@@ -168,18 +168,21 @@ def _process_drivers_and_hardware_types(conf, env):
         if hw_type in enabled_hardware_types:
             vendor_interfaces.add(iface)
 
+    power_interfaces = mgmt_interfaces.copy()
+    # The snmp hardware type uses noop management and snmp power; noop
+    # management is also used by ipmi and staging hardware types.
+    mgmt_interfaces.add('noop')
+    if 'snmp' in enabled_hardware_types:
+        power_interfaces.add('snmp')
+
     env['IronicEnabledHardwareTypes'] = sorted(enabled_hardware_types)
 
     env['IronicEnabledBootInterfaces'] = sorted(boot_interfaces)
     env['IronicEnabledManagementInterfaces'] = sorted(mgmt_interfaces)
+    env['IronicEnabledPowerInterfaces'] = sorted(power_interfaces)
     env['IronicEnabledRaidInterfaces'] = sorted(raid_interfaces)
     env['IronicEnabledVendorInterfaces'] = sorted(vendor_interfaces)
 
-    # The snmp hardware type uses fake management and snmp power
-    if 'snmp' in enabled_hardware_types:
-        mgmt_interfaces.add('snmp')
-    env['IronicEnabledPowerInterfaces'] = sorted(mgmt_interfaces)
-
 
 def _process_ipa_args(conf, env):
     """Populate the environment with IPA kernal args ."""