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

remove id field from CDM

Browse Source 
There are 3 related fields(id, uuid and hostname) in ComputeNode[1].
according to [2], after nova api 2.53, the id of the hypervisor as a UUID.
and service.host is equal to hypervisor name for compute node.
so we can remove id and only keep uuid then set uuid to node.id

[1]:https://github.com/openstack/watcher/blob/master/watcher/decision_engine/model/collector/nova.py#L306
[2]:https://developer.openstack.org/api-ref/compute/?expanded=list-hypervisors-details-detail#list-hypervisors-details

Change-Id: Ie1d1ad56808270d936ec25186061f7f12cc49fdc
Closes-Bug: #1835192
Depends-on: I752fbfa560313e28e87d83e46431c283b4db4f23
Depends-on: I0975500f359de92b6d6fdea2e01614cf0ba73f05
This commit is contained in:
licanwei
2019-07-04 15:44:06 +08:00
parent 3d741d05aa
commit 4b83bf33e2
28 changed files with 172 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,9 +349,9 @@ class NovaModelBuilder(base.BaseModelBuilder):
# build up the compute node.
node_attributes = {
"id": node.id,
"uuid": node.service["host"],
"hostname": node.hypervisor_hostname,
# The id of the hypervisor as a UUID from version 2.53.
"uuid": node.id,
"hostname": node.service["host"],
"memory": memory_mb,
"memory_ratio": memory_ratio,
"memory_mb_reserved": memory_mb_reserved,
@@ -379,7 +379,7 @@ class NovaModelBuilder(base.BaseModelBuilder):
LOG.info("no instances on compute_node: {0}".format(node))
return
host = node.service["host"]
compute_node = self.model.get_node_by_uuid(host)
compute_node = self.model.get_node_by_uuid(node.id)
filters = {'host': host}
limit = len(instances) if len(instances) <= 1000 else -1
# Get all servers on this compute host.

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

@@ -34,7 +34,6 @@ class ServiceState(enum.Enum):
class ComputeNode(compute_resource.ComputeResource):
fields = {
"id": wfields.StringField(),
"hostname": wfields.StringField(),
"status": wfields.StringField(default=ServiceState.ENABLED.value),
"disabled_reason": wfields.StringField(nullable=True),

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

@@ -19,6 +19,7 @@
from oslo_log import log
from watcher.common import exception
from watcher.common import nova_helper
from watcher.common import utils
from watcher.decision_engine.model import element
from watcher.decision_engine.model.notification import base
from watcher.decision_engine.model.notification import filtering
@@ -38,15 +39,15 @@ class NovaNotification(base.NotificationEndpoint):
self._nova = nova_helper.NovaHelper()
return self._nova
def get_or_create_instance(self, instance_uuid, node_uuid=None):
def get_or_create_instance(self, instance_uuid, node_name=None):
try:
node = None
if node_uuid:
node = self.get_or_create_node(node_uuid)
if node_name:
node = self.get_or_create_node(node_name)
except exception.ComputeNodeNotFound:
LOG.warning("Could not find compute node %(node)s for "
"instance %(instance)s",
dict(node=node_uuid, instance=instance_uuid))
dict(node=node_name, instance=instance_uuid))
try:
instance = self.cluster_data_model.get_instance_by_uuid(
instance_uuid)
@@ -117,13 +118,16 @@ class NovaNotification(base.NotificationEndpoint):
'disabled_reason': disabled_reason,
})
def create_compute_node(self, node_hostname):
"""Update the compute node by querying the Nova API."""
def create_compute_node(self, uuid_or_name):
"""Create the computeNode node."""
try:
_node = self.nova.get_compute_node_by_hostname(node_hostname)
if utils.is_uuid_like(uuid_or_name):
_node = self.nova.get_compute_node_by_uuid(uuid_or_name)
else:
_node = self.nova.get_compute_node_by_hostname(uuid_or_name)
node = element.ComputeNode(
id=_node.id,
uuid=node_hostname,
uuid=_node.id,
hostname=_node.hypervisor_hostname,
state=_node.state,
status=_node.status,
@@ -132,26 +136,27 @@ class NovaNotification(base.NotificationEndpoint):
disk=_node.free_disk_gb,
disk_capacity=_node.local_gb,
)
self.cluster_data_model.add_node(node)
LOG.debug("New compute node mapped: %s", node.uuid)
return node
except Exception as exc:
LOG.exception(exc)
LOG.debug("Could not refresh the node %s.", node_hostname)
raise exception.ComputeNodeNotFound(name=node_hostname)
LOG.debug("Could not refresh the node %s.", uuid_or_name)
raise exception.ComputeNodeNotFound(name=uuid_or_name)
return False
def get_or_create_node(self, uuid):
if uuid is None:
LOG.debug("Compute node UUID not provided: skipping")
def get_or_create_node(self, uuid_or_name):
if uuid_or_name is None:
LOG.debug("Compute node UUID or name not provided: skipping")
return
try:
return self.cluster_data_model.get_node_by_uuid(uuid)
if utils.is_uuid_like(uuid_or_name):
return self.cluster_data_model.get_node_by_uuid(uuid_or_name)
else:
return self.cluster_data_model.get_node_by_name(uuid_or_name)
except exception.ComputeNodeNotFound:
# The node didn't exist yet so we create a new node object
node = self.create_compute_node(uuid)
LOG.debug("New compute node created: %s", uuid)
self.cluster_data_model.add_node(node)
LOG.debug("New compute node mapped: %s", uuid)
node = self.create_compute_node(uuid_or_name)
LOG.debug("New compute node created: %s", uuid_or_name)
return node
def update_instance_mapping(self, instance, node):
@@ -202,18 +207,18 @@ class VersionedNotification(NovaNotification):
def service_updated(self, payload):
node_data = payload['nova_object.data']
node_uuid = node_data['host']
node_name = node_data['host']
try:
node = self.get_or_create_node(node_uuid)
node = self.get_or_create_node(node_name)
self.update_compute_node(node, payload)
except exception.ComputeNodeNotFound as exc:
LOG.exception(exc)
def service_deleted(self, payload):
node_data = payload['nova_object.data']
node_uuid = node_data['host']
node_name = node_data['host']
try:
node = self.get_or_create_node(node_uuid)
node = self.get_or_create_node(node_name)
self.delete_node(node)
except exception.ComputeNodeNotFound as exc:
LOG.exception(exc)
@@ -222,12 +227,12 @@ class VersionedNotification(NovaNotification):
instance_data = payload['nova_object.data']
instance_uuid = instance_data['uuid']
instance_state = instance_data['state']
node_uuid = instance_data.get('host')
node_name = instance_data.get('host')
# if instance state is building, don't update data model
if instance_state == 'building':
return
instance = self.get_or_create_instance(instance_uuid, node_uuid)
instance = self.get_or_create_instance(instance_uuid, node_name)
self.update_instance(instance, payload)
@@ -237,9 +242,9 @@ class VersionedNotification(NovaNotification):
instance = element.Instance(uuid=instance_uuid)
self.cluster_data_model.add_instance(instance)
node_uuid = instance_data.get('host')
if node_uuid:
node = self.get_or_create_node(node_uuid)
node_name = instance_data.get('host')
if node_name:
node = self.get_or_create_node(node_name)
self.cluster_data_model.map_instance(instance, node)
self.update_instance(instance, payload)
@@ -247,8 +252,8 @@ class VersionedNotification(NovaNotification):
def instance_deleted(self, payload):
instance_data = payload['nova_object.data']
instance_uuid = instance_data['uuid']
node_uuid = instance_data.get('host')
instance = self.get_or_create_instance(instance_uuid, node_uuid)
node_name = instance_data.get('host')
instance = self.get_or_create_instance(instance_uuid, node_name)
try:
node = self.get_or_create_node(instance_data['host'])