Merge "Fix some configuration type issues."

octavia/common/config.py

@@ -36,7 +36,9 @@ core_opts = [
     cfg.PortOpt('bind_port', default=9876,
                 help=_("The port to bind to")),
     cfg.StrOpt('auth_strategy', default=constants.NOAUTH,
-               choices=[constants.NOAUTH, constants.KEYSTONE],
+               choices=[constants.NOAUTH,
+                        constants.KEYSTONE,
+                        constants.TESTING],
                help=_("The auth strategy for API requests.")),
     cfg.StrOpt('api_handler', default='queue_producer',
                help=_("The handler that the API communicates with")),
@@ -54,8 +56,8 @@ core_opts = [
                help=_("The maximum number of items returned in a single "
                       "response. The string 'infinite' or a negative "
                       "integer value means 'no limit'")),
-    cfg.HostAddressOpt('host', default=utils.get_hostname(),
-                       help=_("The hostname Octavia is running on")),
+    cfg.HostnameOpt('host', default=utils.get_hostname(),
+                    help=_("The hostname Octavia is running on")),
     cfg.StrOpt('octavia_plugins',
                default='hot_plug_plugin',
                help=_('Name of the controller plugin to use'))

octavia/common/constants.py

@@ -382,6 +382,7 @@ KEEPALIVED_UPSTART = 'octavia-keepalived.conf'
 # Authentication
 KEYSTONE = 'keystone'
 NOAUTH = 'noauth'
+TESTING = 'testing'
 
 UBUNTU_AMP_NET_DIR_TEMPLATE = '/etc/netns/{netns}/network/interfaces.d/'
 RH_AMP_NET_DIR_TEMPLATE = '/etc/netns/{netns}/sysconfig/network-scripts/'

octavia/tests/functional/db/test_repositories.py

@@ -460,7 +460,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         self.skipTest("PySqlite transaction handling is broken. We can unskip"
                       "this when `test_sqlite_transactions_broken` fails.")
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
         project_id = uuidutils.generate_uuid()
         member = {'project_id': project_id, 'ip_address': '11.0.0.1',
                   'protocol_port': 80, 'enabled': True,
@@ -809,12 +809,12 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
 
         # Test auth_strategy == NOAUTH
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         self.assertFalse(self.repos.check_quota_met(self.session,
                                                     self.session,
                                                     models.LoadBalancer,
                                                     project_id))
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # Test check for missing project_id
         self.assertRaises(exceptions.MissingProjectID,
@@ -1554,13 +1554,13 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on non-existent quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         self.repos.decrement_quota(self.session,
                                    models.LoadBalancer,
                                    project_id)
         self.assertEqual(0, self.repos.quotas.count(self.session,
                                                     project_id=project_id))
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # Test decrement on non-existent quota
         project_id = uuidutils.generate_uuid()
@@ -1594,7 +1594,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on zero in use quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         quota = {'in_use_load_balancer': 0}
         self.repos.quotas.update(self.session, project_id, quota=quota)
         self.repos.decrement_quota(self.session,
@@ -1602,7 +1602,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
                                    project_id)
         self.assertEqual(0, self.repos.quotas.get(
             self.session, project_id=project_id).in_use_load_balancer)
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # Test decrement on in use quota
         project_id = uuidutils.generate_uuid()
@@ -1617,7 +1617,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on in use quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         quota = {'in_use_load_balancer': 1}
         self.repos.quotas.update(self.session, project_id, quota=quota)
         self.repos.decrement_quota(self.session,
@@ -1625,7 +1625,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
                                    project_id)
         self.assertEqual(0, self.repos.quotas.get(
             self.session, project_id=project_id).in_use_load_balancer)
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # ### Test listner quota
         # Test decrement on zero in use quota
@@ -1641,7 +1641,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on zero in use quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         quota = {'in_use_listener': 0}
         self.repos.quotas.update(self.session, project_id, quota=quota)
         self.repos.decrement_quota(self.session,
@@ -1649,7 +1649,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
                                    project_id)
         self.assertEqual(0, self.repos.quotas.get(
             self.session, project_id=project_id).in_use_listener)
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # Test decrement on in use quota
         project_id = uuidutils.generate_uuid()
@@ -1664,7 +1664,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on in use quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         quota = {'in_use_listener': 1}
         self.repos.quotas.update(self.session, project_id, quota=quota)
         self.repos.decrement_quota(self.session,
@@ -1672,7 +1672,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
                                    project_id)
         self.assertEqual(0, self.repos.quotas.get(
             self.session, project_id=project_id).in_use_listener)
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # ### Test pool quota
         # Test decrement on zero in use quota
@@ -1688,7 +1688,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on zero in use quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         quota = {'in_use_pool': 0}
         self.repos.quotas.update(self.session, project_id, quota=quota)
         self.repos.decrement_quota(self.session,
@@ -1696,7 +1696,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
                                    project_id)
         self.assertEqual(0, self.repos.quotas.get(
             self.session, project_id=project_id).in_use_pool)
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # Test decrement on in use quota
         project_id = uuidutils.generate_uuid()
@@ -1711,7 +1711,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on in use quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         quota = {'in_use_pool': 1}
         self.repos.quotas.update(self.session, project_id, quota=quota)
         self.repos.decrement_quota(self.session,
@@ -1719,7 +1719,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
                                    project_id)
         self.assertEqual(0, self.repos.quotas.get(
             self.session, project_id=project_id).in_use_pool)
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # ### Test health monitor quota
         # Test decrement on zero in use quota
@@ -1735,7 +1735,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on zero in use quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         quota = {'in_use_health_monitor': 0}
         self.repos.quotas.update(self.session, project_id, quota=quota)
         self.repos.decrement_quota(self.session,
@@ -1743,7 +1743,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
                                    project_id)
         self.assertEqual(0, self.repos.quotas.get(
             self.session, project_id=project_id).in_use_health_monitor)
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # Test decrement on in use quota
         project_id = uuidutils.generate_uuid()
@@ -1758,7 +1758,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on in use quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         quota = {'in_use_health_monitor': 1}
         self.repos.quotas.update(self.session, project_id, quota=quota)
         self.repos.decrement_quota(self.session,
@@ -1766,7 +1766,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
                                    project_id)
         self.assertEqual(0, self.repos.quotas.get(
             self.session, project_id=project_id).in_use_health_monitor)
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # ### Test member quota
         # Test decrement on zero in use quota
@@ -1782,7 +1782,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on zero in use quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         quota = {'in_use_member': 0}
         self.repos.quotas.update(self.session, project_id, quota=quota)
         self.repos.decrement_quota(self.session,
@@ -1790,7 +1790,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
                                    project_id)
         self.assertEqual(0, self.repos.quotas.get(
             self.session, project_id=project_id).in_use_member)
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
         # Test decrement on in use quota
         project_id = uuidutils.generate_uuid()
@@ -1805,7 +1805,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
         # Test decrement on in use quota with noauth
         project_id = uuidutils.generate_uuid()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
-        conf.config(auth_strategy='noauth')
+        conf.config(auth_strategy=constants.NOAUTH)
         quota = {'in_use_member': 1}
         self.repos.quotas.update(self.session, project_id, quota=quota)
         self.repos.decrement_quota(self.session,
@@ -1813,7 +1813,7 @@ class AllRepositoriesTest(base.OctaviaDBTestBase):
                                    project_id)
         self.assertEqual(0, self.repos.quotas.get(
             self.session, project_id=project_id).in_use_member)
-        conf.config(auth_strategy='testing')
+        conf.config(auth_strategy=constants.TESTING)
 
 
 class PoolRepositoryTest(BaseRepositoryTest):

octavia/tests/unit/compute/drivers/test_nova_driver.py

@@ -93,7 +93,8 @@ class TestNovaClient(base.TestCase):
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
         self.net_name = "lb-mgmt-net"
         conf.config(group="networking", lb_network_name=self.net_name)
-        conf.config(group="controller_worker", amp_boot_network_list=[1, 2])
+        conf.config(group="controller_worker",
+                    amp_boot_network_list=['1', '2'])
         self.conf = conf
 
         self.amphora = models.Amphora(
@@ -107,7 +108,7 @@ class TestNovaClient(base.TestCase):
         self.nova_response.status = 'ACTIVE'
 
         self.interface_list = mock.MagicMock()
-        self.interface_list.net_id = 1
+        self.interface_list.net_id = '1'
         self.interface_list.fixed_ips = [mock.MagicMock()]
         self.interface_list.fixed_ips[0] = {'ip_address': '10.0.0.1'}
 

octavia/tests/unit/controller/queue/test_consumer.py

@@ -33,7 +33,7 @@ class TestConsumer(base.TestCase):
         super(TestConsumer, self).setUp()
         conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
         conf.config(group="oslo_messaging", topic='foo_topic')
-        conf.config(host='foo_host')
+        conf.config(host='test-hostname')
 
     def test_consumer_start(self, mock_rpc_server, mock_endpoint, mock_target,
                             mock_get_transport):
@@ -50,7 +50,8 @@ class TestConsumer(base.TestCase):
 
         mock_get_transport.assert_called_once_with(cfg.CONF)
         mock_target.assert_called_once_with(topic='foo_topic',
-                                            server='foo_host', fanout=False)
+                                            server='test-hostname',
+                                            fanout=False)
         mock_endpoint.assert_called_once_with()
         access_policy = dispatcher.DefaultRPCAccessPolicy
         mock_rpc_server.assert_called_once_with(mock_get_transport_rv,

octavia/tests/unit/controller/worker/tasks/test_compute_tasks.py

@@ -25,8 +25,8 @@ from octavia.tests.common import utils as test_utils
 import octavia.tests.unit.base as base
 
 
-AMP_FLAVOR_ID = 10
-AMP_IMAGE_ID = 11
+AMP_FLAVOR_ID = '10'
+AMP_IMAGE_ID = '11'
 AMP_IMAGE_TAG = 'glance_tag'
 AMP_SSH_KEY_NAME = None
 AMP_NET = [uuidutils.generate_uuid()]