Add source_ip_prefix and destination_ip_prefix to metering label rules

As proposed in the RFE and then approved in the spec, we are adding to
the neutron metering rules two new parameters. The source IP prefix, and
destination IP prefix.

Partially-Implements: https://bugs.launchpad.net/neutron/+bug/1889431
RFE: https://bugs.launchpad.net/neutron/+bug/1889431

Depends-On: https://review.opendev.org/#/c/746586/
Change-Id: Ic44d88fabea0fffef2279f2f2c3d2b1da6426d4d

2 files changed, 14 insertions, 0 deletions

diff --git a/openstackclient/tests/unit/network/v2/fakes.py b/openstackclient/tests/unit/network/v2/fakes.py
index cef0a11c..5095cb91 100644
--- a/openstackclient/tests/unit/network/v2/fakes.py
+++ b/openstackclient/tests/unit/network/v2/fakes.py
@@ -1590,6 +1590,8 @@ class FakeNetworkMeterRule(object):
             'excluded': False,
             'metering_label_id': 'meter-label-id-' + uuid.uuid4().hex,
             'remote_ip_prefix': '10.0.0.0/24',
+            'source_ip_prefix': '8.8.8.8/32',
+            'destination_ip_prefix': '10.0.0.0/24',
             'tenant_id': 'project-id-' + uuid.uuid4().hex,
         }
 
diff --git a/openstackclient/tests/unit/network/v2/test_network_meter_rule.py b/openstackclient/tests/unit/network/v2/test_network_meter_rule.py
index 8f8922c0..e9224fa6 100644
--- a/openstackclient/tests/unit/network/v2/test_network_meter_rule.py
+++ b/openstackclient/tests/unit/network/v2/test_network_meter_rule.py
@@ -42,20 +42,24 @@ class TestCreateMeterRule(TestMeterRule):
     )
 
     columns = (
+        'destination_ip_prefix',
         'direction',
         'excluded',
         'id',
         'metering_label_id',
         'project_id',
         'remote_ip_prefix',
+        'source_ip_prefix',
     )
     data = (
+        new_rule.destination_ip_prefix,
         new_rule.direction,
         new_rule.excluded,
         new_rule.id,
         new_rule.metering_label_id,
         new_rule.project_id,
         new_rule.remote_ip_prefix,
+        new_rule.source_ip_prefix,
     )
 
     def setUp(self):
@@ -228,6 +232,8 @@ class TestListMeterRule(TestMeterRule):
         'Excluded',
         'Direction',
         'Remote IP Prefix',
+        'Source IP Prefix',
+        'Destination IP Prefix'
     )
 
     data = []
@@ -238,6 +244,8 @@ class TestListMeterRule(TestMeterRule):
             rule.excluded,
             rule.direction,
             rule.remote_ip_prefix,
+            rule.source_ip_prefix,
+            rule.destination_ip_prefix
         ))
 
     def setUp(self):
@@ -270,21 +278,25 @@ class TestShowMeterRule(TestMeterRule):
     )
 
     columns = (
+        'destination_ip_prefix',
         'direction',
         'excluded',
         'id',
         'metering_label_id',
         'project_id',
         'remote_ip_prefix',
+        'source_ip_prefix',
     )
 
     data = (
+        new_rule.destination_ip_prefix,
         new_rule.direction,
         new_rule.excluded,
         new_rule.id,
         new_rule.metering_label_id,
         new_rule.project_id,
         new_rule.remote_ip_prefix,
+        new_rule.source_ip_prefix,
     )
 
     def setUp(self):