openstack/python-novaclient
Code Issues Proposed changes

Merge "Remove unused test code"

Browse Source
This commit is contained in:
Jenkins
2016-11-23 19:15:26 +00:00
committed by Gerrit Code Review
parent 89a1f7c077 c255efbd97
commit 94aec599c6
2 changed files with 0 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
novaclient/tests/unit/v2/contrib/fakes.py
View File

@@ -94,48 +94,6 @@ class FakeHTTPClient(fakes.FakeHTTPClient):
}
)
def post_os_baremetal_nodes(self, **kw):
return (
200, FAKE_RESPONSE_HEADERS, {
'node': {
"id": 1,
"instance_uuid": None,
"cpus": 2,
"local_gb": 10,
"memory_mb": 5,
"pm_address": "2.3.4.5",
"pm_user": "pmuser",
"pm_password": "pmpass",
"prov_mac_address": "aa:bb:cc:dd:ee:ff",
"prov_vlan_id": 1,
"service_host": "somehost",
"terminal_port": 8080,
}
}
)
def delete_os_baremetal_nodes_1(self, **kw):
return (202, FAKE_RESPONSE_HEADERS, {})
def post_os_baremetal_nodes_1_action(self, **kw):
body = kw['body']
action = list(body)[0]
if action == "add_interface":
return (
200, FAKE_RESPONSE_HEADERS, {
'interface': {
"id": 2,
"address": "bb:cc:dd:ee:ff:aa",
"datapath_id": 1,
"port_no": 2,
}
}
)
elif action == "remove_interface":
return (202, FAKE_RESPONSE_HEADERS, {})
else:
return (500, {}, {})
def post_os_assisted_volume_snapshots(self, **kw):
return (202, FAKE_RESPONSE_HEADERS,
{'snapshot': {'id': 'blah', 'volumeId': '1'}})

118
novaclient/tests/unit/v2/fakes.py
View File

@@ -568,11 +568,6 @@ class FakeHTTPClient(base_client.HTTPClient):
r = {'server': self.get_servers_detail()[2]['servers'][3]}
return (200, {}, r)
def put_servers_1234(self, body, **kw):
assert list(body) == ['server']
fakes.assert_has_keys(body['server'], optional=['name', 'adminPass'])
return (204, {}, body)
def delete_os_server_groups_12345(self, **kw):
return (202, {}, None)
@@ -585,9 +580,6 @@ class FakeHTTPClient(base_client.HTTPClient):
def delete_servers_5678(self, **kw):
return (202, {}, None)
def delete_servers_1234_metadata_test_key(self, **kw):
return (204, {}, None)
def delete_servers_1234_metadata_key1(self, **kw):
return (204, {}, None)
@@ -597,9 +589,6 @@ class FakeHTTPClient(base_client.HTTPClient):
def post_servers_1234_metadata(self, **kw):
return (204, {}, {'metadata': {'test_key': 'test_value'}})
def put_servers_1234_metadata_test_key(self, **kw):
return (200, {}, {'meta': {'test_key': 'test_value'}})
def get_servers_1234_diagnostics(self, **kw):
return (200, {}, {'data': 'Fake diagnostics'})
@@ -1092,12 +1081,6 @@ class FakeHTTPClient(base_client.HTTPClient):
#
# Images
#
def get_images(self, **kw):
return (200, {}, {'images': [
{'id': FAKE_IMAGE_UUID_1, 'name': 'CentOS 5.2'},
{'id': FAKE_IMAGE_UUID_2, 'name': 'My Server Backup'}
]})
def get_images_detail(self, **kw):
return (200, {}, {'images': [
{
@@ -1536,15 +1519,6 @@ class FakeHTTPClient(base_client.HTTPClient):
self.get_os_security_group_rules()[2]['security_group_rules'][0]}
return (202, {}, r)
#
# Security Group Default Rules
#
def get_os_security_group_default_rules(self, **kw):
return (200, {}, {"security_group_default_rules": [
{'id': 1, 'ip_protocol': 'TCP', 'from_port': 22,
'to_port': 22, 'cidr': '10.0.0.0/8'}
]})
#
# Tenant Usage
#
@@ -2044,95 +2018,6 @@ class FakeHTTPClient(base_client.HTTPClient):
def delete_servers_1234_os_interface_port_id(self, **kw):
return (200, {}, None)
# NOTE (vkhomenko):
# Volume responses was taken from:
# https://wiki.openstack.org/wiki/CreateVolumeFromImage
# http://jorgew.github.com/block-storage-api/content/
# GET_listDetailVolumes_v1__tenantId__volumes_detail_.html
# I suppose they are outdated and should be updated after Cinder released
def get_volumes_detail(self, **kw):
return (200, FAKE_RESPONSE_HEADERS, {"volumes": [
{
"display_name": "Work",
"display_description": "volume for work",
"status": "ATTACHED",
"id": "15e59938-07d5-11e1-90e3-e3dffe0c5983",
"created_at": "2011-09-09T00:00:00Z",
"attached": "2011-11-11T00:00:00Z",
"size": 1024,
"attachments": [
{"id": "3333",
"links": ''}],
"metadata": {}},
{
"display_name": "Work2",
"display_description": "volume for work2",
"status": "ATTACHED",
"id": "15e59938-07d5-11e1-90e3-ee32ba30feaa",
"created_at": "2011-09-09T00:00:00Z",
"attached": "2011-11-11T00:00:00Z",
"size": 1024,
"attachments": [
{"id": "2222",
"links": ''}],
"metadata": {}}]})
def get_volumes(self, **kw):
return (200, FAKE_RESPONSE_HEADERS, {"volumes": [
{
"display_name": "Work",
"display_description": "volume for work",
"status": "ATTACHED",
"id": "15e59938-07d5-11e1-90e3-e3dffe0c5983",
"created_at": "2011-09-09T00:00:00Z",
"attached": "2011-11-11T00:00:00Z",
"size": 1024,
"attachments": [
{"id": "3333",
"links": ''}],
"metadata": {}},
{
"display_name": "Work2",
"display_description": "volume for work2",
"status": "ATTACHED",
"id": "15e59938-07d5-11e1-90e3-ee32ba30feaa",
"created_at": "2011-09-09T00:00:00Z",
"attached": "2011-11-11T00:00:00Z",
"size": 1024,
"attachments": [
{"id": "2222",
"links": ''}],
"metadata": {}}]})
def get_volumes_15e59938_07d5_11e1_90e3_e3dffe0c5983(self, **kw):
return (200, FAKE_RESPONSE_HEADERS, {
"volume": self.get_volumes_detail()[2]['volumes'][0]})
def get_volumes_15e59938_07d5_11e1_90e3_ee32ba30feaa(self, **kw):
return (200, {}, {
"volume": self.get_volumes_detail()[2]['volumes'][1]})
def post_volumes(self, **kw):
return (200, FAKE_RESPONSE_HEADERS, {"volume":
{"status": "creating",
"display_name": "vol-007",
"attachments": [(0)],
"availability_zone": "cinder",
"created_at": "2012-08-13T10:57:17.000000",
"display_description": "create volume from image",
"image_id": "f4cf905f-7c58-4d7b-8314-8dd8a2d1d483",
"volume_type": "None",
"metadata": {},
"id": "5cb239f6-1baf-4fe1-bd78-c852cf00fa39",
"size": 1}})
def delete_volumes_15e59938_07d5_11e1_90e3_e3dffe0c5983(self, **kw):
return (200, FAKE_RESPONSE_HEADERS, {})
def delete_volumes_15e59938_07d5_11e1_90e3_ee32ba30feaa(self, **kw):
return (200, {}, {})
def post_servers_1234_os_volume_attachments(self, **kw):
return (200, FAKE_RESPONSE_HEADERS, {
"volumeAttachment":
@@ -2357,9 +2242,6 @@ class FakeHTTPClient(base_client.HTTPClient):
def delete_servers_1234_tags(self, **kw):
return (204, {}, None)
def get_servers_1234_tags_tag(self, **kw):
return (204, {}, None)
class FakeSessionClient(fakes.FakeClient, client.Client):