Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add vnf, tag create & Associate Plugins"
[releng.git]
/
modules
/
opnfv
/
deployment
/
fuel
/
adapter.py
diff --git
a/modules/opnfv/deployment/fuel/adapter.py
b/modules/opnfv/deployment/fuel/adapter.py
index
aa5ad7a
..
a217767
100644
(file)
--- a/
modules/opnfv/deployment/fuel/adapter.py
+++ b/
modules/opnfv/deployment/fuel/adapter.py
@@
-114,7
+114,7
@@
class FuelAdapter(manager.DeploymentHandler):
index_ip = i
elif "mac" in fields[i]:
index_mac = i
index_ip = i
elif "mac" in fields[i]:
index_mac = i
- elif "roles " in fields[i]:
+ elif "roles " in fields[i]
and "pending_roles" not in fields[i]
:
index_roles = i
elif "online" in fields[i]:
index_online = i
index_roles = i
elif "online" in fields[i]:
index_online = i
@@
-170,26
+170,30
@@
class FuelAdapter(manager.DeploymentHandler):
cmd = 'source openrc;nova-manage version 2>/dev/null'
version = None
for node in self.nodes:
cmd = 'source openrc;nova-manage version 2>/dev/null'
version = None
for node in self.nodes:
- if node.is_controller():
+ if node.is_controller()
and node.is_active()
:
version = node.run_cmd(cmd)
break
return version
def get_sdn_version(self):
version = node.run_cmd(cmd)
break
return version
def get_sdn_version(self):
- cmd = "apt-cache
show opendaylight|grep Version|sed 's/^.*\: //'
"
+ cmd = "apt-cache
policy opendaylight|grep Installed
"
version = None
for node in self.nodes:
version = None
for node in self.nodes:
- if
node.is_controller
():
+ if
manager.Role.ODL in node.roles and node.is_active
():
odl_version = node.run_cmd(cmd)
if odl_version:
odl_version = node.run_cmd(cmd)
if odl_version:
- version = 'OpenDaylight ' + odl_version
- break
+ version = 'OpenDaylight ' + odl_version
.split(' ')[-1]
+
break
return version
def get_deployment_status(self):
return version
def get_deployment_status(self):
- cmd =
'fuel env|grep operational'
+ cmd =
"fuel env|tail -1|awk '{print $3}'"
result = self.installer_node.run_cmd(cmd)
if result is None or len(result) == 0:
result = self.installer_node.run_cmd(cmd)
if result is None or len(result) == 0:
- return 'failed'
+ return 'unknown'
+ elif 'operational' in result:
+ return 'active'
+ elif 'deploy' in result:
+ return 'deploying'
else:
return 'active'
else:
return 'active'