Merge "nova-net: Remove db methods for ProviderMethod"

nova/db/api.py

@@ -1385,24 +1385,6 @@ def security_group_rule_count_by_group(context, security_group_id):
 ###################
 
 
-def provider_fw_rule_create(context, rule):
-    """Add a firewall rule at the provider level (all hosts & instances)."""
-    return IMPL.provider_fw_rule_create(context, rule)
-
-
-def provider_fw_rule_get_all(context):
-    """Get all provider-level firewall rules."""
-    return IMPL.provider_fw_rule_get_all(context)
-
-
-def provider_fw_rule_destroy(context, rule_id):
-    """Delete a provider firewall rule from the database."""
-    return IMPL.provider_fw_rule_destroy(context, rule_id)
-
-
-###################
-
-
 def project_get_networks(context, project_id, associate=True):
     """Return the network associated with the project.
 

nova/db/sqlalchemy/api.py

@@ -4217,29 +4217,6 @@ def security_group_rule_count_by_group(context, security_group_id):
 ###################
 
 
-@pick_context_manager_writer
-def provider_fw_rule_create(context, rule):
-    fw_rule_ref = models.ProviderFirewallRule()
-    fw_rule_ref.update(rule)
-    fw_rule_ref.save(context.session)
-    return fw_rule_ref
-
-
-@pick_context_manager_reader
-def provider_fw_rule_get_all(context):
-    return model_query(context, models.ProviderFirewallRule).all()
-
-
-@pick_context_manager_writer
-def provider_fw_rule_destroy(context, rule_id):
-    context.session.query(models.ProviderFirewallRule).\
-        filter_by(id=rule_id).\
-        soft_delete()
-
-
-###################
-
-
 @require_context
 @pick_context_manager_writer
 def project_get_networks(context, project_id, associate=True):

nova/db/sqlalchemy/models.py

@@ -729,6 +729,8 @@ class SecurityGroupIngressDefaultRule(BASE, NovaBase, models.SoftDeleteMixin):
     cidr = Column(types.CIDR())
 
 
+# TODO(stephenfin): Remove this in the V release or later, once we're sure we
+# won't want it back (it's for nova-network, so we won't)
 class ProviderFirewallRule(BASE, NovaBase, models.SoftDeleteMixin):
     """Represents a rule in a security group."""
     __tablename__ = 'provider_fw_rules'

nova/tests/unit/db/test_db_api.py

@@ -7811,46 +7811,6 @@ class ComputeNodeTestCase(test.TestCase, ModelsObjectComparatorMixin):
         mock_model_query.assert_called_once_with(self.ctxt, models.ComputeNode)
 
 
-class ProviderFwRuleTestCase(test.TestCase, ModelsObjectComparatorMixin):
-
-    def setUp(self):
-        super(ProviderFwRuleTestCase, self).setUp()
-        self.ctxt = context.get_admin_context()
-        self.values = self._get_rule_values()
-        self.rules = [db.provider_fw_rule_create(self.ctxt, rule)
-                                  for rule in self.values]
-
-    def _get_rule_values(self):
-        cidr_samples = ['192.168.0.0/24', '10.1.2.3/32',
-                        '2001:4f8:3:ba::/64',
-                        '2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128']
-        values = []
-        for i in range(len(cidr_samples)):
-            rule = {}
-            rule['protocol'] = 'foo' + str(i)
-            rule['from_port'] = 9999 + i
-            rule['to_port'] = 9898 + i
-            rule['cidr'] = cidr_samples[i]
-            values.append(rule)
-        return values
-
-    def test_provider_fw_rule_create(self):
-        ignored_keys = ['id', 'deleted', 'deleted_at', 'created_at',
-                        'updated_at']
-        for i, rule in enumerate(self.values):
-            self._assertEqualObjects(self.rules[i], rule,
-                                     ignored_keys=ignored_keys)
-
-    def test_provider_fw_rule_get_all(self):
-        self._assertEqualListsOfObjects(self.rules,
-                                        db.provider_fw_rule_get_all(self.ctxt))
-
-    def test_provider_fw_rule_destroy(self):
-        for rule in self.rules:
-            db.provider_fw_rule_destroy(self.ctxt, rule.id)
-        self.assertEqual([], db.provider_fw_rule_get_all(self.ctxt))
-
-
 class CertificateTestCase(test.TestCase, ModelsObjectComparatorMixin):
 
     def setUp(self):