openstack
/
tempest
Code Issues Proposed changes

Apply "POST/DELETE" rules to agents_client 

As the consistent-service-method-names bp, "POST /resources" methods'
names should be "create_<resource name>" and "DELETE /resources/<id>"
methods' names should be "delete_<resource name>".

This patch applies the rules to agents_client.

Partially implements blueprint consistent-service-method-names

Change-Id: I505fa196c574027692497848d235781d903cb9f6
This commit is contained in:
Ken'ichi Ohmichi 2016-01-06 01:08:27 +00:00
parent f878e6e36d
commit 70a24e905b
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/api/network/admin/test_dhcp_agent_scheduler.py
View File

@ -84,7 +84,7 @@ class DHCPAgentSchedulersTestJSON(base.BaseAdminNetworkTest):
self._remove_network_from_dhcp_agent(network_id, agent)
def _remove_network_from_dhcp_agent(self, network_id, agent):
self.admin_agents_client.remove_network_from_dhcp_agent(
self.admin_agents_client.delete_network_from_dhcp_agent(
agent_id=agent['id'],
network_id=network_id)
self.assertFalse(self._check_network_in_dhcp_agent(

4
tempest/api/network/admin/test_l3_agent_scheduler.py
View File

@ -110,7 +110,7 @@ class L3AgentSchedulerTestJSON(base.BaseAdminNetworkTest):
@test.idempotent_id('9464e5e7-8625-49c3-8fd1-89c52be59d66')
def test_add_list_remove_router_on_l3_agent(self):
l3_agent_ids = list()
self.admin_agents_client.add_router_to_l3_agent(
self.admin_agents_client.create_router_on_l3_agent(
self.agent['id'],
router_id=self.router['id'])
body = (
@ -120,7 +120,7 @@ class L3AgentSchedulerTestJSON(base.BaseAdminNetworkTest):
self.assertIn('agent_type', agent)
self.assertEqual('L3 agent', agent['agent_type'])
self.assertIn(self.agent['id'], l3_agent_ids)
body = self.admin_agents_client.remove_router_from_l3_agent(
body = self.admin_agents_client.delete_router_from_l3_agent(
self.agent['id'],
self.router['id'])
# NOTE(afazekas): The deletion not asserted, because neutron

1
tempest/hacking/ignored_list_T111.txt
View File

@ -1,3 +1,2 @@
./tempest/services/baremetal/base.py
./tempest/services/network/json/agents_client.py
./tempest/services/network/json/quotas_client.py

4
tempest/scenario/test_network_basic_ops.py
View File

@ -684,9 +684,9 @@ class TestNetworkBasicOps(manager.NetworkScenarioTest):
list_hosts = (self.admin_manager.network_client.
list_l3_agents_hosting_router)
schedule_router = (self.admin_manager.network_agents_client.
add_router_to_l3_agent)
create_router_on_l3_agent)
unschedule_router = (self.admin_manager.network_agents_client.
remove_router_from_l3_agent)
delete_router_from_l3_agent)
agent_list = set(a["id"] for a in
self._list_agents(agent_type="L3 agent"))

6
tempest/services/network/json/agents_client.py
View File

@ -38,7 +38,7 @@ class AgentsClient(base.BaseNetworkClient):
uri = '/agents/%s/l3-routers' % agent_id
return self.list_resources(uri)
def add_router_to_l3_agent(self, agent_id, **kwargs):
def create_router_on_l3_agent(self, agent_id, **kwargs):
# TODO(piyush): Current api-site doesn't contain this API description.
# After fixing the api-site, we need to fix here also for putting the
# link to api-site.
@ -46,7 +46,7 @@ class AgentsClient(base.BaseNetworkClient):
uri = '/agents/%s/l3-routers' % agent_id
return self.create_resource(uri, kwargs)
def remove_router_from_l3_agent(self, agent_id, router_id):
def delete_router_from_l3_agent(self, agent_id, router_id):
uri = '/agents/%s/l3-routers/%s' % (agent_id, router_id)
return self.delete_resource(uri)
@ -54,7 +54,7 @@ class AgentsClient(base.BaseNetworkClient):
uri = '/agents/%s/dhcp-networks' % agent_id
return self.list_resources(uri)
def remove_network_from_dhcp_agent(self, agent_id, network_id):
def delete_network_from_dhcp_agent(self, agent_id, network_id):
uri = '/agents/%s/dhcp-networks/%s' % (agent_id,
network_id)
return self.delete_resource(uri)