Set the default API version of OSC CLI to "latest"

Now the default of OSC is the negotiated maximum version understood
by both the server and the client. The value of "1" is now equivalent
to "latest" as well.

This change also cleans up unit tests for the OSC plugin.

Change-Id: I489fee937a356b523eb35379dce3631195132fe5
Closes-Bug: #1671145

2 files changed, 41 insertions, 43 deletions

diff --git a/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py b/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py
index d0729ca..2d1be7c 100644
--- a/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py
+++ b/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py
@@ -27,26 +27,6 @@ class BaremetalNodeTests(base.TestCase):
         super(BaremetalNodeTests, self).setUp()
         self.node = self.node_create()
 
-    def test_warning_version_not_specified(self):
-        """Test API version warning is printed when API version unspecified.
-
-        A warning will appear for any invocation of the baremetal OSC plugin
-        without --os-baremetal-api-version specified. It's tested with a simple
-        node list command here.
-        """
-        output = self.openstack('baremetal node list', merge_stderr=True)
-        self.assertIn('the default will be the latest API version', output)
-
-    def test_no_warning_version_specified(self):
-        """Test API version warning is not printed when API version specified.
-
-        This warning should not appear when a user specifies the ironic API
-        version to use.
-        """
-        output = self.openstack('baremetal --os-baremetal-api-version=1.9 node'
-                                ' list', merge_stderr=True)
-        self.assertNotIn('the default will be the latest API version', output)
-
     def test_create_name_uuid(self):
         """Check baremetal node create command with name and UUID.
 
@@ -64,10 +44,25 @@ class BaremetalNodeTests(base.TestCase):
         self.assertEqual(node_info['name'], name)
         self.assertEqual(node_info['driver'], 'fake')
         self.assertEqual(node_info['maintenance'], False)
+        self.assertEqual(node_info['provision_state'], 'enroll')
         node_list = self.node_list()
         self.assertIn(uuid, [x['UUID'] for x in node_list])
         self.assertIn(name, [x['Name'] for x in node_list])
 
+    def test_create_old_api_version(self):
+        """Check baremetal node create command with name and UUID.
+
+        Test steps:
+        1) Create baremetal node in setUp.
+        2) Create one more baremetal node explicitly with old API version
+        3) Check that node successfully created.
+        """
+        node_info = self.node_create(
+            params='--os-baremetal-api-version 1.5')
+        self.assertEqual(node_info['driver'], 'fake')
+        self.assertEqual(node_info['maintenance'], False)
+        self.assertEqual(node_info['provision_state'], 'available')
+
     @ddt.data('name', 'uuid')
     def test_delete(self, key):
         """Check baremetal node delete command with name/UUID argument.
diff --git a/ironicclient/tests/functional/osc/v1/test_baremetal_node_provision_states.py b/ironicclient/tests/functional/osc/v1/test_baremetal_node_provision_states.py
index acc24a2..350582c 100644
--- a/ironicclient/tests/functional/osc/v1/test_baremetal_node_provision_states.py
+++ b/ironicclient/tests/functional/osc/v1/test_baremetal_node_provision_states.py
@@ -22,20 +22,38 @@ class ProvisionStateTests(base.TestCase):
         super(ProvisionStateTests, self).setUp()
         self.node = self.node_create()
 
-    def test_deploy_rebuild_undeploy(self):
+    def test_deploy_rebuild_undeploy_manage(self):
         """Deploy, rebuild and undeploy node.
 
         Test steps:
         1) Create baremetal node in setUp.
-        2) Check initial "available" provision state.
-        3) Set baremetal node "deploy" provision state.
-        4) Check baremetal node provision_state field value is "active".
-        5) Set baremetal node "rebuild" provision state.
-        6) Check baremetal node provision_state field value is "active".
-        7) Set baremetal node "undeploy" provision state.
-        8) Check baremetal node provision_state field value is "available".
+        2) Check initial "enroll" provision state.
+        3) Set baremetal node "manage" provision state.
+        4) Check baremetal node provision_state field value is "manageable".
+        5) Set baremetal node "provide" provision state.
+        6) Check baremetal node provision_state field value is "available".
+        7) Set baremetal node "deploy" provision state.
+        8) Check baremetal node provision_state field value is "active".
+        9) Set baremetal node "rebuild" provision state.
+        10) Check baremetal node provision_state field value is "active".
+        11) Set baremetal node "undeploy" provision state.
+        12) Check baremetal node provision_state field value is "available".
+        13) Set baremetal node "manage" provision state.
+        14) Check baremetal node provision_state field value is "manageable".
+        15) Set baremetal node "provide" provision state.
+        16) Check baremetal node provision_state field value is "available".
         """
         show_prop = self.node_show(self.node['uuid'], ["provision_state"])
+        self.assertEqual("enroll", show_prop["provision_state"])
+
+        # manage
+        self.openstack('baremetal node manage {0}'.format(self.node['uuid']))
+        show_prop = self.node_show(self.node['uuid'], ["provision_state"])
+        self.assertEqual("manageable", show_prop["provision_state"])
+
+        # provide
+        self.openstack('baremetal node provide {0}'.format(self.node['uuid']))
+        show_prop = self.node_show(self.node['uuid'], ["provision_state"])
         self.assertEqual("available", show_prop["provision_state"])
 
         # deploy
@@ -55,21 +73,6 @@ class ProvisionStateTests(base.TestCase):
         show_prop = self.node_show(self.node['uuid'], ["provision_state"])
         self.assertEqual("available", show_prop["provision_state"])
 
-    def test_manage_provide(self):
-        """Manage and provide node back.
-
-        Steps:
-        1) Create baremetal node in setUp.
-        2) Check initial "available" provision state.
-        3) Set baremetal node "manage" provision state.
-        4) Check baremetal node provision_state field value is "manageable".
-        5) Set baremetal node "provide" provision state.
-        6) Check baremetal node provision_state field value is "available".
-        """
-
-        show_prop = self.node_show(self.node['uuid'], ["provision_state"])
-        self.assertEqual("available", show_prop["provision_state"])
-
         # manage
         self.openstack('baremetal node manage {0}'.format(self.node['uuid']))
         show_prop = self.node_show(self.node['uuid'], ["provision_state"])