Add missing revises_on_change attribute

This patch adds revises_on_change attribute to the following models
and API tests to ensure the correct behaviour:

ExternalNetwork (Network)
RouterExtraAttributes (Router)
QosPortPolicyBinding (Port)
QosNetworkPolicyBinding (Network)
PortBindingPort (Port)
SegmentHostMapping (Network Segment)

Conflicts:  (file locations differed)
	neutron/db/models/external_net.py
	neutron/db/models/l3_attrs.py
	neutron/db/models/portbinding.py
	neutron/db/models/segment.py

Closes-Bug: #1642517
Closes-Bug: #1655917
Change-Id: I8bda9fc940e99d18bab2b4229198374f1cabf84b

neutron/db/external_net_db.py

@@ -55,6 +55,7 @@ class ExternalNetwork(model_base.BASEV2):
         models_v2.Network,
         backref=orm.backref("external", lazy='joined',
                             uselist=False, cascade='delete'))
+    revises_on_change = ('network', )
 
 
 class External_net_db_mixin(object):

neutron/db/l3_attrs_db.py

@@ -50,6 +50,7 @@ class RouterExtraAttributes(model_base.BASEV2):
         'Router',
         backref=orm.backref("extra_attributes", lazy='joined',
                             uselist=False, cascade='delete'))
+    revises_on_change = ('router', )
 
 
 class ExtraAttributesMixin(object):

neutron/db/portbindings_db.py

@@ -35,6 +35,7 @@ class PortBindingPort(model_base.BASEV2):
         backref=orm.backref("portbinding",
                             lazy='joined', uselist=False,
                             cascade='delete'))
+    revises_on_change = ('port', )
 
 
 class PortBindingMixin(portbindings_base.PortBindingBaseMixin):

neutron/db/qos/models.py

@@ -50,6 +50,7 @@ class QosNetworkPolicyBinding(model_base.BASEV2):
         models_v2.Network,
         backref=sa.orm.backref("qos_policy_binding", uselist=False,
                                cascade='delete', lazy='joined'))
+    revises_on_change = ('network', )
 
 
 class QosPortPolicyBinding(model_base.BASEV2):
@@ -69,6 +70,7 @@ class QosPortPolicyBinding(model_base.BASEV2):
         models_v2.Port,
         backref=sa.orm.backref("qos_policy_binding", uselist=False,
                                cascade='delete', lazy='joined'))
+    revises_on_change = ('port', )
 
 
 class QosBandwidthLimitRule(model_base.HasId, model_base.BASEV2):

neutron/services/segments/db.py

@@ -57,6 +57,7 @@ class SegmentHostMapping(model_base.BASEV2):
         db.NetworkSegment, backref=orm.backref("segment_host_mapping",
                                                lazy='joined',
                                                cascade='delete'))
+    revises_on_change = ('network_segment', )
 
 
 class SegmentDbMixin(common_db_mixin.CommonDbMixin):

neutron/tests/tempest/api/test_revisions.py

@@ -262,3 +262,54 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
                            body['revision_number'])
         # disassociate
         self.client.update_floatingip(b2['floatingip']['id'], port_id=None)
+
+    @test.idempotent_id('afb6486c-41b5-483e-a500-3c506f4deb49')
+    @test.requires_ext(extension="router", service="network")
+    @test.requires_ext(extension="dvr", service="network")
+    def test_update_router_extra_attributes_bumps_revision(self):
+        router = self.create_router(router_name='r1')
+        self.assertIn('revision_number', router)
+        rev1 = router['revision_number']
+        router = self.admin_client.update_router(
+            router['id'], admin_state_up=False)['router']
+        self.assertGreater(router['revision_number'], rev1)
+        self.admin_client.update_router(router['id'],
+                                        distributed=True)['router']
+        updated = self.client.show_router(router['id'])['router']
+        self.assertGreater(updated['revision_number'],
+                           router['revision_number'])
+
+    @test.idempotent_id('90743b00-b0e2-40e4-9524-1c884fe3ef23')
+    @test.requires_ext(extension="external-network", service="network")
+    @test.requires_ext(extension="auto-allocated-topology", service="network")
+    @test.requires_ext(extension="subnet_allocation", service="network")
+    @test.requires_ext(extension="router", service="network")
+    def test_update_external_network_bumps_revision(self):
+        net = self.create_network()
+        self.assertIn('revision_number', net)
+        updated = self.admin_client.update_network(net['id'],
+                                                   **{'router:external': True})
+        self.assertGreater(updated['network']['revision_number'],
+                           net['revision_number'])
+
+    @test.idempotent_id('5af6450a-0f61-49c3-b628-38db77c7b856')
+    @test.requires_ext(extension="qos", service="network")
+    def test_update_qos_port_policy_binding_bumps_revision(self):
+        policy = self.create_qos_policy(name='port-policy', shared=False)
+        port = self.create_port(self.create_network())
+        self.addCleanup(self.client.delete_port, port['id'])
+        updated = self.admin_client.update_port(
+            port['id'], qos_policy_id=policy['id'])
+        self.assertGreater(updated['port']['revision_number'],
+                           port['revision_number'])
+
+    @test.idempotent_id('817da343-c6e4-445c-9519-a621f124dfbe')
+    @test.requires_ext(extension="qos", service="network")
+    def test_update_qos_network_policy_binding_bumps_revision(self):
+        policy = self.create_qos_policy(name='network-policy', shared=False)
+        network = self.create_network()
+        self.addCleanup(self.client.delete_network, network['id'])
+        updated = self.admin_client.update_network(
+            network['id'], qos_policy_id=policy['id'])
+        self.assertGreater(updated['network']['revision_number'],
+                           network['revision_number'])