Rebase network proxy to proxy2

tengqm · tengqm · commit 28922b3c28bf · 2016-12-12T22:18:05.000-05:00
Change-Id: Id0b11cd98c332582cec3017a1237ad54cbcc41ac
diff --git a/openstack/network/v2/_proxy.py b/openstack/network/v2/_proxy.py
diff --git a/openstack/network/v2/flavor.py b/openstack/network/v2/flavor.py
@@ -40,4 +40,4 @@ class Flavor(resource.Resource):
     #: Service type to which the flavor applies
     service_type = resource.Body('service_type')
     #: IDs of service profiles associated with this flavor
-    service_profile_ids = resource.Body('service_profiles')
+    service_profile_ids = resource.Body('service_profiles', type=list)
diff --git a/openstack/network/v2/floating_ip.py b/openstack/network/v2/floating_ip.py
@@ -32,8 +32,7 @@ class FloatingIP(resource.Resource):
     _query_mapping = resource.QueryParameters(
         'description', 'fixed_ip_address', 'floating_ip_address',
         'floating_network_id', 'port_id', 'router_id', 'status',
-        project_id='tenant_id',
-        revision_number='revision')
+        project_id='tenant_id')
 
     # Properties
     #: Timestamp at which the floating IP was created.
diff --git a/openstack/network/v2/network.py b/openstack/network/v2/network.py
@@ -29,13 +29,15 @@ class Network(resource.Resource):
 
     # NOTE: We don't support query on list or datetime fields yet
     _query_mapping = resource.QueryParameters(
-        'description', 'name', 'status',
+        'description', 'name', 'project_id', 'status',
         ipv4_address_scope_id='ipv4_address_scope',
         ipv6_address_scope_id='ipv6_address_scope',
         is_admin_state_up='admin_state_up',
         is_port_security_enabled='port_security_enabled',
         is_shared='shared',
-        revision_number='revision',
+        provider_network_type='provider:network_type',
+        provider_physical_network='provider:physical_network',
+        provider_segmentation_id='provider:segmentation_id',
     )
 
     # Properties
diff --git a/openstack/network/v2/pool.py b/openstack/network/v2/pool.py
@@ -28,8 +28,8 @@ class Pool(resource.Resource):
     allow_list = True
 
     _query_mapping = resource.QueryParameters(
-        'description', 'health_monitor_id', 'lb_algorithm', 'name',
-        'protocol', 'provider', 'subnet_id', 'vip_id',
+        'description', 'lb_algorithm', 'name',
+        'protocol', 'provider', 'subnet_id', 'virtual_ip_id',
         is_admin_state_up='admin_state_up',
         project_id='tenant_id',
     )
@@ -69,7 +69,7 @@ class Pool(resource.Resource):
     status = resource.Body('status')
     #: The status of the network.
     status_description = resource.Body('status_description')
-    #: The subnet on whic the members of the pool will be located.
+    #: The subnet on which the members of the pool will be located.
     subnet_id = resource.Body('subnet_id')
     #: Session persistence algorithm that should be used (if any).
     #: *Type: dict with keys ``type`` and ``cookie_name``*
diff --git a/openstack/network/v2/qos_policy.py b/openstack/network/v2/qos_policy.py
@@ -27,6 +27,12 @@ class QoSPolicy(resource.Resource):
     allow_delete = True
     allow_list = True
 
+    _query_mapping = resource.QueryParameters(
+        'name', 'description',
+        project_id='tenant_id',
+        is_shared='shared'
+    )
+
     # Properties
     #: QoS policy name.
     name = resource.Body('name')
diff --git a/openstack/network/v2/qos_rule_type.py b/openstack/network/v2/qos_rule_type.py
@@ -27,6 +27,8 @@ class QoSRuleType(resource.Resource):
     allow_delete = False
     allow_list = True
 
+    _query_mapping = resource.QueryParameters('type')
+
     # Properties
     #: QoS rule type name.
     type = resource.Body('type')
diff --git a/openstack/network/v2/rbac_policy.py b/openstack/network/v2/rbac_policy.py
@@ -27,7 +27,10 @@ class RBACPolicy(resource.Resource):
     allow_delete = True
     allow_list = True
 
-    # NOTE: This resource doesn't support query parameters
+    _query_mapping = resource.QueryParameters(
+        'action', 'object_id', 'object_type', 'project_id',
+        'target_project_id',
+    )
 
     # Properties
     #: ID of the object that this RBAC policy affects.
diff --git a/openstack/network/v2/security_group_rule.py b/openstack/network/v2/security_group_rule.py
@@ -28,9 +28,11 @@ class SecurityGroupRule(resource.Resource):
     allow_list = True
 
     _query_mapping = resource.QueryParameters(
-        'description', 'direction', 'ethertype', 'protocol',
+        'description', 'direction', 'protocol',
         'remote_group_id', 'security_group_id',
+        ether_type='ethertype',
         project_id='tenant_id',
+
     )
 
     # Properties
diff --git a/openstack/network/v2/service_profile.py b/openstack/network/v2/service_profile.py
@@ -35,7 +35,7 @@ class ServiceProfile(resource.Resource):
     # Properties
     #: Description of the service flavor profile.
     description = resource.Body('description')
-    #: Provider Driver for the service flavor profile
+    #: Provider driver for the service flavor profile
     driver = resource.Body('driver')
     #: Sets enabled flag
     is_enabled = resource.Body('enabled', type=bool)
diff --git a/openstack/tests/unit/network/v2/test_proxy.py b/openstack/tests/unit/network/v2/test_proxy.py
