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

Adding instance metadata into cluster data model

Browse Source 
This patch adds instance metadata in the cluster data model. This
is needed for Noisy Neighbor strategy.

Change-Id: Ia92a9f97ba1457ba844cc37a4d443ca4354069e3
This commit is contained in:
Prudhvi Rao Shedimbi
2017-03-02 21:54:57 +00:00
parent 5afcf7a7f4
commit e2d2fc6227
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,7 +235,8 @@ class ModelBuilder(object):
"disk": flavor.disk,
"disk_capacity": flavor.disk,
"vcpus": flavor.vcpus,
"state": getattr(instance, "OS-EXT-STS:vm_state")}
"state": getattr(instance, "OS-EXT-STS:vm_state"),
"metadata": instance.metadata}
# node_attributes = dict()
# node_attributes["layer"] = "virtual"

1
watcher/decision_engine/model/element/instance.py
View File

@@ -48,6 +48,7 @@ class Instance(compute_resource.ComputeResource):
"disk": wfields.IntegerField(),
"disk_capacity": wfields.NonNegativeIntegerField(),
"vcpus": wfields.NonNegativeIntegerField(),
"metadata": wfields.DictField(),
}
def accept(self, visitor):

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

@@ -66,6 +66,7 @@ class NovaNotification(base.NotificationEndpoint):
memory_mb = instance_flavor_data['memory_mb']
num_cores = instance_flavor_data['vcpus']
disk_gb = instance_flavor_data['root_gb']
instance_metadata = data['nova_object.data']['metadata']
instance.update({
'state': instance_data['state'],
@@ -75,6 +76,7 @@ class NovaNotification(base.NotificationEndpoint):
'vcpus': num_cores,
'disk': disk_gb,
'disk_capacity': disk_gb,
'metadata': instance_metadata,
})
try:
@@ -90,6 +92,7 @@ class NovaNotification(base.NotificationEndpoint):
memory_mb = data['memory_mb']
num_cores = data['vcpus']
disk_gb = data['root_gb']
instance_metadata = data['metadata']
instance.update({
'state': data['state'],
@@ -99,6 +102,7 @@ class NovaNotification(base.NotificationEndpoint):
'vcpus': num_cores,
'disk': disk_gb,
'disk_capacity': disk_gb,
'metadata': instance_metadata,
})
try: