Nova net functional tests round 1

* address scope
* network agent
* network flavor
* network flavor profile
* network meter
* network meter rule

Also create a new common network functional test class
NetworkTests to house the setting of haz_network in a single place.
The individual test skipping stays in the final classes to re-enforce
the idea that some tests work with both Nova-net and Neutron.

Change-Id: Ie3910231c6fc9e2031438c599afa904f43c874a7

Author: Dean Troyer

openstackclient/tests/functional/network/v2/common.py

@@ -0,0 +1,22 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from openstackclient.tests.functional import base
+
+
+class NetworkTests(base.TestCase):
+    """Functional tests for Network commands"""
+
+    @classmethod
+    def setUpClass(cls):
+        # super(NetworkTests, cls).setUp()
+        cls.haz_network = base.is_service_enabled('network')

openstackclient/tests/functional/network/v2/test_address_scope.py

@@ -13,17 +13,23 @@
 import json
 import uuid
 
-from openstackclient.tests.functional import base
+from openstackclient.tests.functional.network.v2 import common
 
 
-class AddressScopeTests(base.TestCase):
+class AddressScopeTests(common.NetworkTests):
     """Functional tests for address scope. """
 
     # NOTE(dtroyer): Do not normalize the setup and teardown of the resource
     #                creation and deletion.  Little is gained when each test
     #                has its own needs and there are collisions when running
     #                tests in parallel.
 
+    def setUp(self):
+        super(AddressScopeTests, self).setUp()
+        # Nothing in this class works with Nova Network
+        if not self.haz_network:
+            self.skipTest("No Network service present")
+
     def test_address_scope_delete(self):
         """Test create, delete multiple"""
         name1 = uuid.uuid4().hex

openstackclient/tests/functional/network/v2/test_network_agent.py

@@ -13,39 +13,85 @@
 import json
 import uuid
 
-from openstackclient.tests.functional import base
-
-
-class NetworkAgentTests(base.TestCase):
-    """Functional tests for network agent. """
-    IDs = None
-    HEADERS = ['ID']
-    FIELDS = ['id']
-
-    @classmethod
-    def test_network_agent_list(cls):
-        opts = cls.get_opts(cls.HEADERS)
-        raw_output = cls.openstack('network agent list' + opts)
-        # get the list of network agent IDs.
-        cls.IDs = raw_output.split('\n')
-
-    def test_network_agent_show(self):
-        opts = self.get_opts(self.FIELDS)
-        raw_output = self.openstack('network agent show ' + self.IDs[0] + opts)
-        self.assertEqual(self.IDs[0] + "\n", raw_output)
-
-    def test_network_agent_set(self):
-        opts = self.get_opts(['admin_state_up'])
-        self.openstack('network agent set --disable ' + self.IDs[0])
-        raw_output = self.openstack('network agent show ' + self.IDs[0] + opts)
-        self.assertEqual("DOWN\n", raw_output)
-        self.openstack('network agent set --enable ' + self.IDs[0])
-        raw_output = self.openstack('network agent show ' + self.IDs[0] + opts)
-        self.assertEqual("UP\n", raw_output)
-
-
-class NetworkAgentListTests(base.TestCase):
-    """Functional test for network agent list --network. """
+from openstackclient.tests.functional.network.v2 import common
+
+
+class NetworkAgentTests(common.NetworkTests):
+    """Functional tests for network agent"""
+
+    def setUp(self):
+        super(NetworkAgentTests, self).setUp()
+        # Nothing in this class works with Nova Network
+        if not self.haz_network:
+            self.skipTest("No Network service present")
+
+    def test_network_agent_list_show_set(self):
+        """Test network agent list, set, show commands
+
+        Do these serially because show and set rely on the existing agent IDs
+        from the list output and we had races when run in parallel.
+        """
+
+        # agent list
+        agent_list = json.loads(self.openstack(
+            'network agent list -f json'
+        ))
+        self.assertIsNotNone(agent_list[0])
+
+        agent_ids = list([row["ID"] for row in agent_list])
+
+        # agent show
+        cmd_output = json.loads(self.openstack(
+            'network agent show -f json ' +
+            agent_ids[0]
+        ))
+        self.assertEqual(
+            agent_ids[0],
+            cmd_output['id'],
+        )
+
+        # agent set
+        raw_output = self.openstack(
+            'network agent set ' +
+            '--disable ' +
+            agent_ids[0]
+        )
+        self.assertOutput('', raw_output)
+
+        cmd_output = json.loads(self.openstack(
+            'network agent show -f json ' +
+            agent_ids[0]
+        ))
+        self.assertEqual(
+            "DOWN",
+            cmd_output['admin_state_up'],
+        )
+
+        raw_output = self.openstack(
+            'network agent set ' +
+            '--enable ' +
+            agent_ids[0]
+        )
+        self.assertOutput('', raw_output)
+
+        cmd_output = json.loads(self.openstack(
+            'network agent show -f json ' +
+            agent_ids[0]
+        ))
+        self.assertEqual(
+            "UP",
+            cmd_output['admin_state_up'],
+        )
+
+
+class NetworkAgentListTests(common.NetworkTests):
+    """Functional test for network agent"""
+
+    def setUp(self):
+        super(NetworkAgentListTests, self).setUp()
+        # Nothing in this class works with Nova Network
+        if not self.haz_network:
+            self.skipTest("No Network service present")
 
     def test_network_dhcp_agent_list(self):
         """Test network agent list"""

openstackclient/tests/functional/network/v2/test_network_flavor.py

@@ -14,15 +14,20 @@
 import json
 import uuid
 
-from openstackclient.tests.functional import base
+from openstackclient.tests.functional.network.v2 import common
 
 
-class NetworkFlavorTests(base.TestCase):
-    """Functional tests for network flavor."""
+class NetworkFlavorTests(common.NetworkTests):
+    """Functional tests for network flavor"""
 
-    def test_add_remove_network_flavor_profile(self):
-        """Test add and remove network flavor to/from profile"""
+    def setUp(self):
+        super(NetworkFlavorTests, self).setUp()
+        # Nothing in this class works with Nova Network
+        if not self.haz_network:
+            self.skipTest("No Network service present")
 
+    def test_network_flavor_add_remove_profile(self):
+        """Test add and remove network flavor to/from profile"""
         # Create Flavor
         name1 = uuid.uuid4().hex
         cmd_output1 = json.loads(self.openstack(