Various fixes and workarounds to talk to HP API server
Change-Id: Id16b34790aac14b8af2803f8556e66b560ce6c2f
This commit is contained in:
parent
396cc1a73b
commit
7e188b2127
|
@ -67,7 +67,10 @@ class LibraAPI(object):
|
||||||
|
|
||||||
def limits_lb(self, args):
|
def limits_lb(self, args):
|
||||||
resp, body = self._get('/limits')
|
resp, body = self._get('/limits')
|
||||||
column_names = ['Verb', 'Value', 'Remaining', 'Unit', 'Next Available']
|
# Work around the fact that limits is missing from HP's API server
|
||||||
|
if 'rate' in body['limits']:
|
||||||
|
column_names = ['Verb', 'Value', 'Remaining', 'Unit',
|
||||||
|
'Next Available']
|
||||||
columns = ['verb', 'value', 'remaining', 'unit', 'next-available']
|
columns = ['verb', 'value', 'remaining', 'unit', 'next-available']
|
||||||
self._render_list(column_names, columns,
|
self._render_list(column_names, columns,
|
||||||
body['limits']['rate']['values']['limit'])
|
body['limits']['rate']['values']['limit'])
|
||||||
|
@ -127,8 +130,7 @@ class LibraAPI(object):
|
||||||
data['algorithm'] = args.algorithm
|
data['algorithm'] = args.algorithm
|
||||||
for node in args.node:
|
for node in args.node:
|
||||||
addr = node.split(':')
|
addr = node.split(':')
|
||||||
nodes.append({'address': addr[0], 'port': addr[1],
|
nodes.append({'address': addr[0], 'port': addr[1]})
|
||||||
'condition': 'ENABLED'})
|
|
||||||
data['nodes'] = nodes
|
data['nodes'] = nodes
|
||||||
if args.vip is not None:
|
if args.vip is not None:
|
||||||
data['virtualIps'] = [{'id': args.vip}]
|
data['virtualIps'] = [{'id': args.vip}]
|
||||||
|
@ -164,8 +166,7 @@ class LibraAPI(object):
|
||||||
|
|
||||||
for node in args.node:
|
for node in args.node:
|
||||||
addr = node.split(':')
|
addr = node.split(':')
|
||||||
nodes.append({'address': addr[0], 'port': addr[1],
|
nodes.append({'address': addr[0], 'port': addr[1]})
|
||||||
'condition': 'ENABLED'})
|
|
||||||
data['nodes'] = nodes
|
data['nodes'] = nodes
|
||||||
resp, body = self._post('/loadbalancers/{0}/nodes'
|
resp, body = self._post('/loadbalancers/{0}/nodes'
|
||||||
.format(args.id), body=data)
|
.format(args.id), body=data)
|
||||||
|
@ -190,7 +191,10 @@ class LibraAPI(object):
|
||||||
for item in data:
|
for item in data:
|
||||||
row = []
|
row = []
|
||||||
for column in columns:
|
for column in columns:
|
||||||
|
if column in item:
|
||||||
rdata = item[column]
|
rdata = item[column]
|
||||||
|
else:
|
||||||
|
rdata = ''
|
||||||
row.append(rdata)
|
row.append(rdata)
|
||||||
table.add_row(row)
|
table.add_row(row)
|
||||||
print table
|
print table
|
||||||
|
@ -199,7 +203,10 @@ class LibraAPI(object):
|
||||||
table = prettytable.PrettyTable(column_names)
|
table = prettytable.PrettyTable(column_names)
|
||||||
row = []
|
row = []
|
||||||
for column in columns:
|
for column in columns:
|
||||||
|
if column in data:
|
||||||
rdata = data[column]
|
rdata = data[column]
|
||||||
|
else:
|
||||||
|
rdata = ''
|
||||||
row.append(rdata)
|
row.append(rdata)
|
||||||
table.add_row(row)
|
table.add_row(row)
|
||||||
print table
|
print table
|
||||||
|
|
|
@ -211,12 +211,10 @@ class TestLBaaSClientLibraAPI(testtools.TestCase):
|
||||||
"nodes": [
|
"nodes": [
|
||||||
{
|
{
|
||||||
"address": "10.1.1.1",
|
"address": "10.1.1.1",
|
||||||
"condition": "ENABLED",
|
|
||||||
"port": "80"
|
"port": "80"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"address": "10.1.1.2",
|
"address": "10.1.1.2",
|
||||||
"condition": "ENABLED",
|
|
||||||
"port": "81"
|
"port": "81"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -269,7 +267,6 @@ class TestLBaaSClientLibraAPI(testtools.TestCase):
|
||||||
'id': '653',
|
'id': '653',
|
||||||
'port': '80',
|
'port': '80',
|
||||||
'status': 'ONLINE',
|
'status': 'ONLINE',
|
||||||
'condition': 'ENABLED'
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
@ -286,7 +283,6 @@ class TestLBaaSClientLibraAPI(testtools.TestCase):
|
||||||
"nodes": [
|
"nodes": [
|
||||||
{
|
{
|
||||||
"address": "10.1.1.1",
|
"address": "10.1.1.1",
|
||||||
"condition": "ENABLED",
|
|
||||||
"port": "80"
|
"port": "80"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue