Merge "Enable accepting short mac for node ids"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
493b74e616
@ -64,6 +64,42 @@ class DeployProgressError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class NodeAction(argparse.Action):
|
||||
"""Custom argparse.Action subclass to store node identity
|
||||
|
||||
:returns: list of ids
|
||||
"""
|
||||
def __call__(self, _parser, namespace, values, option_string=None):
|
||||
if values:
|
||||
node_identities = set(chain(*values))
|
||||
input_macs = set(n for n in node_identities if ":" in n)
|
||||
only_ids = set()
|
||||
for _id in (node_identities - input_macs):
|
||||
try:
|
||||
only_ids.add(int(_id))
|
||||
except ValueError:
|
||||
print_error("'{}' is not valid node id.".format(_id))
|
||||
if input_macs:
|
||||
nodes_mac_to_id_map = dict(
|
||||
(n["mac"], n["id"])
|
||||
for n in json_api_get_request("nodes/")
|
||||
)
|
||||
for short_mac in input_macs:
|
||||
target_node = None
|
||||
for mac in nodes_mac_to_id_map:
|
||||
if mac.endswith(short_mac):
|
||||
target_node = mac
|
||||
break
|
||||
if target_node:
|
||||
only_ids.add(nodes_mac_to_id_map[target_node])
|
||||
else:
|
||||
print_error(
|
||||
'Node with mac endfix "{0}" was not found.'
|
||||
.format(short_mac)
|
||||
)
|
||||
setattr(namespace, self.dest, list(only_ids))
|
||||
|
||||
|
||||
class SetAction(argparse.Action):
|
||||
"""Custom argparse.Action subclass to store distinct values
|
||||
|
||||
@ -463,9 +499,9 @@ def environment(params):
|
||||
def node(params):
|
||||
"""List and assign available nodes to environments
|
||||
"""
|
||||
node_ids = params.node
|
||||
if params.set:
|
||||
check_for_attributes(params, ["node", "role", "env"])
|
||||
node_ids = list(chain(*params.node))
|
||||
roles = map(str.lower, params.role)
|
||||
if not params.force:
|
||||
validate_roles(params.env, roles)
|
||||
@ -498,8 +534,6 @@ def node(params):
|
||||
"Environment with id={0} doesn't have nodes to remove."
|
||||
.format(params.env)
|
||||
)
|
||||
else:
|
||||
node_ids = list(chain(*params.node))
|
||||
data = map(
|
||||
lambda _node_id: {
|
||||
"id": _node_id,
|
||||
@ -522,7 +556,6 @@ def node(params):
|
||||
elif params.network or params.disk:
|
||||
check_for_one_attribute(params, ["default", "download", "upload"])
|
||||
check_for_attributes(params, ["node"])
|
||||
node_ids = list(chain(*params.node))
|
||||
for node_id in node_ids:
|
||||
if params.network:
|
||||
get_node_attribute(
|
||||
@ -543,7 +576,7 @@ def node(params):
|
||||
'must appear after "--disk" or "--network" flags.')
|
||||
elif params.deploy or params.provision:
|
||||
check_for_attributes(params, ["node", "env"])
|
||||
node_ids = [str(n) for n in chain(*params.node)]
|
||||
node_ids = map(str, node_ids)
|
||||
mode = "deploy" if params.deploy else "provision"
|
||||
deploy_nodes_url = "clusters/{0}/{1}/?nodes={2}".format(
|
||||
params.env,
|
||||
@ -569,7 +602,6 @@ def node(params):
|
||||
data
|
||||
)
|
||||
elif params.node:
|
||||
node_ids = list(chain(*params.node))
|
||||
data = filter(
|
||||
lambda x: x[u"id"] in node_ids,
|
||||
data
|
||||
@ -599,11 +631,11 @@ def quote_and_join(words):
|
||||
def validate_roles(cluster_id, roles):
|
||||
roles = set(roles)
|
||||
cluster = json_api_get_request("clusters/{0}/".format(cluster_id))
|
||||
release = json_api_get_request("releases/{0}/".format(
|
||||
_release = json_api_get_request("releases/{0}/".format(
|
||||
cluster["release_id"]
|
||||
))
|
||||
roles_metadata = release["roles_metadata"]
|
||||
not_valid_roles = roles - set(release["roles"])
|
||||
roles_metadata = _release["roles_metadata"]
|
||||
not_valid_roles = roles - set(_release["roles"])
|
||||
if not_valid_roles:
|
||||
print_error(
|
||||
"{0} are not valid roles for environment {1}"
|
||||
@ -1015,9 +1047,7 @@ def fact(params, info_type):
|
||||
info_type
|
||||
)
|
||||
if params.node:
|
||||
facts_default_url += "/?nodes=" + ",".join(
|
||||
str(n) for n in chain(*params.node)
|
||||
)
|
||||
facts_default_url += "/?nodes=" + ",".join(map(str, params.node))
|
||||
facts_url = "clusters/{0}/orchestrator/{1}/".format(
|
||||
params.env,
|
||||
info_type
|
||||
@ -1386,9 +1416,9 @@ def get_node_arg(help_msg):
|
||||
"args": ["--node", "--node-id"],
|
||||
"params": {
|
||||
"dest": "node",
|
||||
"action": "store",
|
||||
"action": NodeAction,
|
||||
"nargs": '+',
|
||||
"type": parse_ids,
|
||||
"type": lambda v: v.split(","),
|
||||
"help": help_msg,
|
||||
"default": None
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@ import subprocess
|
||||
import sys
|
||||
|
||||
logging.basicConfig(stream=sys.stderr)
|
||||
logging.getLogger("SomeTest.testSomething").setLevel(logging.DEBUG)
|
||||
logging.getLogger("CliTest.ExecutionLog").setLevel(logging.DEBUG)
|
||||
|
||||
|
||||
class CliExectutionResult:
|
||||
@ -91,7 +91,7 @@ class BaseTestCase(TestCase):
|
||||
modified_env = os.environ.copy()
|
||||
modified_env["LISTEN_PORT"] = "8003"
|
||||
command_args = [" ".join((self.fuel_path, command_line))]
|
||||
log = logging.getLogger("SomeTest.testSomething")
|
||||
log = logging.getLogger("CliTest.ExecutionLog")
|
||||
process_handle = subprocess.Popen(
|
||||
command_args,
|
||||
stdout=subprocess.PIPE,
|
||||
@ -131,3 +131,7 @@ class BaseTestCase(TestCase):
|
||||
message = output.stdout.split("\n")
|
||||
#no env
|
||||
self.assertEqual(message[2], '')
|
||||
|
||||
def check_number_of_rows_in_table(self, command, number_of_rows):
|
||||
output = self.run_cli_command(command)
|
||||
self.assertEqual(len(output.stdout.split("\n")), number_of_rows + 3)
|
||||
|
||||
@ -67,6 +67,9 @@ class TestHandlers(BaseTestCase):
|
||||
for action in ("set", "remove", "--network", "--disk"):
|
||||
self.check_if_required("node {0}".format(action))
|
||||
|
||||
self.load_data_to_nailgun_server()
|
||||
self.check_number_of_rows_in_table("node --node 9f:b7,9d:24,ab:aa", 3)
|
||||
|
||||
def test_selected_node_deploy_or_provision(self):
|
||||
self.load_data_to_nailgun_server()
|
||||
self.run_cli_commands((
|
||||
|
||||
Loading…
Reference in New Issue
Block a user