#print 'HTTP CODE: {}'.format(http_code)
#print 'RESP: {}'.format(resp)
if http_code == 202:
- print 'Deletion in progress'
+ print('Deletion in progress')
elif http_code == 204:
- print 'Deleted'
+ print('Deleted')
else:
msg = ""
if resp:
#ns['userdata']['key2']='value2'
if ssh_keys is not None:
- # ssh_keys is comma separate list
- # ssh_keys_format = []
- # for key in ssh_keys.split(','):
- # ssh_keys_format.append({'key-pair-ref': key})
- #
- # ns['ssh-authorized-key'] = ssh_keys_format
- ns['ssh-authorized-key'] = []
+ ns['ssh_keys'] = []
for pubkeyfile in ssh_keys.split(','):
with open(pubkeyfile, 'r') as f:
- ns['ssh-authorized-key'].append(f.read())
+ ns['ssh_keys'].append(f.read())
if config:
ns_config = yaml.load(config)
if "vim-network-name" in ns_config:
if vld.get("vim-network-name"):
if isinstance(vld["vim-network-name"], dict):
vim_network_name_dict = {}
- for vim_account, vim_net in vld["vim-network-name"].items():
+ for vim_account, vim_net in list(vld["vim-network-name"].items()):
vim_network_name_dict[get_vim_account_id(vim_account)] = vim_net
vld["vim-network-name"] = vim_network_name_dict
ns["vld"] = ns_config["vld"]
self._apiResource = '/ns_instances_content'
self._apiBase = '{}{}{}'.format(self._apiName,
self._apiVersion, self._apiResource)
+ headers = self._client._headers
+ headers['Content-Type'] = 'application/yaml'
+ http_header = ['{}: {}'.format(key,val)
+ for (key,val) in list(headers.items())]
+ self._http.set_http_header(http_header)
http_code, resp = self._http.post_cmd(endpoint=self._apiBase,
postfields_dict=ns)
#print 'HTTP CODE: {}'.format(http_code)
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {} '.format(
resp))
- print resp['id']
+ print(resp['id'])
else:
msg = ""
if resp:
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
- print resp['id']
+ print(resp['id'])
else:
msg = ""
if resp:
#print 'RESP: {}'.format(resp)
if http_code in (200, 201, 202, 204):
#resp = json.loads(resp)
- print 'Alarm created'
+ print('Alarm created')
else:
msg = ""
if resp:
#print 'RESP: {}'.format(resp)
if http_code in (200, 201, 202, 204):
#resp = json.loads(resp)
- print 'Alarm deleted'
+ print('Alarm deleted')
else:
msg = ""
if resp:
http_code, msg))
except ClientException as exc:
message="failed to delete alarm: alarm {}\n{}".format(
- alarm,
+ name,
exc.message)
raise ClientException(message)