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

Merge "Added Disk Capacity in cluster-data-model"

Browse Source
This commit is contained in:
Jenkins
2016-03-15 16:28:53 +00:00
committed by Gerrit Code Review
parent 9a44941c66 681536c8c7
commit 0a6c2c16a4
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
watcher/decision_engine/model/resource.py
View File

@@ -21,6 +21,7 @@ class ResourceType(Enum):
cpu_cores = 'num_cores' cpu_cores = 'num_cores'
memory = 'memory' memory = 'memory'
disk = 'disk' disk = 'disk'
disk_capacity = 'disk_capacity'
class Resource(object): class Resource(object):

3
watcher/metrics_engine/cluster_model_collector/nova.py
View File

@@ -40,9 +40,11 @@ class NovaClusterModelCollector(api.BaseClusterModelCollector):
mem = resource.Resource(resource.ResourceType.memory) mem = resource.Resource(resource.ResourceType.memory)
num_cores = resource.Resource(resource.ResourceType.cpu_cores) num_cores = resource.Resource(resource.ResourceType.cpu_cores)
disk = resource.Resource(resource.ResourceType.disk) disk = resource.Resource(resource.ResourceType.disk)
disk_capacity = resource.Resource(resource.ResourceType.disk_capacity)
cluster.create_resource(mem) cluster.create_resource(mem)
cluster.create_resource(num_cores) cluster.create_resource(num_cores)
cluster.create_resource(disk) cluster.create_resource(disk)
cluster.create_resource(disk_capacity)
flavor_cache = {} flavor_cache = {}
hypervisors = self.wrapper.get_hypervisors_list() hypervisors = self.wrapper.get_hypervisors_list()
@@ -55,6 +57,7 @@ class NovaClusterModelCollector(api.BaseClusterModelCollector):
# set capacity # set capacity
mem.set_capacity(hypervisor, h.memory_mb) mem.set_capacity(hypervisor, h.memory_mb)
disk.set_capacity(hypervisor, h.free_disk_gb) disk.set_capacity(hypervisor, h.free_disk_gb)
disk_capacity.set_capacity(hypervisor, h.local_gb)
num_cores.set_capacity(hypervisor, h.vcpus) num_cores.set_capacity(hypervisor, h.vcpus)
hypervisor.state = h.state hypervisor.state = h.state
hypervisor.status = h.status hypervisor.status = h.status