openstack/openstacksdk
Code Issues Proposed changes

Drop .json suffix from networking URLs

Browse Source 
As a preparation for a major refactoring of rebasing on the proxy layer
for the networking functions of the cloud layer drop the obsole .json
suffix from the URLs.

Change-Id: I3b4506b81cc5e9f04e99cc22bb7e78d0bbf0c48c
This commit is contained in:
Artem Goncharov
2021-02-11 16:57:03 +01:00
parent 176bb194ef
commit 63c5f8a9be
22 changed files with 422 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
openstack/cloud/_floating_ip.py
View File

@@ -82,7 +82,7 @@ class FloatingIPCloudMixin(_normalize.Normalizer):
def _neutron_list_floating_ips(self, filters=None):
if not filters:
filters = {}
data = self.network.get('/floatingips.json', params=filters)
data = self.network.get('/floatingips', params=filters)
return self._get_and_munchify('floatingips', data)
def _nova_list_floating_ips(self):
@@ -462,7 +462,7 @@ class FloatingIPCloudMixin(_normalize.Normalizer):
def _submit_create_fip(self, kwargs):
# Split into a method to aid in test mocking
data = self.network.post(
"/floatingips.json", json={"floatingip": kwargs})
"/floatingips", json={"floatingip": kwargs})
return self._normalize_floating_ip(
self._get_and_munchify('floatingip', data))
@@ -613,7 +613,7 @@ class FloatingIPCloudMixin(_normalize.Normalizer):
def _neutron_delete_floating_ip(self, floating_ip_id):
try:
proxy._json_response(self.network.delete(
"/floatingips/{fip_id}.json".format(fip_id=floating_ip_id),
"/floatingips/{fip_id}".format(fip_id=floating_ip_id),
error_message="unable to delete floating IP"))
except exc.OpenStackCloudResourceNotFound:
return False
@@ -753,7 +753,7 @@ class FloatingIPCloudMixin(_normalize.Normalizer):
return proxy._json_response(
self.network.put(
"/floatingips/{fip_id}.json".format(fip_id=floating_ip['id']),
"/floatingips/{fip_id}".format(fip_id=floating_ip['id']),
json={'floatingip': floating_ip_args}),
error_message=("Error attaching IP {ip} to "
"server {server_id}".format(
@@ -811,7 +811,7 @@ class FloatingIPCloudMixin(_normalize.Normalizer):
return False
exceptions.raise_from_response(
self.network.put(
"/floatingips/{fip_id}.json".format(fip_id=floating_ip_id),
"/floatingips/{fip_id}".format(fip_id=floating_ip_id),
json={"floatingip": {"port_id": None}}),
error_message=("Error detaching IP {ip} from "
"server {server_id}".format(

80
openstack/cloud/_network.py
View File

@@ -34,7 +34,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
@_utils.cache_on_arguments()
def _neutron_extensions(self):
extensions = set()
resp = self.network.get('/extensions.json')
resp = self.network.get('/extensions')
data = proxy._json_response(
resp,
error_message="Error fetching extension list for neutron")
@@ -128,7 +128,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
# Translate None from search interface to empty {} for kwargs below
if not filters:
filters = {}
data = self.network.get("/networks.json", params=filters)
data = self.network.get("/networks", params=filters)
return self._get_and_munchify('networks', data)
def list_routers(self, filters=None):
@@ -144,7 +144,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
# Translate None from search interface to empty {} for kwargs below
if not filters:
filters = {}
resp = self.network.get("/routers.json", params=filters)
resp = self.network.get("/routers", params=filters)
data = proxy._json_response(
resp,
error_message="Error fetching router list")
@@ -163,7 +163,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
# Translate None from search interface to empty {} for kwargs below
if not filters:
filters = {}
data = self.network.get("/subnets.json", params=filters)
data = self.network.get("/subnets", params=filters)
return self._get_and_munchify('subnets', data)
def list_ports(self, filters=None):
@@ -203,7 +203,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
# If the cloud is running nova-network, just return an empty list.
if not self.has_service('network'):
return []
resp = self.network.get("/ports.json", params=filters)
resp = self.network.get("/ports", params=filters)
data = proxy._json_response(
resp,
error_message="Error fetching port list")
@@ -264,7 +264,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
# Translate None from search interface to empty {} for kwargs below
if not filters:
filters = {}
resp = self.network.get("/qos/rule-types.json", params=filters)
resp = self.network.get("/qos/rule-types", params=filters)
data = proxy._json_response(
resp,
error_message="Error fetching QoS rule types list")
@@ -289,7 +289,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
'on target cloud')
resp = self.network.get(
"/qos/rule-types/{rule_type}.json".format(rule_type=rule_type))
"/qos/rule-types/{rule_type}".format(rule_type=rule_type))
data = proxy._json_response(
resp,
error_message="Error fetching QoS details of {rule_type} "
@@ -309,7 +309,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
# Translate None from search interface to empty {} for kwargs below
if not filters:
filters = {}
resp = self.network.get("/qos/policies.json", params=filters)
resp = self.network.get("/qos/policies", params=filters)
data = proxy._json_response(
resp,
error_message="Error fetching QoS policies list")
@@ -539,7 +539,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
if dns_domain:
network['dns_domain'] = dns_domain
data = self.network.post("/networks.json", json={'network': network})
data = self.network.post("/networks", json={'network': network})
# Reset cache so the new network is picked up
self._reset_network_caches()
@@ -603,7 +603,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
"Network %s not found." % name_or_id)
data = proxy._json_response(self.network.put(
"/networks/{net_id}.json".format(net_id=network.id),
"/networks/{net_id}".format(net_id=network.id),
json={"network": kwargs}),
error_message="Error updating network {0}".format(name_or_id))
@@ -626,7 +626,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
return False
exceptions.raise_from_response(self.network.delete(
"/networks/{network_id}.json".format(network_id=network['id'])))
"/networks/{network_id}".format(network_id=network['id'])))
# Reset cache so the deleted network is removed
self._reset_network_caches()
@@ -649,7 +649,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
exceptions.raise_from_response(
self.network.put(
'/quotas/{project_id}.json'.format(project_id=proj.id),
'/quotas/{project_id}'.format(project_id=proj.id),
json={'quota': kwargs}),
error_message=("Error setting Neutron's quota for "
"project {0}".format(proj.id)))
@@ -670,7 +670,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
url = '/quotas/{project_id}'.format(project_id=proj.id)
if details:
url = url + "/details"
url = url + ".json"
url = url + ""
data = proxy._json_response(
self.network.get(url),
error_message=("Error fetching Neutron's quota for "
@@ -698,7 +698,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
raise exc.OpenStackCloudException("project does not exist")
exceptions.raise_from_response(
self.network.delete(
'/quotas/{project_id}.json'.format(project_id=proj.id)),
'/quotas/{project_id}'.format(project_id=proj.id)),
error_message=("Error deleting Neutron's quota for "
"project {0}".format(proj.id)))
@@ -1194,7 +1194,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
self.log.debug("'qos-default' extension is not available on "
"target cloud")
data = self.network.post("/qos/policies.json", json={'policy': kwargs})
data = self.network.post("/qos/policies", json={'policy': kwargs})
return self._get_and_munchify('policy', data)
@_utils.valid_kwargs("name", "description", "shared", "default",
@@ -1238,7 +1238,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
"QoS policy %s not found." % name_or_id)
data = self.network.put(
"/qos/policies/{policy_id}.json".format(
"/qos/policies/{policy_id}".format(
policy_id=curr_policy['id']),
json={'policy': kwargs})
return self._get_and_munchify('policy', data)
@@ -1261,7 +1261,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
return False
exceptions.raise_from_response(self.network.delete(
"/qos/policies/{policy_id}.json".format(policy_id=policy['id'])))
"/qos/policies/{policy_id}".format(policy_id=policy['id'])))
return True
@@ -1310,7 +1310,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
filters = {}
resp = self.network.get(
"/qos/policies/{policy_id}/bandwidth_limit_rules.json".format(
"/qos/policies/{policy_id}/bandwidth_limit_rules".format(
policy_id=policy['id']),
params=filters)
data = proxy._json_response(
@@ -1341,7 +1341,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
name_or_id=policy_name_or_id))
resp = self.network.get(
"/qos/policies/{policy_id}/bandwidth_limit_rules/{rule_id}.json".
"/qos/policies/{policy_id}/bandwidth_limit_rules/{rule_id}".
format(policy_id=policy['id'], rule_id=rule_id))
data = proxy._json_response(
resp,
@@ -1437,7 +1437,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
policy_id=policy['id']))
data = self.network.put(
"/qos/policies/{policy_id}/bandwidth_limit_rules/{rule_id}.json".
"/qos/policies/{policy_id}/bandwidth_limit_rules/{rule_id}".
format(policy_id=policy['id'], rule_id=rule_id),
json={'bandwidth_limit_rule': kwargs})
return self._get_and_munchify('bandwidth_limit_rule', data)
@@ -1463,7 +1463,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
try:
exceptions.raise_from_response(self.network.delete(
"/qos/policies/{policy}/bandwidth_limit_rules/{rule}.json".
"/qos/policies/{policy}/bandwidth_limit_rules/{rule}".
format(policy=policy['id'], rule=rule_id)))
except exc.OpenStackCloudURINotFound:
self.log.debug(
@@ -1519,7 +1519,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
filters = {}
resp = self.network.get(
"/qos/policies/{policy_id}/dscp_marking_rules.json".format(
"/qos/policies/{policy_id}/dscp_marking_rules".format(
policy_id=policy['id']),
params=filters)
data = proxy._json_response(
@@ -1550,7 +1550,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
name_or_id=policy_name_or_id))
resp = self.network.get(
"/qos/policies/{policy_id}/dscp_marking_rules/{rule_id}.json".
"/qos/policies/{policy_id}/dscp_marking_rules/{rule_id}".
format(policy_id=policy['id'], rule_id=rule_id))
data = proxy._json_response(
resp,
@@ -1624,7 +1624,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
policy_id=policy['id']))
data = self.network.put(
"/qos/policies/{policy_id}/dscp_marking_rules/{rule_id}.json".
"/qos/policies/{policy_id}/dscp_marking_rules/{rule_id}".
format(policy_id=policy['id'], rule_id=rule_id),
json={'dscp_marking_rule': kwargs})
return self._get_and_munchify('dscp_marking_rule', data)
@@ -1650,7 +1650,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
try:
exceptions.raise_from_response(self.network.delete(
"/qos/policies/{policy}/dscp_marking_rules/{rule}.json".
"/qos/policies/{policy}/dscp_marking_rules/{rule}".
format(policy=policy['id'], rule=rule_id)))
except exc.OpenStackCloudURINotFound:
self.log.debug(
@@ -1708,7 +1708,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
filters = {}
resp = self.network.get(
"/qos/policies/{policy_id}/minimum_bandwidth_rules.json".format(
"/qos/policies/{policy_id}/minimum_bandwidth_rules".format(
policy_id=policy['id']),
params=filters)
data = proxy._json_response(
@@ -1739,7 +1739,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
name_or_id=policy_name_or_id))
resp = self.network.get(
"/qos/policies/{policy_id}/minimum_bandwidth_rules/{rule_id}.json".
"/qos/policies/{policy_id}/minimum_bandwidth_rules/{rule_id}".
format(policy_id=policy['id'], rule_id=rule_id))
data = proxy._json_response(
resp,
@@ -1817,7 +1817,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
policy_id=policy['id']))
data = self.network.put(
"/qos/policies/{policy_id}/minimum_bandwidth_rules/{rule_id}.json".
"/qos/policies/{policy_id}/minimum_bandwidth_rules/{rule_id}".
format(policy_id=policy['id'], rule_id=rule_id),
json={'minimum_bandwidth_rule': kwargs})
return self._get_and_munchify('minimum_bandwidth_rule', data)
@@ -1843,7 +1843,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
try:
exceptions.raise_from_response(self.network.delete(
"/qos/policies/{policy}/minimum_bandwidth_rules/{rule}.json".
"/qos/policies/{policy}/minimum_bandwidth_rules/{rule}".
format(policy=policy['id'], rule=rule_id)))
except exc.OpenStackCloudURINotFound:
self.log.debug(
@@ -1878,7 +1878,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
return proxy._json_response(
self.network.put(
"/routers/{router_id}/add_router_interface.json".format(
"/routers/{router_id}/add_router_interface".format(
router_id=router['id']),
json=json_body),
error_message="Error attaching interface to router {0}".format(
@@ -1913,7 +1913,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
exceptions.raise_from_response(
self.network.put(
"/routers/{router_id}/remove_router_interface.json".format(
"/routers/{router_id}/remove_router_interface".format(
router_id=router['id']),
json=json_body),
error_message="Error detaching interface from router {0}".format(
@@ -2001,7 +2001,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
router['availability_zone_hints'] = availability_zone_hints
data = proxy._json_response(
self.network.post("/routers.json", json={"router": router}),
self.network.post("/routers", json={"router": router}),
error_message="Error creating router {0}".format(name))
return self._get_and_munchify('router', data)
@@ -2069,7 +2069,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
"Router %s not found." % name_or_id)
resp = self.network.put(
"/routers/{router_id}.json".format(router_id=curr_router['id']),
"/routers/{router_id}".format(router_id=curr_router['id']),
json={"router": router})
data = proxy._json_response(
resp,
@@ -2095,7 +2095,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
return False
exceptions.raise_from_response(self.network.delete(
"/routers/{router_id}.json".format(router_id=router['id']),
"/routers/{router_id}".format(router_id=router['id']),
error_message="Error deleting router {0}".format(name_or_id)))
return True
@@ -2245,7 +2245,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
if use_default_subnetpool:
subnet['use_default_subnetpool'] = True
response = self.network.post("/subnets.json", json={"subnet": subnet})
response = self.network.post("/subnets", json={"subnet": subnet})
return self._get_and_munchify('subnet', response)
@@ -2268,7 +2268,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
return False
exceptions.raise_from_response(self.network.delete(
"/subnets/{subnet_id}.json".format(subnet_id=subnet['id'])))
"/subnets/{subnet_id}".format(subnet_id=subnet['id'])))
return True
def update_subnet(self, name_or_id, subnet_name=None, enable_dhcp=None,
@@ -2354,7 +2354,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
"Subnet %s not found." % name_or_id)
response = self.network.put(
"/subnets/{subnet_id}.json".format(subnet_id=curr_subnet['id']),
"/subnets/{subnet_id}".format(subnet_id=curr_subnet['id']),
json={"subnet": subnet})
return self._get_and_munchify('subnet', response)
@@ -2424,7 +2424,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
kwargs['network_id'] = network_id
data = proxy._json_response(
self.network.post("/ports.json", json={'port': kwargs}),
self.network.post("/ports", json={'port': kwargs}),
error_message="Error creating port for network {0}".format(
network_id))
return self._get_and_munchify('port', data)
@@ -2496,7 +2496,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
data = proxy._json_response(
self.network.put(
"/ports/{port_id}.json".format(port_id=port['id']),
"/ports/{port_id}".format(port_id=port['id']),
json={"port": kwargs}),
error_message="Error updating port {0}".format(name_or_id))
return self._get_and_munchify('port', data)
@@ -2517,7 +2517,7 @@ class NetworkCloudMixin(_normalize.Normalizer):
exceptions.raise_from_response(
self.network.delete(
"/ports/{port_id}.json".format(port_id=port['id'])),
"/ports/{port_id}".format(port_id=port['id'])),
error_message="Error deleting port {0}".format(name_or_id))
return True

6
openstack/tests/unit/cloud/test_baremetal_node.py
View File

@@ -1656,7 +1656,7 @@ class TestBaremetalNode(base.IronicTestCase):
method='GET',
uri=self.get_mock_url(
service_type='network',
resource='ports.json',
resource='ports',
base_url_append='v2.0'),
json={'ports': [{'id': vif_id}]}),
dict(
@@ -1682,7 +1682,7 @@ class TestBaremetalNode(base.IronicTestCase):
method='GET',
uri=self.get_mock_url(
service_type='network',
resource='ports.json',
resource='ports',
base_url_append='v2.0'),
json={'ports': [{'id': vif_id}]}),
dict(
@@ -1716,7 +1716,7 @@ class TestBaremetalNode(base.IronicTestCase):
method='GET',
uri=self.get_mock_url(
service_type='network',
resource='ports.json',
resource='ports',
base_url_append='v2.0'),
json={'ports': [fake_port]}),
])

2
openstack/tests/unit/cloud/test_caching.py
View File

@@ -557,7 +557,7 @@ class TestMemoryCache(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json={'ports': [
down_port,
active_port,

58
openstack/tests/unit/cloud/test_create_server.py
View File

@@ -38,7 +38,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -71,7 +71,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -104,7 +104,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -144,7 +144,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -181,7 +181,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -218,7 +218,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -257,7 +257,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -298,7 +298,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -338,7 +338,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -385,7 +385,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -458,7 +458,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -497,7 +497,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -521,7 +521,7 @@ class TestCreateServer(base.TestCase):
json={'servers': [fake_server]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json'],
'network', 'public', append=['v2.0', 'ports'],
qs_elements=['device_id=1234']),
json={'ports': []}),
dict(method='DELETE',
@@ -555,7 +555,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [network]}),
dict(method='POST',
uri=self.get_mock_url(
@@ -575,11 +575,11 @@ class TestCreateServer(base.TestCase):
json={'server': build_server}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [network]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': []}),
])
self.cloud.create_server(
@@ -600,7 +600,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [network]}),
dict(method='POST',
uri=self.get_mock_url(
@@ -620,11 +620,11 @@ class TestCreateServer(base.TestCase):
json={'server': build_server}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [network]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': []}),
])
self.cloud.create_server(
@@ -662,11 +662,11 @@ class TestCreateServer(base.TestCase):
json={'server': build_server}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [network]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': []}),
])
self.cloud.create_server(
@@ -704,11 +704,11 @@ class TestCreateServer(base.TestCase):
json={'server': build_server}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [network]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': []}),
])
self.cloud.create_server(
@@ -748,11 +748,11 @@ class TestCreateServer(base.TestCase):
json={'server': build_server}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [network]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': []}),
])
self.cloud.create_server(
@@ -815,7 +815,7 @@ class TestCreateServer(base.TestCase):
json={'server': active_server}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
])
@@ -851,7 +851,7 @@ class TestCreateServer(base.TestCase):
json={'server': active_server}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
])
@@ -872,7 +872,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(
@@ -924,7 +924,7 @@ class TestCreateServer(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
dict(method='POST',
uri=self.get_mock_url(

8
openstack/tests/unit/cloud/test_delete_server.py
View File

@@ -163,7 +163,7 @@ class TestDeleteServer(base.TestCase):
json={'servers': [server]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json'],
'network', 'public', append=['v2.0', 'floatingips'],
qs_elements=['floating_ip_address=172.24.5.5']),
complete_qs=True,
json={'floatingips': [{
@@ -179,10 +179,10 @@ class TestDeleteServer(base.TestCase):
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips',
'{fip_id}.json'.format(fip_id=fip_id)])),
'{fip_id}'.format(fip_id=fip_id)])),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
complete_qs=True,
json={'floatingips': []}),
dict(method='DELETE',
@@ -212,7 +212,7 @@ class TestDeleteServer(base.TestCase):
json={'servers': [server]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json'],
'network', 'public', append=['v2.0', 'floatingips'],
qs_elements=['floating_ip_address=172.24.5.5']),
complete_qs=True,
status_code=404),

136
openstack/tests/unit/cloud/test_floating_ip_neutron.py
View File

@@ -164,7 +164,7 @@ class TestFloatingIP(base.TestCase):
def test_list_floating_ips(self):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/floatingips.json',
uri='https://network.example.com/v2.0/floatingips',
json=self.mock_floating_ip_list_rep)])
floating_ips = self.cloud.list_floating_ips()
@@ -179,7 +179,7 @@ class TestFloatingIP(base.TestCase):
self.register_uris([
dict(method='GET',
uri=('https://network.example.com/v2.0/floatingips.json?'
uri=('https://network.example.com/v2.0/floatingips?'
'Foo=42'),
json={'floatingips': []})])
@@ -190,7 +190,7 @@ class TestFloatingIP(base.TestCase):
def test_search_floating_ips(self):
self.register_uris([
dict(method='GET',
uri=('https://network.example.com/v2.0/floatingips.json'),
uri=('https://network.example.com/v2.0/floatingips'),
json=self.mock_floating_ip_list_rep)])
floating_ips = self.cloud.search_floating_ips(
@@ -204,7 +204,7 @@ class TestFloatingIP(base.TestCase):
def test_get_floating_ip(self):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/floatingips.json',
uri='https://network.example.com/v2.0/floatingips',
json=self.mock_floating_ip_list_rep)])
floating_ip = self.cloud.get_floating_ip(
@@ -226,7 +226,7 @@ class TestFloatingIP(base.TestCase):
def test_get_floating_ip_not_found(self):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/floatingips.json',
uri='https://network.example.com/v2.0/floatingips',
json=self.mock_floating_ip_list_rep)])
floating_ip = self.cloud.get_floating_ip(id='non-existent')
@@ -260,10 +260,10 @@ class TestFloatingIP(base.TestCase):
def test_create_floating_ip(self):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [self.mock_get_network_rep]}),
dict(method='POST',
uri='https://network.example.com/v2.0/floatingips.json',
uri='https://network.example.com/v2.0/floatingips',
json=self.mock_floating_ip_new_rep,
validate=dict(
json={'floatingip': {
@@ -279,10 +279,10 @@ class TestFloatingIP(base.TestCase):
def test_create_floating_ip_port_bad_response(self):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [self.mock_get_network_rep]}),
dict(method='POST',
uri='https://network.example.com/v2.0/floatingips.json',
uri='https://network.example.com/v2.0/floatingips',
json=self.mock_floating_ip_new_rep,
validate=dict(
json={'floatingip': {
@@ -300,10 +300,10 @@ class TestFloatingIP(base.TestCase):
def test_create_floating_ip_port(self):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [self.mock_get_network_rep]}),
dict(method='POST',
uri='https://network.example.com/v2.0/floatingips.json',
uri='https://network.example.com/v2.0/floatingips',
json=self.mock_floating_ip_port_rep,
validate=dict(
json={'floatingip': {
@@ -323,13 +323,13 @@ class TestFloatingIP(base.TestCase):
"""
Test without specifying a network name.
"""
fips_mock_uri = 'https://network.example.com/v2.0/floatingips.json'
fips_mock_uri = 'https://network.example.com/v2.0/floatingips'
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [self.mock_get_network_rep]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': []}),
dict(method='GET', uri=fips_mock_uri, json={'floatingips': []}),
dict(method='POST', uri=fips_mock_uri,
@@ -348,13 +348,13 @@ class TestFloatingIP(base.TestCase):
"""
Test with specifying a network name.
"""
fips_mock_uri = 'https://network.example.com/v2.0/floatingips.json'
fips_mock_uri = 'https://network.example.com/v2.0/floatingips'
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [self.mock_get_network_rep]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': []}),
dict(method='GET', uri=fips_mock_uri, json={'floatingips': []}),
dict(method='POST', uri=fips_mock_uri,
@@ -377,10 +377,10 @@ class TestFloatingIP(base.TestCase):
"""
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [self.mock_get_network_rep]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': []})
])
@@ -395,7 +395,7 @@ class TestFloatingIP(base.TestCase):
# payloads taken from citycloud
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={"networks": [{
"status": "ACTIVE",
"subnets": [
@@ -436,7 +436,7 @@ class TestFloatingIP(base.TestCase):
"description": ""
}]}),
dict(method='GET',
uri='https://network.example.com/v2.0/ports.json'
uri='https://network.example.com/v2.0/ports'
'?device_id=f80e3ad0-e13e-41d4-8e9c-be79bccdb8f7',
json={"ports": [{
"status": "ACTIVE",
@@ -463,7 +463,7 @@ class TestFloatingIP(base.TestCase):
}]}),
dict(method='POST',
uri='https://network.example.com/v2.0/floatingips.json',
uri='https://network.example.com/v2.0/floatingips',
json={"floatingip": {
"router_id": "9de9c787-8f89-4a53-8468-a5533d6d7fd1",
"status": "DOWN",
@@ -525,7 +525,7 @@ class TestFloatingIP(base.TestCase):
"metadata": {}
}]}),
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={"networks": [{
"status": "ACTIVE",
"subnets": [
@@ -566,7 +566,7 @@ class TestFloatingIP(base.TestCase):
"description": ""
}]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={"subnets": [{
"description": "",
"enable_dhcp": True,
@@ -609,19 +609,19 @@ class TestFloatingIP(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [self.mock_get_network_rep]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': []}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': []}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
validate=dict(
json={'floatingip': {
'floating_network_id': 'my-network-id'}}),
@@ -646,29 +646,29 @@ class TestFloatingIP(base.TestCase):
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(fip_id)]),
append=['v2.0', 'floatingips/{0}'.format(fip_id)]),
json={}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': [fake_fip]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(fip_id)]),
append=['v2.0', 'floatingips/{0}'.format(fip_id)]),
json={}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': [fake_fip]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(fip_id)]),
append=['v2.0', 'floatingips/{0}'.format(fip_id)]),
json={}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': []}),
])
@@ -692,20 +692,20 @@ class TestFloatingIP(base.TestCase):
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(fip_id)]),
append=['v2.0', 'floatingips/{0}'.format(fip_id)]),
json={}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': [fake_fip]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(fip_id)]),
append=['v2.0', 'floatingips/{0}'.format(fip_id)]),
json={}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': [down_fip]}),
])
@@ -724,29 +724,29 @@ class TestFloatingIP(base.TestCase):
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(fip_id)]),
append=['v2.0', 'floatingips/{0}'.format(fip_id)]),
json={}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': [fake_fip]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(fip_id)]),
append=['v2.0', 'floatingips/{0}'.format(fip_id)]),
json={}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': [fake_fip]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(fip_id)]),
append=['v2.0', 'floatingips/{0}'.format(fip_id)]),
json={}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': [fake_fip]}),
])
self.assertRaises(
@@ -759,7 +759,7 @@ class TestFloatingIP(base.TestCase):
self.register_uris([
dict(method='DELETE',
uri=('https://network.example.com/v2.0/floatingips/'
'a-wild-id-appears.json'),
'a-wild-id-appears'),
status_code=404)])
ret = self.cloud.delete_floating_ip(
@@ -776,13 +776,13 @@ class TestFloatingIP(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json'],
'network', 'public', append=['v2.0', 'ports'],
qs_elements=["device_id={0}".format(device_id)]),
json={'ports': self.mock_search_ports_rep}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(
append=['v2.0', 'floatingips/{0}'.format(
fip['id'])]),
json={'floatingip':
self.mock_floating_ip_list_rep['floatingips'][0]},
@@ -805,12 +805,12 @@ class TestFloatingIP(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': [attached_fip]}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(
append=['v2.0', 'floatingips/{0}'.format(
fip['id'])]),
json={'floatingip': fip},
validate=dict(
@@ -829,33 +829,33 @@ class TestFloatingIP(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [network]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': []}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': [fip]}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingip': fip},
validate=dict(
json={'floatingip': {
'floating_network_id': network['id']}})),
dict(method="GET",
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json'],
'network', 'public', append=['v2.0', 'ports'],
qs_elements=[
"device_id={0}".format(self.fake_server['id'])]),
json={'ports': self.mock_search_ports_rep}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(
append=['v2.0', 'floatingips/{0}'.format(
fip['id'])]),
json={'floatingip': fip},
validate=dict(
@@ -902,28 +902,28 @@ class TestFloatingIP(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': floating_ips}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(
append=['v2.0', 'floatingips/{0}'.format(
floating_ips[0]['id'])]),
json={}),
# First IP has been deleted now, return just the second
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': floating_ips[1:]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'floatingips/{0}.json'.format(
append=['v2.0', 'floatingips/{0}'.format(
floating_ips[1]['id'])]),
json={}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingips': [floating_ips[2]]}),
])
cleaned_up = self.cloud.delete_unattached_floating_ips()
@@ -949,20 +949,20 @@ class TestFloatingIP(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [self.mock_get_network_rep]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': []}),
dict(method="GET",
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json'],
'network', 'public', append=['v2.0', 'ports'],
qs_elements=['device_id=some-server']),
json={'ports': [server_port]}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'floatingips.json']),
'network', 'public', append=['v2.0', 'floatingips']),
json={'floatingip': floating_ip})
])
@@ -976,7 +976,7 @@ class TestFloatingIP(base.TestCase):
# payloads contrived but based on ones from citycloud
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={"networks": [{
"status": "ACTIVE",
"subnets": [
@@ -1037,7 +1037,7 @@ class TestFloatingIP(base.TestCase):
"description": ""
}]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={"subnets": [{
"description": "",
"enable_dhcp": True,
@@ -1074,7 +1074,7 @@ class TestFloatingIP(base.TestCase):
# payloads contrived but based on ones from citycloud
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={"networks": [{
"status": "ACTIVE",
"subnets": [
@@ -1135,7 +1135,7 @@ class TestFloatingIP(base.TestCase):
"description": ""
}]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={"subnets": [{
"description": "",
"enable_dhcp": True,

4
openstack/tests/unit/cloud/test_fwaas.py
View File

@@ -882,7 +882,7 @@ class TestFirewallGroup(FirewallTestCase):
dict(method='GET',
uri=self.get_mock_url('network', 'public',
append=['v2.0', 'ports.json']),
append=['v2.0', 'ports']),
json={'ports': [self.mock_port]}),
dict(method='POST',
uri=self._make_mock_url('firewall_groups'),
@@ -1079,7 +1079,7 @@ class TestFirewallGroup(FirewallTestCase):
dict(method='GET',
uri=self.get_mock_url('network', 'public',
append=['v2.0', 'ports.json']),
append=['v2.0', 'ports']),
json={'ports': [self.mock_port]}),
dict(method='PUT',
uri=self._make_mock_url('firewall_groups',

54
openstack/tests/unit/cloud/test_meta.py
View File

@@ -296,13 +296,13 @@ class TestMeta(base.TestCase):
def test_get_server_private_ip(self):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [{
'id': 'test-net-id',
'name': 'test-net-name'}]}
),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': SUBNETS_WITH_NAT})
])
@@ -323,13 +323,13 @@ class TestMeta(base.TestCase):
def test_get_server_multiple_private_ip(self):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [{
'id': 'test-net-id',
'name': 'test-net'}]}
),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': SUBNETS_WITH_NAT})
])
@@ -385,7 +385,7 @@ class TestMeta(base.TestCase):
self.register_uris([
dict(method='GET',
uri=('https://network.example.com/v2.0/ports.json?'
uri=('https://network.example.com/v2.0/ports?'
'device_id=test-id'),
json={'ports': [{
'id': 'test_port_id',
@@ -394,11 +394,11 @@ class TestMeta(base.TestCase):
),
dict(method='GET',
uri=('https://network.example.com/v2.0/'
'floatingips.json?port_id=test_port_id'),
'floatingips?port_id=test_port_id'),
json={'floatingips': []}),
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [
{'id': 'test_pnztt_net',
'name': 'test_pnztt_net',
@@ -408,7 +408,7 @@ class TestMeta(base.TestCase):
'name': 'private'}]}
),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': SUBNETS_WITH_NAT}),
self.get_nova_discovery_mock_dict(),
@@ -457,7 +457,7 @@ class TestMeta(base.TestCase):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [
{'id': 'test_pnztt_net',
'name': 'test_pnztt_net',
@@ -467,7 +467,7 @@ class TestMeta(base.TestCase):
'name': 'private'}]}
),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': SUBNETS_WITH_NAT}),
self.get_nova_discovery_mock_dict(),
dict(method='GET',
@@ -512,7 +512,7 @@ class TestMeta(base.TestCase):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [
{
'id': 'test_pnztt_net',
@@ -524,7 +524,7 @@ class TestMeta(base.TestCase):
'name': 'private'}]}
),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': SUBNETS_WITH_NAT}),
self.get_nova_discovery_mock_dict(),
dict(method='GET',
@@ -572,7 +572,7 @@ class TestMeta(base.TestCase):
self.register_uris([
# self.get_nova_discovery_mock_dict(),
dict(method='GET',
uri=('https://network.example.com/v2.0/ports.json?'
uri=('https://network.example.com/v2.0/ports?'
'device_id=test-id'),
json={'ports': [{
'id': 'test_port_id',
@@ -580,7 +580,7 @@ class TestMeta(base.TestCase):
'device_id': 'test-id'}]}
),
dict(method='GET',
uri=('https://network.example.com/v2.0/floatingips.json'
uri=('https://network.example.com/v2.0/floatingips'
'?port_id=test_port_id'),
json={'floatingips': [{
'id': 'floating-ip-id',
@@ -589,7 +589,7 @@ class TestMeta(base.TestCase):
'floating_ip_address': PUBLIC_V4,
}]}),
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [
{
'id': 'test_pnztt_net',
@@ -602,7 +602,7 @@ class TestMeta(base.TestCase):
}
]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': SUBNETS_WITH_NAT}),
self.get_nova_discovery_mock_dict(),
dict(method='GET',
@@ -718,10 +718,10 @@ class TestMeta(base.TestCase):
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': OSIC_NETWORKS}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': OSIC_SUBNETS}),
self.get_nova_discovery_mock_dict(),
dict(method='GET',
@@ -749,14 +749,14 @@ class TestMeta(base.TestCase):
# Testing Clouds with Neutron
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [{
'id': 'test-net-id',
'name': 'test-net',
'router:external': True
}]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': SUBNETS_WITH_NAT})
])
srv = fakes.make_fake_server(
@@ -774,7 +774,7 @@ class TestMeta(base.TestCase):
# Testing Clouds with Neutron
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [{
'id': 'test-net-id',
'name': 'test-net',
@@ -782,7 +782,7 @@ class TestMeta(base.TestCase):
'provider:physical_network': 'vlan',
}]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': SUBNETS_WITH_NAT})
])
@@ -801,7 +801,7 @@ class TestMeta(base.TestCase):
# Testing Clouds with Neutron
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [{
'id': 'test-net-id',
'name': 'test-net',
@@ -810,7 +810,7 @@ class TestMeta(base.TestCase):
'provider:physical_network': None,
}]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': SUBNETS_WITH_NAT})
])
srv = fakes.make_fake_server(
@@ -830,14 +830,14 @@ class TestMeta(base.TestCase):
# Testing Clouds with Neutron
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
json={'networks': [{
'id': 'test-net-id',
'name': 'test-net',
'router:external': False,
}]}),
dict(method='GET',
uri='https://network.example.com/v2.0/subnets.json',
uri='https://network.example.com/v2.0/subnets',
json={'subnets': SUBNETS_WITH_NAT})
])
@@ -872,7 +872,7 @@ class TestMeta(base.TestCase):
# Testing Clouds with a non working Neutron
self.register_uris([
dict(method='GET',
uri='https://network.example.com/v2.0/networks.json',
uri='https://network.example.com/v2.0/networks',
status_code=404)])
srv = fakes.make_fake_server(

32
openstack/tests/unit/cloud/test_network.py
View File

@@ -65,7 +65,7 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [net1, net2]})
])
nets = self.cloud.list_networks()
@@ -76,7 +76,7 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json'],
'network', 'public', append=['v2.0', 'networks'],
qs_elements=["name=test"]),
json={'networks': []})
])
@@ -87,7 +87,7 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'network': self.mock_new_network_rep},
validate=dict(
json={'network': {
@@ -105,7 +105,7 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'network': mock_new_network_rep},
validate=dict(
json={'network': {
@@ -123,7 +123,7 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'network': mock_new_network_rep},
validate=dict(
json={'network': {
@@ -154,7 +154,7 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'network': mock_new_network_rep},
validate=dict(
json={'network': expected_send_params}))
@@ -167,11 +167,11 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'network': self.mock_new_network_rep},
validate=dict(
json={'network': {
@@ -204,7 +204,7 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'network': mock_new_network_rep},
validate=dict(
json={'network': expected_send_params}))
@@ -237,7 +237,7 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'network': mock_new_network_rep},
validate=dict(
json={'network': {
@@ -259,7 +259,7 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'network': mock_new_network_rep},
validate=dict(
json={'network': {
@@ -294,12 +294,12 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [network]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'networks', "%s.json" % network_id]),
append=['v2.0', 'networks', "%s" % network_id]),
json={})
])
self.assertTrue(self.cloud.delete_network(network_name))
@@ -309,7 +309,7 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
])
self.assertFalse(self.cloud.delete_network('test-net'))
@@ -322,12 +322,12 @@ class TestNetwork(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [network]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'networks', "%s.json" % network_id]),
append=['v2.0', 'networks', "%s" % network_id]),
status_code=503)
])
self.assertRaises(openstack.cloud.OpenStackCloudException,

36
openstack/tests/unit/cloud/test_port.py
View File

@@ -143,7 +143,7 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method="POST",
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json=self.mock_neutron_port_create_rep,
validate=dict(
json={'port': {
@@ -168,7 +168,7 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method="POST",
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
status_code=500,
validate=dict(
json={'port': {
@@ -187,12 +187,12 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json=self.mock_neutron_port_list_rep),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'ports', '%s.json' % port_id]),
append=['v2.0', 'ports', '%s' % port_id]),
json=self.mock_neutron_port_update_rep,
validate=dict(
json={'port': {'name': 'test-port-name-updated'}}))
@@ -214,12 +214,12 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json=self.mock_neutron_port_list_rep),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'ports', '%s.json' % port_id]),
append=['v2.0', 'ports', '%s' % port_id]),
status_code=500,
validate=dict(
json={'port': {'name': 'test-port-name-updated'}}))
@@ -234,7 +234,7 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json=self.mock_neutron_port_list_rep)
])
ports = self.cloud.list_ports()
@@ -245,7 +245,7 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json'],
'network', 'public', append=['v2.0', 'ports'],
qs_elements=['status=DOWN']),
json=self.mock_neutron_port_list_rep)
])
@@ -257,7 +257,7 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
status_code=500)
])
self.assertRaises(OpenStackCloudException, self.cloud.list_ports)
@@ -267,7 +267,7 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json=self.mock_neutron_port_list_rep)
])
ports = self.cloud.search_ports(name_or_id=port_id)
@@ -281,7 +281,7 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json=self.mock_neutron_port_list_rep)
])
ports = self.cloud.search_ports(name_or_id=port_name)
@@ -294,7 +294,7 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json=self.mock_neutron_port_list_rep)
])
ports = self.cloud.search_ports(name_or_id='non-existent')
@@ -306,12 +306,12 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json=self.mock_neutron_port_list_rep),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'ports', '%s.json' % port_id]),
append=['v2.0', 'ports', '%s' % port_id]),
json={})
])
@@ -321,7 +321,7 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json=self.mock_neutron_port_list_rep)
])
self.assertFalse(self.cloud.delete_port(name_or_id='non-existent'))
@@ -334,7 +334,7 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json={'ports': [port1, port2]})
])
self.assertRaises(OpenStackCloudException,
@@ -348,12 +348,12 @@ class TestPort(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json']),
'network', 'public', append=['v2.0', 'ports']),
json={'ports': [port1, port2]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'ports', '%s.json' % port1['id']]),
append=['v2.0', 'ports', '%s' % port1['id']]),
json={})
])
self.assertTrue(self.cloud.delete_port(name_or_id=port1['id']))

86
openstack/tests/unit/cloud/test_qos_bandwidth_limit_rule.py
View File

@@ -71,23 +71,23 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'bandwidth_limit_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'bandwidth_limit_rule': self.mock_rule})
])
r = self.cloud.get_qos_bandwidth_limit_rule(self.policy_name,
@@ -99,16 +99,16 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': []})
])
self.assertRaises(
@@ -121,7 +121,7 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -134,16 +134,16 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='POST',
uri=self.get_mock_url(
@@ -161,7 +161,7 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -174,20 +174,20 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='POST',
uri=self.get_mock_url(
@@ -207,43 +207,43 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'bandwidth_limit_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'bandwidth_limit_rule': self.mock_rule}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'bandwidth_limit_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'bandwidth_limit_rule': expected_rule},
validate=dict(
json={'bandwidth_limit_rule': {
@@ -258,7 +258,7 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -273,47 +273,47 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'bandwidth_limit_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'bandwidth_limit_rule': self.mock_rule}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'bandwidth_limit_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'bandwidth_limit_rule': expected_rule},
validate=dict(
json={'bandwidth_limit_rule': {
@@ -331,23 +331,23 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'bandwidth_limit_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={})
])
self.assertTrue(
@@ -359,7 +359,7 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -372,23 +372,23 @@ class TestQosBandwidthLimitRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'bandwidth_limit_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
status_code=404)
])
self.assertFalse(

60
openstack/tests/unit/cloud/test_qos_dscp_marking_rule.py
View File

@@ -58,23 +58,23 @@ class TestQosDscpMarkingRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'dscp_marking_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'dscp_marking_rule': self.mock_rule})
])
r = self.cloud.get_qos_dscp_marking_rule(self.policy_name,
@@ -86,16 +86,16 @@ class TestQosDscpMarkingRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': []})
])
self.assertRaises(
@@ -108,7 +108,7 @@ class TestQosDscpMarkingRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -121,16 +121,16 @@ class TestQosDscpMarkingRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='POST',
uri=self.get_mock_url(
@@ -148,7 +148,7 @@ class TestQosDscpMarkingRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -164,43 +164,43 @@ class TestQosDscpMarkingRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'dscp_marking_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'dscp_marking_rule': self.mock_rule}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'dscp_marking_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'dscp_marking_rule': expected_rule},
validate=dict(
json={'dscp_marking_rule': {
@@ -215,7 +215,7 @@ class TestQosDscpMarkingRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -228,23 +228,23 @@ class TestQosDscpMarkingRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'dscp_marking_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={})
])
self.assertTrue(
@@ -256,7 +256,7 @@ class TestQosDscpMarkingRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -269,23 +269,23 @@ class TestQosDscpMarkingRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'dscp_marking_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
status_code=404)
])
self.assertFalse(

60
openstack/tests/unit/cloud/test_qos_minimum_bandwidth_rule.py
View File

@@ -59,23 +59,23 @@ class TestQosMinimumBandwidthRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'minimum_bandwidth_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'minimum_bandwidth_rule': self.mock_rule})
])
r = self.cloud.get_qos_minimum_bandwidth_rule(self.policy_name,
@@ -87,16 +87,16 @@ class TestQosMinimumBandwidthRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': []})
])
self.assertRaises(
@@ -109,7 +109,7 @@ class TestQosMinimumBandwidthRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -122,16 +122,16 @@ class TestQosMinimumBandwidthRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='POST',
uri=self.get_mock_url(
@@ -149,7 +149,7 @@ class TestQosMinimumBandwidthRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -164,43 +164,43 @@ class TestQosMinimumBandwidthRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'minimum_bandwidth_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'minimum_bandwidth_rule': self.mock_rule}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'minimum_bandwidth_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={'minimum_bandwidth_rule': expected_rule},
validate=dict(
json={'minimum_bandwidth_rule': {
@@ -215,7 +215,7 @@ class TestQosMinimumBandwidthRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -228,23 +228,23 @@ class TestQosMinimumBandwidthRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'minimum_bandwidth_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
json={})
])
self.assertTrue(
@@ -256,7 +256,7 @@ class TestQosMinimumBandwidthRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -269,23 +269,23 @@ class TestQosMinimumBandwidthRule(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies', self.policy_id,
'minimum_bandwidth_rules',
'%s.json' % self.rule_id]),
'%s' % self.rule_id]),
status_code=404)
])
self.assertFalse(

68
openstack/tests/unit/cloud/test_qos_policy.py
View File

@@ -58,12 +58,12 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]})
])
r = self.cloud.get_qos_policy(self.policy_name)
@@ -75,7 +75,7 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -87,12 +87,12 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policy': self.mock_policy})
])
policy = self.cloud.create_qos_policy(
@@ -104,7 +104,7 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -116,16 +116,16 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policy': self.mock_policy},
validate=dict(
json={'policy': {
@@ -141,22 +141,22 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies',
'%s.json' % self.policy_id]),
'%s' % self.policy_id]),
json={})
])
self.assertTrue(self.cloud.delete_qos_policy(self.policy_name))
@@ -166,7 +166,7 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -178,16 +178,16 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': []})
])
self.assertFalse(self.cloud.delete_qos_policy('goofy'))
@@ -199,16 +199,16 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [policy1, policy2]})
])
self.assertRaises(exc.OpenStackCloudException,
@@ -222,22 +222,22 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [policy1, policy2]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies',
'%s.json' % self.policy_id]),
'%s' % self.policy_id]),
json={})
])
self.assertTrue(self.cloud.delete_qos_policy(policy1['id']))
@@ -249,22 +249,22 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies',
'%s.json' % self.policy_id]),
'%s' % self.policy_id]),
json={'policy': expected_policy},
validate=dict(
json={'policy': {'name': 'goofy'}}))
@@ -278,7 +278,7 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -292,26 +292,26 @@ class TestQosPolicy(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies.json']),
append=['v2.0', 'qos', 'policies']),
json={'policies': [self.mock_policy]}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'policies',
'%s.json' % self.policy_id]),
'%s' % self.policy_id]),
json={'policy': expected_policy},
validate=dict(
json={'policy': {'name': "goofy"}}))

18
openstack/tests/unit/cloud/test_qos_rule_type.py
View File

@@ -70,12 +70,12 @@ class TestQosRuleType(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'rule-types.json']),
append=['v2.0', 'qos', 'rule-types']),
json={'rule_types': self.mock_rule_types})
])
rule_types = self.cloud.list_qos_rule_types()
@@ -86,7 +86,7 @@ class TestQosRuleType(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(exc.OpenStackCloudException,
@@ -97,13 +97,13 @@ class TestQosRuleType(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [
self.qos_extension,
self.qos_rule_type_details_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [
self.qos_extension,
self.qos_rule_type_details_extension]}),
@@ -111,7 +111,7 @@ class TestQosRuleType(base.TestCase):
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'qos', 'rule-types',
'%s.json' % self.rule_type_name]),
'%s' % self.rule_type_name]),
json={'rule_type': self.mock_rule_type_details})
])
self.assertEqual(
@@ -124,7 +124,7 @@ class TestQosRuleType(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': []})
])
self.assertRaises(
@@ -136,11 +136,11 @@ class TestQosRuleType(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': [self.qos_extension]})
])
self.assertRaises(

8
openstack/tests/unit/cloud/test_quotas.py
View File

@@ -155,7 +155,7 @@ class TestQuotas(base.TestCase):
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'quotas',
'%s.json' % project.project_id]),
'%s' % project.project_id]),
json={},
validate=dict(
json={'quota': {'network': 1}}))
@@ -182,7 +182,7 @@ class TestQuotas(base.TestCase):
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'quotas',
'%s.json' % project.project_id]),
'%s' % project.project_id]),
json={'quota': quota})
])
received_quota = self.cloud.get_network_quotas(project.project_id)
@@ -235,7 +235,7 @@ class TestQuotas(base.TestCase):
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'quotas',
'%s/details.json' % project.project_id]),
'%s/details' % project.project_id]),
json={'quota': quota_details})
])
received_quota_details = self.cloud.get_network_quotas(
@@ -251,7 +251,7 @@ class TestQuotas(base.TestCase):
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'quotas',
'%s.json' % project.project_id]),
'%s' % project.project_id]),
json={})
])
self.cloud.delete_network_quotas(project.project_id)

8
openstack/tests/unit/cloud/test_rebuild_server.py
View File

@@ -136,7 +136,7 @@ class TestRebuildServer(base.TestCase):
'imageRef': 'a'}})),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
])
self.assertEqual(
@@ -166,7 +166,7 @@ class TestRebuildServer(base.TestCase):
'adminPass': password}})),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
])
self.assertEqual(
@@ -207,7 +207,7 @@ class TestRebuildServer(base.TestCase):
json={'servers': [self.fake_server]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
])
@@ -245,7 +245,7 @@ class TestRebuildServer(base.TestCase):
json={'servers': [self.fake_server]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
])
self.assertEqual(

42
openstack/tests/unit/cloud/test_router.py
View File

@@ -82,7 +82,7 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'routers': [self.mock_router_rep]})
])
r = self.cloud.get_router(self.router_name)
@@ -94,7 +94,7 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'routers': []})
])
r = self.cloud.get_router('mickey')
@@ -105,7 +105,7 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'router': self.mock_router_rep},
validate=dict(
json={'router': {
@@ -125,7 +125,7 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'router': mock_router_rep},
validate=dict(
json={'router': {
@@ -142,11 +142,11 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'router': self.mock_router_rep},
validate=dict(
json={'router': {
@@ -164,7 +164,7 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'router': self.mock_router_rep},
validate=dict(
json={'router': {
@@ -180,7 +180,7 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'router': self.mock_router_rep},
validate=dict(
json={'router': {
@@ -197,7 +197,7 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'router': self.mock_router_rep},
validate=dict(
json={'router': {
@@ -225,7 +225,7 @@ class TestRouter(base.TestCase):
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'routers', self.router_id,
'add_router_interface.json']),
'add_router_interface']),
json={'port': self.mock_router_interface_rep},
validate=dict(
json={'subnet_id': self.subnet_id}))
@@ -240,7 +240,7 @@ class TestRouter(base.TestCase):
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'routers', self.router_id,
'remove_router_interface.json']),
'remove_router_interface']),
json={'port': self.mock_router_interface_rep},
validate=dict(
json={'subnet_id': self.subnet_id}))
@@ -265,16 +265,16 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json={'extensions': self.enabled_neutron_extensions}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'routers': [self.mock_router_rep]}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'routers', '%s.json' % self.router_id]),
append=['v2.0', 'routers', '%s' % self.router_id]),
json={'router': expected_router_rep},
validate=dict(
json={'router': {
@@ -290,12 +290,12 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'routers': [self.mock_router_rep]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'routers', '%s.json' % self.router_id]),
append=['v2.0', 'routers', '%s' % self.router_id]),
json={})
])
self.assertTrue(self.cloud.delete_router(self.router_name))
@@ -305,7 +305,7 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'routers': []}),
])
self.assertFalse(self.cloud.delete_router(self.router_name))
@@ -317,7 +317,7 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'routers': [router1, router2]}),
])
self.assertRaises(exc.OpenStackCloudException,
@@ -331,12 +331,12 @@ class TestRouter(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'routers.json']),
'network', 'public', append=['v2.0', 'routers']),
json={'routers': [router1, router2]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'routers', '123.json']),
append=['v2.0', 'routers', '123']),
json={})
])
self.assertTrue(self.cloud.delete_router("123"))
@@ -345,7 +345,7 @@ class TestRouter(base.TestCase):
def _get_mock_dict(self, owner, json):
return dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'ports.json'],
'network', 'public', append=['v2.0', 'ports'],
qs_elements=["device_id=%s" % self.router_id,
"device_owner=network:%s" % owner]),
json=json)

12
openstack/tests/unit/cloud/test_shade.py
View File

@@ -409,11 +409,11 @@ class TestShade(base.TestCase):
json={'servers': [fake_server]}),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json=fake_networks),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json=fake_subnets)
])
@@ -621,7 +621,7 @@ class TestShade(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json=dict(extensions=body))
])
extensions = self.cloud._neutron_extensions()
@@ -633,7 +633,7 @@ class TestShade(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
status_code=404)
])
with testtools.ExpectedException(
@@ -665,7 +665,7 @@ class TestShade(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json=dict(extensions=body))
])
self.assertTrue(self.cloud._has_neutron_extension('dvr'))
@@ -692,7 +692,7 @@ class TestShade(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'extensions.json']),
'network', 'public', append=['v2.0', 'extensions']),
json=dict(extensions=body))
])
self.assertFalse(self.cloud._has_neutron_extension('invalid'))

54
openstack/tests/unit/cloud/test_subnet.py
View File

@@ -70,7 +70,7 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': [self.mock_subnet_rep]})
])
r = self.cloud.get_subnet(self.subnet_name)
@@ -103,11 +103,11 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [self.mock_network_rep]}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnet': mock_subnet_rep},
validate=dict(
json={'subnet': {
@@ -131,11 +131,11 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [self.mock_network_rep]}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnet': self.mock_subnet_rep},
validate=dict(
json={'subnet': {
@@ -154,7 +154,7 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [self.mock_network_rep]})
])
with testtools.ExpectedException(
@@ -175,11 +175,11 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [self.mock_network_rep]}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnet': mock_subnet_rep},
validate=dict(
json={'subnet': {
@@ -209,11 +209,11 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [self.mock_network_rep]}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnet': mock_subnet_rep},
validate=dict(
json={'subnet': {
@@ -236,7 +236,7 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [self.mock_network_rep]})
])
gateway = '192.168.200.3'
@@ -250,7 +250,7 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [self.mock_network_rep]})
])
self.assertRaises(exc.OpenStackCloudException,
@@ -264,7 +264,7 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [net1, net2]})
])
self.assertRaises(exc.OpenStackCloudException,
@@ -289,11 +289,11 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': [self.mock_network_rep]}),
dict(method='POST',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnet': mock_subnet_rep},
validate=dict(
json={'subnet': {
@@ -319,12 +319,12 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': [self.mock_subnet_rep]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'subnets', '%s.json' % self.subnet_id]),
append=['v2.0', 'subnets', '%s' % self.subnet_id]),
json={})
])
self.assertTrue(self.cloud.delete_subnet(self.subnet_name))
@@ -334,7 +334,7 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': []})
])
self.assertFalse(self.cloud.delete_subnet('goofy'))
@@ -346,7 +346,7 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': [subnet1, subnet2]})
])
self.assertRaises(exc.OpenStackCloudException,
@@ -360,12 +360,12 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': [subnet1, subnet2]}),
dict(method='DELETE',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'subnets', '%s.json' % subnet1['id']]),
append=['v2.0', 'subnets', '%s' % subnet1['id']]),
json={})
])
self.assertTrue(self.cloud.delete_subnet(subnet1['id']))
@@ -377,12 +377,12 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': [self.mock_subnet_rep]}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'subnets', '%s.json' % self.subnet_id]),
append=['v2.0', 'subnets', '%s' % self.subnet_id]),
json={'subnet': expected_subnet},
validate=dict(
json={'subnet': {'name': 'goofy'}}))
@@ -398,12 +398,12 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': [self.mock_subnet_rep]}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'subnets', '%s.json' % self.subnet_id]),
append=['v2.0', 'subnets', '%s' % self.subnet_id]),
json={'subnet': expected_subnet},
validate=dict(
json={'subnet': {'gateway_ip': gateway}}))
@@ -418,12 +418,12 @@ class TestSubnet(base.TestCase):
self.register_uris([
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'subnets.json']),
'network', 'public', append=['v2.0', 'subnets']),
json={'subnets': [self.mock_subnet_rep]}),
dict(method='PUT',
uri=self.get_mock_url(
'network', 'public',
append=['v2.0', 'subnets', '%s.json' % self.subnet_id]),
append=['v2.0', 'subnets', '%s' % self.subnet_id]),
json={'subnet': expected_subnet},
validate=dict(
json={'subnet': {'gateway_ip': None}}))

2
openstack/tests/unit/cloud/test_update_server.py
View File

@@ -79,7 +79,7 @@ class TestUpdateServer(base.TestCase):
json={'server': {'name': self.updated_server_name}})),
dict(method='GET',
uri=self.get_mock_url(
'network', 'public', append=['v2.0', 'networks.json']),
'network', 'public', append=['v2.0', 'networks']),
json={'networks': []}),
])
self.assertEqual(