openstack
/
openstacksdk
Code Issues Proposed changes

Modified DHCP/Network Resource 

As per comments on https://review.openstack.org/#/c/385728/19
Not building body dict in proxy.

Change-Id: I13c7afb7c5ad8d448a679b6b63b4f91b613f4962
This commit is contained in:
Ankur Gupta 2017-01-20 15:30:33 -05:00
parent 96f025afce
commit e681725fb8
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack/network/v2/_proxy.py
View File

@ -225,8 +225,7 @@ class Proxy(proxy2.BaseProxy):
"""
network = self._get_resource(_network.Network, network)
agent = self._get_resource(_agent.Agent, agent)
body = {'network_id': network.id}
return agent.add_agent_to_network(self.session, **body)
return agent.add_agent_to_network(self.session, network.id)
def remove_dhcp_agent_from_network(self, agent, network):
"""Remove a DHCP Agent from a network
@ -236,11 +235,9 @@ class Proxy(proxy2.BaseProxy):
:param network: Network instance
:return:
"""
# network_id = resource.Resource.get_id(network)
network = self._get_resource(_network.Network, network)
agent = self._get_resource(_agent.Agent, agent)
body = {'network_id': network.id}
return agent.remove_agent_from_network(self.session, **body)
return agent.remove_agent_from_network(self.session, network.id)
def network_hosting_dhcp_agents(self, network, **query):
"""A generator of DHCP agents hosted on a network.

7
openstack/network/v2/agent.py
View File

@ -64,13 +64,14 @@ class Agent(resource.Resource):
#: The messaging queue topic the network agent subscribes to.
topic = resource.Body('topic')
def add_agent_to_network(self, session, **body):
def add_agent_to_network(self, session, network_id):
body = {'network_id': network_id}
url = utils.urljoin(self.base_path, self.id, 'dhcp-networks')
resp = session.post(url, endpoint_filter=self.service, json=body)
return resp.json()
def remove_agent_from_network(self, session, **body):
network_id = body.get('network_id')
def remove_agent_from_network(self, session, network_id):
body = {'network_id': network_id}
url = utils.urljoin(self.base_path, self.id, 'dhcp-networks',
network_id)
session.delete(url, endpoint_filter=self.service, json=body)

5
openstack/tests/unit/network/v2/test_agent.py
View File

@ -83,8 +83,9 @@ class TestAgent(testtools.TestCase):
# Remove agent from agent
net = agent.Agent(**EXAMPLE)
sess = mock.Mock()
self.assertIsNone(net.remove_agent_from_network(sess))
body = {}
network_id = {}
self.assertIsNone(net.remove_agent_from_network(sess, network_id))
body = {'network_id': {}}
sess.delete.assert_called_with('agents/IDENTIFIER/dhcp-networks/',
endpoint_filter=net.service, json=body)