openstack
/
senlin
Code Issues Proposed changes

Unify input parameter definition in Senlin openstack drivers 

This patch tried to unify the input parameter definition in all
Senlin openstack drivers.

Note: keystone_v3 driver will be handled in another patch since
some interfaces implementation need revision.

Change-Id: Id875abe68b605298fd9bcad8f9afef166a58ecf9
This commit is contained in:
yanyanhu 2015-06-29 01:30:07 -04:00
parent 25d894587e
commit 6cb42387f5
4 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
senlin/drivers/openstack/ceilometer_v2.py
View File

@ -26,10 +26,10 @@ class CeilometerClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def alarm_delete(self, value, ignore_missing=True): def alarm_delete(self, alarm_id, ignore_missing=True):
try: try:
return self.conn.telemetry.delete_alarm( return self.conn.telemetry.delete_alarm(
value, ignore_missing=ignore_missing) alarm_id, ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
@ -39,9 +39,9 @@ class CeilometerClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def alarm_get(self, value): def alarm_get(self, alarm_id):
try: try:
return self.conn.telemetry.get_alarm(value) return self.conn.telemetry.get_alarm(alarm_id)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
@ -51,9 +51,9 @@ class CeilometerClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def alarm_update(self, value, **params): def alarm_update(self, alarm_id, **params):
try: try:
return self.conn.telemetry.update_alarm(value, **params) return self.conn.telemetry.update_alarm(alarm_id, **params)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex

12
senlin/drivers/openstack/heat_v1.py
View File

@ -27,9 +27,9 @@ class HeatClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def stack_get(self, value): def stack_get(self, stack_id):
try: try:
return self.conn.orchestration.get_stack(value) return self.conn.orchestration.get_stack(stack_id)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
@ -39,9 +39,9 @@ class HeatClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def stack_list(self, **params): def stack_list(self):
try: try:
return self.conn.orchestration.list_stacks(**params) return self.conn.orchestration.stacks()
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
@ -53,9 +53,9 @@ class HeatClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def stack_delete(self, value, ignore_missing=True): def stack_delete(self, stack_id, ignore_missing=True):
try: try:
return self.conn.orchestration.delete_stack(value, return self.conn.orchestration.delete_stack(stack_id,
ignore_missing) ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex

55
senlin/drivers/openstack/neutron_v2.py
View File

@ -29,12 +29,12 @@ class NeutronClient(base.DriverBase):
self.session = self.conn.session self.session = self.conn.session
self.auth = self.session.authenticator self.auth = self.session.authenticator
def loadbalancer_get(self, lb_identity): def loadbalancer_get(self, name_or_id):
try: try:
lb = self.conn.network.find_load_balancer(lb_identity) lb = self.conn.network.find_load_balancer(name_or_id)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
msg = _('Failed in getting loadbalancer %(value)s: %(ex)s' msg = _('Failed in getting loadbalancer %(value)s: %(ex)s'
) % {'value': lb_identity, 'ex': six.text_type(ex)} ) % {'value': name_or_id, 'ex': six.text_type(ex)}
raise exception.Error(msg=msg) raise exception.Error(msg=msg)
return lb return lb
@ -73,9 +73,10 @@ class NeutronClient(base.DriverBase):
return res return res
def loadbalancer_delete(self, lb_id): def loadbalancer_delete(self, lb_id, ignore_missing=True):
try: try:
self.conn.network.delete_load_balancer(lb_id) self.conn.network.delete_load_balancer(
lb_id, ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
msg = _('Failed in deleting loadbalancer %(id)s: %(ex)s' msg = _('Failed in deleting loadbalancer %(id)s: %(ex)s'
) % {'id': lb_id, 'ex': six.text_type(ex)} ) % {'id': lb_id, 'ex': six.text_type(ex)}
@ -83,12 +84,12 @@ class NeutronClient(base.DriverBase):
return return
def listener_get(self, listener_identity): def listener_get(self, name_or_id):
try: try:
listener = self.conn.network.find_listener(listener_identity) listener = self.conn.network.find_listener(name_or_id)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
msg = _('Failed in getting lb listener %(value)s: %(ex)s' msg = _('Failed in getting lb listener %(value)s: %(ex)s'
) % {'value': listener_identity, 'ex': six.text_type(ex)} ) % {'value': name_or_id, 'ex': six.text_type(ex)}
raise exception.Error(msg=msg) raise exception.Error(msg=msg)
return listener return listener
@ -130,9 +131,10 @@ class NeutronClient(base.DriverBase):
return res return res
def listener_delete(self, listener_id): def listener_delete(self, listener_id, ignore_missing=True):
try: try:
self.conn.network.delete_listener(listener_id) self.conn.network.delete_listener(listener_id,
ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
msg = _('Failed in deleting lb listener %(id)s: %(ex)s' msg = _('Failed in deleting lb listener %(id)s: %(ex)s'
) % {'id': listener_id, 'ex': six.text_type(ex)} ) % {'id': listener_id, 'ex': six.text_type(ex)}
@ -140,12 +142,12 @@ class NeutronClient(base.DriverBase):
return return
def pool_get(self, pool_identity): def pool_get(self, name_or_id):
try: try:
pool = self.conn.network.find_pool(pool_identity) pool = self.conn.network.find_pool(name_or_id)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
msg = _('Failed in getting lb pool %(value)s: %(ex)s' msg = _('Failed in getting lb pool %(value)s: %(ex)s'
) % {'value': pool_identity, 'ex': six.text_type(ex)} ) % {'value': name_or_id, 'ex': six.text_type(ex)}
raise exception.Error(msg=msg) raise exception.Error(msg=msg)
return pool return pool
@ -184,9 +186,10 @@ class NeutronClient(base.DriverBase):
return res return res
def pool_delete(self, pool_id): def pool_delete(self, pool_id, ignore_missing=True):
try: try:
self.conn.network.delete_pool(pool_id) self.conn.network.delete_pool(pool_id,
ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
msg = _('Failed in deleting lb pool %(id)s: %(ex)s' msg = _('Failed in deleting lb pool %(id)s: %(ex)s'
) % {'id': pool_id, 'ex': six.text_type(ex)} ) % {'id': pool_id, 'ex': six.text_type(ex)}
@ -194,13 +197,13 @@ class NeutronClient(base.DriverBase):
return return
def pool_member_get(self, pool_id, member_identity): def pool_member_get(self, pool_id, name_or_id):
try: try:
member = self.conn.network.find_pool_member(member_identity, member = self.conn.network.find_pool_member(name_or_id,
pool_id) pool_id)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
msg = _('Failed in getting lb pool_member %(value)s: %(ex)s' msg = _('Failed in getting lb pool_member %(value)s: %(ex)s'
) % {'value': member_identity, 'ex': six.text_type(ex)} ) % {'value': name_or_id, 'ex': six.text_type(ex)}
raise exception.Error(msg=msg) raise exception.Error(msg=msg)
return member return member
@ -238,9 +241,10 @@ class NeutronClient(base.DriverBase):
return res return res
def pool_member_delete(self, pool_id, member_id): def pool_member_delete(self, pool_id, member_id, ignore_missing=True):
try: try:
self.conn.network.delete_pool_member(member_id, pool_id) self.conn.network.delete_pool_member(
member_id, pool_id, ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
msg = _('Failed in deleting lb member %(id)s from pool %(pool)s: ' msg = _('Failed in deleting lb member %(id)s from pool %(pool)s: '
'%(ex)s') % {'id': member_id, 'pool': pool_id, '%(ex)s') % {'id': member_id, 'pool': pool_id,
@ -249,12 +253,12 @@ class NeutronClient(base.DriverBase):
return return
def healthmonitor_get(self, hm_identity): def healthmonitor_get(self, name_or_id):
try: try:
hm = self.conn.network.find_health_monitor(hm_identity) hm = self.conn.network.find_health_monitor(name_or_id)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
msg = _('Failed in getting lb healthmonitor %(value)s: %(ex)s' msg = _('Failed in getting lb healthmonitor %(value)s: %(ex)s'
) % {'value': hm_identity, 'ex': six.text_type(ex)} ) % {'value': name_or_id, 'ex': six.text_type(ex)}
raise exception.Error(msg=msg) raise exception.Error(msg=msg)
return hm return hm
@ -299,9 +303,10 @@ class NeutronClient(base.DriverBase):
return res return res
def healthmonitor_delete(self, hm_id): def healthmonitor_delete(self, hm_id, ignore_missing=True):
try: try:
self.conn.network.delete_health_monitor(hm_id) self.conn.network.delete_health_monitor(
hm_id, ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
msg = _('Failed in deleting lb healthmonitor %(id)s: %(ex)s' msg = _('Failed in deleting lb healthmonitor %(id)s: %(ex)s'
) % {'id': hm_id, 'ex': six.text_type(ex)} ) % {'id': hm_id, 'ex': six.text_type(ex)}

27
senlin/drivers/openstack/nova_v2.py
View File

@ -62,9 +62,10 @@ class NovaClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def flavor_delete(self, flavor_id): def flavor_delete(self, flavor_id, ignore_missing=True):
try: try:
self.conn.compute.delete_flavor(flavor_id, ignore_missing=True) self.conn.compute.delete_flavor(flavor_id,
ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
@ -89,10 +90,10 @@ class NovaClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def image_delete(self, image_id): def image_delete(self, image_id, ignore_missing=True):
try: try:
return self.conn.compute.delete_image(image_id, return self.conn.compute.delete_image(
ignore_missing=True) image_id, ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
@ -126,9 +127,10 @@ class NovaClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def keypair_delete(self, keypair_id): def keypair_delete(self, keypair_id, ignore_missing=True):
try: try:
self.conn.compute.delete_keypair(keypair_id, ignore_missing=True) self.conn.compute.delete_keypair(keypair_id,
ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
@ -170,11 +172,12 @@ class NovaClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def server_delete(self, server_id): def server_delete(self, server_id, ignore_missing=True):
timeout = cfg.CONF.default_action_timeout timeout = cfg.CONF.default_action_timeout
try: try:
self.conn.compute.delete_server(server_id, ignore_missing=True) self.conn.compute.delete_server(server_id,
ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
@ -216,10 +219,10 @@ class NovaClient(base.DriverBase):
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex
def server_interface_delete(self, interface_id): def server_interface_delete(self, interface_id, ignore_missing=True):
try: try:
self.conn.compute.delete_server_interface(interface_id, self.conn.compute.delete_server_interface(
ignore_missing=True) interface_id, ignore_missing=ignore_missing)
except sdk.exc.HttpException as ex: except sdk.exc.HttpException as ex:
raise ex raise ex