Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "extend-node-status"

Browse Source
This commit is contained in:
Zuul
2017-11-29 13:35:54 +00:00
committed by Gerrit Code Review
parent 17b6019ea9 74bc31e562
commit 2993dea376
14 changed files with 58 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
watcher/decision_engine/model/collector/nova.py
View File

@@ -248,7 +248,8 @@ class ModelBuilder(object):
"disk_capacity": node.local_gb,
"vcpus": node.vcpus,
"state": node.state,
"status": node.status}
"status": node.status,
"disabled_reason": compute_service.disabled_reason}
compute_node = element.ComputeNode(**node_attributes)
# compute_node = self._build_node("physical", "compute", "hypervisor",

2
watcher/decision_engine/model/element/node.py
View File

@@ -36,8 +36,8 @@ class ComputeNode(compute_resource.ComputeResource):
"id": wfields.StringField(),
"hostname": wfields.StringField(),
"status": wfields.StringField(default=ServiceState.ENABLED.value),
"disabled_reason": wfields.StringField(nullable=True),
"state": wfields.StringField(default=ServiceState.ONLINE.value),
"memory": wfields.NonNegativeIntegerField(),
"disk": wfields.IntegerField(),
"disk_capacity": wfields.NonNegativeIntegerField(),

4
watcher/decision_engine/model/notification/nova.py
View File

@@ -122,11 +122,15 @@ class NovaNotification(base.NotificationEndpoint):
node_status = (
element.ServiceState.DISABLED.value
if node_data['disabled'] else element.ServiceState.ENABLED.value)
disabled_reason = (
node_data['disabled_reason']
if node_data['disabled'] else None)
node.update({
'hostname': node_data['host'],
'state': node_state,
'status': node_status,
'disabled_reason': disabled_reason,
})
def create_compute_node(self, node_hostname):