airship
/
drydock
Code Issues Proposed changes

Change POST nodefilter Input 

- Changed the expected input from site_design to design_ref.
- Converts the design_ref json/dict into a SiteDesign object.

Change-Id: Ie1f6738fec64749cde9d2843d9373175006794c0
This commit is contained in:
Aaron Sheffield 2018-05-08 10:32:26 -05:00
parent d052664f74
commit 8af92eaf29
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/API.rst
View File

@ -54,8 +54,8 @@ nodefilter API
POST nodefilter POST nodefilter
^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^
The Nodes API will provide a list of node names based on site_design. This API The Nodes API will provide a list of node names based on design_ref. This API
requires site_design in the POST body with an optional node_filter to return the node requires design_ref in the POST body with an optional node_filter to return the node
names. names.
bootdata bootdata

9
drydock_provisioner/control/nodes.py
View File

@ -102,15 +102,16 @@ class NodeFilterResource(StatefulResource):
try: try:
json_data = self.req_json(req) json_data = self.req_json(req)
node_filter = json_data.get('node_filter', None) node_filter = json_data.get('node_filter', None)
site_design = json_data.get('site_design', None) design_ref = json_data.get('design_ref', None)
if site_design is None: if design_ref is None:
self.info(req.context, 'Missing required input value: site_design') self.info(req.context, 'Missing required input value: design_ref')
self.return_error( self.return_error(
resp, resp,
falcon.HTTP_400, falcon.HTTP_400,
message='Missing input required value: site_design', message='Missing input required value: design_ref',
retry=False) retry=False)
return return
_, site_design = self.orchestrator.get_effective_site(design_ref)
nodes = self.orchestrator.process_node_filter(node_filter=node_filter, nodes = self.orchestrator.process_node_filter(node_filter=node_filter,
site_design=site_design) site_design=site_design)
resp_list = [n.name for n in nodes if nodes] resp_list = [n.name for n in nodes if nodes]

4
drydock_provisioner/drydock_client/client.py
View File

@ -44,12 +44,12 @@ class DrydockClient(object):
:param SiteDesign design_ref: A SiteDesign object. :param SiteDesign design_ref: A SiteDesign object.
:param NodeFilter node_filter (optional): A NodeFilter object. :param NodeFilter node_filter (optional): A NodeFilter object.
:return: A list of node names based on the node_filter and site_design. :return: A list of node names based on the node_filter and design_ref.
""" """
endpoint = 'v1.0/nodefilter' endpoint = 'v1.0/nodefilter'
body = { body = {
'node_filter': node_filter, 'node_filter': node_filter,
'site_design': design_ref 'design_ref': design_ref
} }
resp = self.session.post(endpoint, data=body) resp = self.session.post(endpoint, data=body)

2
tests/unit/test_api_nodes_unit.py
View File

@ -38,7 +38,7 @@ class TestNodesApiUnit(object):
hdr = self.get_standard_header() hdr = self.get_standard_header()
body = { body = {
'node_filter': 'filters', 'node_filter': 'filters',
'site_design': design_ref, 'design_ref': design_ref,
} }
result = falcontest.simulate_post( result = falcontest.simulate_post(