octavia 12.0.0.0rc2__py3-none-any.whl → 13.0.0.0rc1__py3-none-any.whl

octavia/tests/unit/network/drivers/neutron/test_utils.py

@@ -37,8 +37,8 @@ class TestNeutronUtils(base.TestCase):
                                 if hay[key] is not None})
         self.assertIn(newneedle, newhaystack)
 
-    def test_convert_subnet_dict_to_model(self):
-        model_obj = utils.convert_subnet_dict_to_model(
+    def test_convert_subnet_to_model(self):
+        model_obj = utils.convert_subnet_to_model(
             t_constants.MOCK_SUBNET)
         assert_dict = dict(
             id=t_constants.MOCK_SUBNET_ID,
@@ -52,8 +52,8 @@ class TestNeutronUtils(base.TestCase):
         )
         self._compare_ignore_value_none(model_obj.to_dict(), assert_dict)
 
-    def test_convert_port_dict_to_model(self):
-        model_obj = utils.convert_port_dict_to_model(
+    def test_convert_port_to_model(self):
+        model_obj = utils.convert_port_to_model(
             t_constants.MOCK_NEUTRON_PORT)
         assert_dict = dict(
             id=t_constants.MOCK_PORT_ID,
@@ -69,12 +69,12 @@ class TestNeutronUtils(base.TestCase):
             security_group_ids=[],
         )
         self._compare_ignore_value_none(model_obj.to_dict(), assert_dict)
-        fixed_ips = t_constants.MOCK_NEUTRON_PORT['port']['fixed_ips']
+        fixed_ips = t_constants.MOCK_NEUTRON_PORT['fixed_ips']
         for ip in model_obj.fixed_ips:
             self._in_ignore_value_none(ip.to_dict(), fixed_ips)
 
-    def test_convert_network_dict_to_model(self):
-        model_obj = utils.convert_network_dict_to_model(
+    def test_convert_network_to_model(self):
+        model_obj = utils.convert_network_to_model(
             t_constants.MOCK_NETWORK)
         assert_dict = dict(
             id=t_constants.MOCK_NETWORK_ID,
@@ -86,11 +86,12 @@ class TestNeutronUtils(base.TestCase):
             provider_network_type=t_constants.MOCK_NETWORK_TYPE,
             provider_physical_network=t_constants.MOCK_NETWORK_NAME,
             provider_segmentation_id=t_constants.MOCK_SEGMENTATION_ID,
-            router_external=t_constants.MOCK_ROUTER_EXTERNAL
+            router_external=t_constants.MOCK_ROUTER_EXTERNAL,
+            port_security_enabled=False,
         )
         model_dict = model_obj.to_dict()
         model_dict['subnets'] = model_obj.subnets
-        self._compare_ignore_value_none(model_dict, assert_dict)
+        self._compare_ignore_value_none(assert_dict, model_dict)
 
     def test_convert_fixed_ip_dict_to_model(self):
         model_obj = utils.convert_fixed_ip_dict_to_model(
@@ -99,31 +100,14 @@ class TestNeutronUtils(base.TestCase):
             subnet_id=t_constants.MOCK_SUBNET_ID,
             ip_address=t_constants.MOCK_IP_ADDRESS
         )
-        self._compare_ignore_value_none(model_obj.to_dict(), assert_dict)
+        self._compare_ignore_value_none(assert_dict, model_obj.to_dict())
 
-    def test_convert_floatingip_dict_to_model(self):
-        model_obj = utils.convert_floatingip_dict_to_model(
-            t_constants.MOCK_FLOATING_IP)
-        assert_dict = dict(
-            id=t_constants.MOCK_FLOATING_IP_ID,
-            description=t_constants.MOCK_FLOATING_IP_DESC,
-            project_id=t_constants.MOCK_PROJECT_ID,
-            status=t_constants.MOCK_STATUS,
-            router_id=t_constants.MOCK_ROUTER_ID,
-            port_id=t_constants.MOCK_PORT_ID,
-            floating_network_id=t_constants.MOCK_NETWORK_ID,
-            network_id=t_constants.MOCK_NETWORK_ID,
-            floating_ip_address=t_constants.MOCK_IP_ADDRESS,
-            fixed_ip_address=t_constants.MOCK_IP_ADDRESS2,
-            fixed_port_id=t_constants.MOCK_PORT_ID2
-        )
-        self._compare_ignore_value_none(model_obj.to_dict(), assert_dict)
-
-    def test_convert_network_ip_availability_dict_to_model(self):
-        model_obj = utils.convert_network_ip_availability_dict_to_model(
+    def test_convert_network_ip_availability_to_model(self):
+        model_obj = utils.convert_network_ip_availability_to_model(
             t_constants.MOCK_NETWORK_IP_AVAILABILITY)
         assert_dict = dict(
             network_id=t_constants.MOCK_NETWORK_ID,
+            project_id=t_constants.MOCK_PROJECT_ID,
             tenant_id=t_constants.MOCK_PROJECT_ID,
             network_name=t_constants.MOCK_NETWORK_NAME,
             total_ips=t_constants.MOCK_NETWORK_TOTAL_IPS,

octavia/tests/unit/statistics/drivers/test_update_db.py

@@ -30,7 +30,7 @@ class TestStatsUpdateDb(base.TestCase):
         self.listener_id = uuidutils.generate_uuid()
 
     @mock.patch('octavia.db.repositories.ListenerStatisticsRepository')
-    @mock.patch('octavia.db.api.get_session')
+    @mock.patch('octavia.db.api.session')
     def test_update_stats(self, mock_get_session, mock_listener_stats_repo):
         bytes_in1 = random.randrange(1000000000)
         bytes_out1 = random.randrange(1000000000)
@@ -61,18 +61,20 @@ class TestStatsUpdateDb(base.TestCase):
             request_errors=request_errors2
         )
 
+        mock_session = mock_get_session().begin().__enter__()
+
         update_db.StatsUpdateDb().update_stats(
             [stats_1, stats_2], deltas=False)
 
         mock_listener_stats_repo().replace.assert_has_calls([
-            mock.call(mock_get_session(), stats_1),
-            mock.call(mock_get_session(), stats_2)
+            mock.call(mock_session, stats_1),
+            mock.call(mock_session, stats_2)
         ])
 
         update_db.StatsUpdateDb().update_stats(
             [stats_1, stats_2], deltas=True)
 
         mock_listener_stats_repo().increment.assert_has_calls([
-            mock.call(mock_get_session(), stats_1),
-            mock.call(mock_get_session(), stats_2)
+            mock.call(mock_session, stats_1),
+            mock.call(mock_session, stats_2)
         ])

{octavia-12.0.0.0rc2.data → octavia-13.0.0.0rc1.data}/data/share/octavia/README.rst

@@ -39,7 +39,7 @@ The project source code repository is located at
 https://opendev.org/openstack/octavia
 
 Project status, bugs, and requests for feature enhancements are tracked on
-https://storyboard.openstack.org/#!/project/openstack/octavia
+https://launchpad.net/octavia
 
 For more information on project direction and guiding principles for
 contributors, please see the CONSTITUTION.rst file in this directory, or

{octavia-12.0.0.0rc2.dist-info → octavia-13.0.0.0rc1.dist-info}/AUTHORS

@@ -45,6 +45,7 @@ Cedric Brandily <zzelle@gmail.com>
 Chandan Kumar <chkumar246@gmail.com>
 Chandan Kumar <chkumar@redhat.com>
 Chaozhe.Chen <chaozhe.chen@easystack.cn>
+Chen Tianhao <tianhao.chen@easystack.cn>
 Christian Berendt <berendt@b1-systems.de>
 Chuck Wilson <chuck.wilson+ubuntu@gmail.com>
 Claudiu Belu <cbelu@cloudbasesolutions.com>
@@ -70,11 +71,13 @@ Erik Olof Gunnar Andersson <eandersson@blizzard.com>
 Evan Gray <evanscottgray@gmail.com>
 Evgeny Fedoruk <evgenyf@radware.com>
 Fei Long Wang <flwang@catalyst.net.nz>
+Fernando Royo <froyo@redhat.com>
 Flavio Percoco <flaper87@gmail.com>
 Franklin Naval <franklin.naval@rackspace.com>
 Frode Nordahl <frode.nordahl@canonical.com>
 Ganpat Agarwal <gans.developer@gmail.com>
 Gary Kotton <gkotton@vmware.com>
+Gaudenz Steinlin <gaudenz.steinlin@cloudscale.ch>
 Gerard Braad <me@gbraad.nl>
 German Eichberger <German.eichberger@rackspace.com>
 German Eichberger <german.eichberger@hp.com>
@@ -192,6 +195,7 @@ Stanislav Dmitriev <sdmitriev1@gmail.com>
 Stefan Nica <snica@suse.com>
 Stephen Balukoff <sbalukoff@bluebox.net>
 Stephen Balukoff <stephen@balukoff.com>
+Stephen Finucane <stephenfin@redhat.com>
 Susanne Balle <sleipnir012@gmail.com>
 Sven Wegener <sven.wegener@inovex.de>
 Takashi Kajinami <tkajinam@redhat.com>

{octavia-12.0.0.0rc2.dist-info → octavia-13.0.0.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: octavia
-Version: 12.0.0.0rc2
+Version: 13.0.0.0rc1
 Summary: OpenStack Octavia Scalable Load Balancer as a Service
 Home-page: https://docs.openstack.org/octavia/latest/
 Author: OpenStack
@@ -37,7 +37,8 @@ Requires-Dist: gunicorn (>=19.9.0)
 Requires-Dist: jsonschema (>=3.2.0)
 Requires-Dist: keystoneauth1 (>=3.4.0)
 Requires-Dist: keystonemiddleware (>=9.5.0)
-Requires-Dist: octavia-lib (>=3.1.0)
+Requires-Dist: octavia-lib (>=3.3.0)
+Requires-Dist: openstacksdk (>=0.103.0)
 Requires-Dist: oslo.config (>=6.8.0)
 Requires-Dist: oslo.context (>=2.22.0)
 Requires-Dist: oslo.db[mysql] (>=8.4.0)
@@ -60,7 +61,6 @@ Requires-Dist: python-barbicanclient (>=4.5.2)
 Requires-Dist: python-cinderclient (>=3.3.0)
 Requires-Dist: python-dateutil (>=2.7.0)
 Requires-Dist: python-glanceclient (>=2.8.0)
-Requires-Dist: python-neutronclient (>=6.7.0)
 Requires-Dist: python-novaclient (>=9.1.0)
 Requires-Dist: requests (>=2.23.0)
 Requires-Dist: rfc3986 (>=1.2.0)
@@ -136,7 +136,7 @@ The project source code repository is located at
 https://opendev.org/openstack/octavia
 
 Project status, bugs, and requests for feature enhancements are tracked on
-https://storyboard.openstack.org/#!/project/openstack/octavia
+https://launchpad.net/octavia
 
 For more information on project direction and guiding principles for
 contributors, please see the CONSTITUTION.rst file in this directory, or