Merge "Bring configurations from tempest to ironic_tempest_plugin"

devstack/lib/ironic

@@ -1582,6 +1582,9 @@ function ironic_configure_tempest {
     image_uuid=$(openstack image show $IRONIC_IMAGE_NAME -f value -c id)
     iniset $TEMPEST_CONFIG compute image_ref $image_uuid
     iniset $TEMPEST_CONFIG compute image_ref_alt $image_uuid
+
+    iniset $TEMPEST_CONFIG auth create_isolated_networks False
+    iniset $TEMPEST_CONFIG network-feature-enabled port_admin_state_change False
 }
 
 function get_ironic_node_prefix {

ironic_tempest_plugin/clients.py

@@ -36,9 +36,15 @@ class Manager(clients.Manager):
         :param service: service name
         """
         super(Manager, self).__init__(credentials, service)
+        default_params_with_timeout_values = {
+            'build_interval': CONF.compute.build_interval,
+            'build_timeout': CONF.compute.build_timeout
+        }
+        default_params_with_timeout_values.update(self.default_params)
+
         self.baremetal_client = BaremetalClient(
             self.auth_provider,
             CONF.baremetal.catalog_type,
             CONF.identity.region,
             endpoint_type=CONF.baremetal.endpoint_type,
-            **self.default_params_with_timeout_values)
+            **default_params_with_timeout_values)

ironic_tempest_plugin/config.py

@@ -28,44 +28,38 @@ baremetal_group = cfg.OptGroup(name='baremetal',
                                     'live_migration, pause, rescue, resize, '
                                     'shelve, snapshot, and suspend')
 
-# NOTE(maurosr): Until liberty-eol we need to keep config options and tests
-# on tempest's tree to test stable branches and thus we have to comment the
-# options bellow to avoid duplication. Only new options should live here.
 BaremetalGroup = [
-    # cfg.StrOpt('catalog_type',
+    cfg.StrOpt('catalog_type',
-    #            default='baremetal',
+               default='baremetal',
-    #            help="Catalog type of the baremetal provisioning service"),
+               help="Catalog type of the baremetal provisioning service"),
-    # cfg.BoolOpt('driver_enabled',
+    cfg.StrOpt('driver',
-    #             default=True,
+               default='fake',
-    #             help="Whether the Ironic nova-compute driver is enabled"),
+               help="Driver name which Ironic uses"),
-    # cfg.StrOpt('driver',
+    cfg.StrOpt('endpoint_type',
-    #            default='fake',
+               default='publicURL',
-    #            help="Driver name which Ironic uses"),
+               choices=['public', 'admin', 'internal',
-    # cfg.StrOpt('endpoint_type',
+                        'publicURL', 'adminURL', 'internalURL'],
-    #            default='publicURL',
+               help="The endpoint type to use for the baremetal provisioning"
-    #            choices=['public', 'admin', 'internal',
+                    " service"),
-    #                     'publicURL', 'adminURL', 'internalURL'],
-    #            help="The endpoint type to use for the baremetal provisioning"
-    #                 " service"),
     cfg.IntOpt('deploywait_timeout',
                default=15,
                help="Timeout for Ironic node to reach the "
                     "wait-callback state after powering on."),
-    # cfg.IntOpt('active_timeout',
+    cfg.IntOpt('active_timeout',
-    #            default=300,
+               default=300,
-    #            help="Timeout for Ironic node to completely provision"),
+               help="Timeout for Ironic node to completely provision"),
-    # cfg.IntOpt('association_timeout',
+    cfg.IntOpt('association_timeout',
-    #            default=30,
+               default=30,
-    #            help="Timeout for association of Nova instance and Ironic "
+               help="Timeout for association of Nova instance and Ironic "
-    #                 "node"),
+                    "node"),
-    # cfg.IntOpt('power_timeout',
+    cfg.IntOpt('power_timeout',
-    #            default=60,
+               default=60,
-    #            help="Timeout for Ironic power transitions."),
+               help="Timeout for Ironic power transitions."),
-    # cfg.IntOpt('unprovision_timeout',
+    cfg.IntOpt('unprovision_timeout',
-    #            default=300,
+               default=300,
-    #            help="Timeout for unprovisioning an Ironic node. "
+               help="Timeout for unprovisioning an Ironic node. "
-    #                 "Takes longer since Kilo as Ironic performs an extra "
+                    "Takes longer since Kilo as Ironic performs an extra "
-    #                 "step in Node cleaning.")
+                    "step in Node cleaning."),
     cfg.StrOpt('min_microversion',
                help="Lower version of the test target microversion range. "
                     "The format is 'X.Y', where 'X' and 'Y' are int values. "

ironic_tempest_plugin/tests/scenario/baremetal_manager.py

@@ -58,8 +58,8 @@ class BaremetalScenarioTest(manager.ScenarioTest):
     @classmethod
     def skip_checks(cls):
         super(BaremetalScenarioTest, cls).skip_checks()
-        if not CONF.baremetal.driver_enabled:
+        if CONF.network_feature_enabled.port_admin_state_change:
-            msg = 'Ironic not available or Ironic compute driver not enabled'
+            msg = "Port state change feature isn't supported by Ironic."
             raise cls.skipException(msg)
 
     @classmethod

ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py

@@ -39,6 +39,7 @@ class BaremetalBasicOps(baremetal_manager.BaremetalScenarioTest):
         * Monitors the associated Ironic node for power and
           expected state transitions
     """
+
     def rebuild_instance(self, preserve_ephemeral=False):
         self.rebuild_server(server_id=self.instance['id'],
                             preserve_ephemeral=preserve_ephemeral,