Skip to content

Feature/gabhijit izel 15 poc connectivity #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 15, 2016
Merged

Feature/gabhijit izel 15 poc connectivity #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b916fe0
#15 A bunch of updates from the review
gabhijit-izel Nov 6, 2016
0773cb0
Merge branch 'develop' into feature/gabhijit-izel_15_poc_connectivity
gabhijit-izel Nov 9, 2016
d5ed4bc
#15 Remove Connectivity basic operation works
gabhijit-izel Nov 10, 2016
fc8275c
Merge branch 'develop' into feature/gabhijit-izel_15_poc_connectivity
alexazarh Nov 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion QualiConf.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Path=drivers

[OpenStack_Python]
Name=cloudshell-cp-openstack
Path=package
Path=package
247 changes: 192 additions & 55 deletions package/cloudshell/cp/openstack/command/operations/connectivity_operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,41 +72,35 @@ def apply_connectivity(self, openstack_session, cp_resource_model, conn_request,
# Add more description
# TODO : implement remove actions dict
for action in actions:
# FIXME: Move this "ifs into a separate function
if action.type == 'setVlan':
curr_dict = set_vlan_actions_dict
# FIXME: Check whether this is 'removeVlan'
else:
curr_dict = remove_vlan_actions_dict

action_vlanid = action.connectionParams.vlanId
actionid = action.actionId
curr_dict = self._get_curr_actions_dict(action_type=action.type,
set_vlan_action_dict=set_vlan_actions_dict,
remove_vlan_action_dict=remove_vlan_actions_dict)
if curr_dict is None:
raise ValueError("Unknown action: Action not one of 'setVlan' or 'removeVlan'.")

actionid = action.actionId
deployed_app_res_name = action.actionTarget.fullName
action_resource_info = self._get_action_resource_info(deployed_app_res_name, actionid, action)

for cust_attr in action.customActionAttributes :
if cust_attr.attributeName == 'VM_UUID':
vm_uuid = cust_attr.attributeValue
# FIXME : changed this to object for later readability
resource_info = (deployed_app_res_name, vm_uuid, actionid)
action_vlanid = action.connectionParams.vlanId
if action_vlanid in curr_dict.keys():
curr_dict[action_vlanid].append(resource_info)
curr_dict[action_vlanid].append(action_resource_info)
else:
curr_dict[action_vlanid] = [resource_info]
curr_dict[action_vlanid] = [action_resource_info]

results = []
if set_vlan_actions_dict:
result = self._do_set_vlan_actions(openstack_session=openstack_session,
cp_resource_model=cp_resource_model,
vlan_actions=set_vlan_actions_dict,
logger=logger)

results += result

if remove_vlan_actions_dict:
result = self._do_remove_vlan_actions(openstack_session=openstack_session,
cp_resource_model=cp_resource_model,
vlan_actions=set_vlan_actions_dict,
vlan_actions=remove_vlan_actions_dict,
logger=logger)
results += result

Expand All @@ -132,21 +126,20 @@ def _do_set_vlan_actions(self, openstack_session, cp_resource_model, vlan_action
results = []

for k, values in vlan_actions.iteritems():
# FIXME: results getting overwritten
# FIXME: update the nethod name
net = self.network_service.create_network_with_vlanid(openstack_session=openstack_session,
net = self.network_service.create_or_get_network_with_vlanid(openstack_session=openstack_session,
vlanid=int(k),
logger=logger)
if not net:
# FIXME : create error for the action
results = self._set_fail_results(values=values,
action_type='setVlan',
failure_text="Failed to Create Network with VLAN ID {0}".format(k))
fail_results = self._set_fail_results(values=values,
action_type='setVlan',
failure_text="Failed to Create Network with VLAN ID {0}".format(k))
results += fail_results
else:
net_id = net['id']

subnet = net['subnets']
if not subnet:
# FIXME: serialize this
# FIXME: Rename this function to create_and_attach
subnet = self.network_service.attach_subnet_to_net(openstack_session=openstack_session,
cp_resource_model=cp_resource_model,
Expand All @@ -155,37 +148,19 @@ def _do_set_vlan_actions(self, openstack_session, cp_resource_model, vlan_action
else:
subnet = subnet[0]
if not subnet:
# FIXME: create error for action
results = self._set_fail_results(values=values,
action_type='setVlan',
failure_text="Failed to attach Subnet to Network {0}".format(net_id))
fail_results = self._set_fail_results(values=values,
action_type='setVlan',
failure_text="Failed to attach Subnet to Network {0}".format(net_id))
results += fail_results
else:
attach_results = []
# FIXME: let's move this
for val in values:

instance_id = val[1]
# returns MAC Address of the attached port - which is reflected in updated Port
result = self.instance_service.attach_nic_to_net(openstack_session, instance_id, net_id, logger)
if not result:
action_result = ConnectivityActionResultModel()
action_result.success = False
action_result.actionId = val[2]
action_result.errorMessage = \
"Failed to Attach NIC on Network {0} to Instance {1}".format(net_id, val[0])
action_result.infoMessage = None
action_result.updatedInterface = None
else:
action_result = ConnectivityActionResultModel()
action_result.success = "True"
action_result.actionId = val[2]
action_result.errorMessage = ""
action_result.infoMessage = \
"Successfully Attached NIC on Network {0} to Instance {1}".format(net_id, val[0])
action_result.updatedInterface = result
action_result.type = 'setVlan'
action_result = self._attach_nic_to_instance_action_result(openstack_session=openstack_session,
action_resource_info=val,
net_id=net_id,
logger=logger)
attach_results.append(action_result)
results = attach_results
results += attach_results
return results

def _do_remove_vlan_actions(self, openstack_session, cp_resource_model, vlan_actions, logger):
Expand All @@ -197,15 +172,42 @@ def _do_remove_vlan_actions(self, openstack_session, cp_resource_model, vlan_act
:param LoggingSessionContext logger:
:return:
"""
logger.info("_do_remove_vlan_actions called.")
return []

results = []

for k, values in vlan_actions.iteritems():
net = self.network_service.get_network_with_vlanid(openstack_session=openstack_session,
vlanid=int(k), logger=logger)
if not net:
fail_results = self._set_fail_results(values=values,
action_type='removeVlan',
failure_text="Failed to get Network with VLAN ID {0}".format(k))
results += fail_results
else:
net_id = net['id']

remove_results = []
for val in values:
action_result = self._detach_nic_from_instance_action_result(openstack_session=openstack_session,
action_resource_info=val,
net_id=net_id,
logger=logger)
remove_results.append(action_result)

results += remove_results

# We should just remove subnet(s) and net from Openstack now (If any exception that gets logged)
self.network_service.remove_subnet_and_net(openstack_session=openstack_session,
network=net, logger=logger)

return results

def _set_fail_results(self, values, failure_text, action_type, logger=None):
"""
For all connections (obtained from values), set the failed results text, useful in generating output
:param tuple values:
:param str failure_text:
:param str action_type
:param str action_type:
:param logger:
:return ConnectivityActionResultModel List:
"""
Expand All @@ -219,4 +221,139 @@ def _set_fail_results(self, values, failure_text, action_type, logger=None):
action_result.type = action_type
action_result.updatedInterface = None
results.append(action_result)
return results
return results

def _get_curr_actions_dict(self, action_type, set_vlan_action_dict=None, remove_vlan_action_dict=None):
"""

:param str action_type:
:param dict set_vlan_action_dict:
:param dict remove_vlan_action_dict:
:return:
"""
if action_type == 'setVlan' and set_vlan_action_dict is not None:
return set_vlan_action_dict

elif action_type == 'removeVlan' and remove_vlan_action_dict is not None:
return remove_vlan_action_dict

return None

def _get_action_resource_info(self, deployed_app_resource_name, actionid, action):
"""

:param str deployed_app_resource_name:
:param str actionid:
:param action: action obtained from JSON
:return ActionResourceInfo:

"""

custom_action_attributes = action.customActionAttributes
vm_uuid = None

for cust_attr in custom_action_attributes:
if cust_attr.attributeName == 'VM_UUID':
vm_uuid = cust_attr.attributeValue

connector_attributes = action.connectorAttributes

# in removeVlan
iface_ip = None
iface_port_id = None
iface_mac = None
if connector_attributes:
for conn_attribute in connector_attributes:
if conn_attribute.attributeName == 'Interface':
iface_ip, iface_port_id, iface_mac = conn_attribute.attributeValue.split("/")

return ActionResourceInfo(deployed_app_resource_name=deployed_app_resource_name,
actionid=actionid,
vm_uuid=vm_uuid,
interface_ip=iface_ip,
interface_port_id=iface_port_id,
interface_mac=iface_mac)

def _attach_nic_to_instance_action_result(self, openstack_session, action_resource_info, net_id, logger):
"""

:param keystoneauth1.session.Session openstack_session:
:param ActionResourceInfo action_resource_info:
:param str net_id:
:param LoggingSessionContext logger:
:return ConnectivityActionResultModel:
"""
action_result = ConnectivityActionResultModel()

instance_id = action_resource_info.vm_uuid
result = self.instance_service.attach_nic_to_net(openstack_session, instance_id, net_id, logger)
if not result:
action_result.success = "False"
action_result.actionId = action_resource_info.actionid
action_result.errorMessage = "Failed to Attach NIC on Network {0} to Instance {1}".format(
net_id,
action_resource_info.deployed_app_resource_name)
action_result.infoMessage = ""
action_result.updatedInterface = ""
action_result.type = 'setVlan'
else:
action_result.success = "True"
action_result.actionId = action_resource_info.actionid
action_result.errorMessage = ""
action_result.infoMessage = "Successfully Attached NIC on Network {0} to Instance {1}".format(
net_id,
action_resource_info.deployed_app_resource_name)
action_result.updatedInterface = result
action_result.type = 'setVlan'

return action_result


def _detach_nic_from_instance_action_result(self, openstack_session, action_resource_info, net_id, logger):
"""

:param keystoneauth1.session.Session openstack_session:
:param ActionResourceInfo action_resource_info:
:param str net_id:
:param LoggingSessionContext logger:
:return ConnectivityActionResultModel:
"""
action_result = ConnectivityActionResultModel()

port_id = action_resource_info.interface_port_id
vm_uuid = action_resource_info.vm_uuid

result = self.instance_service.detach_nic_from_instance(openstack_session=openstack_session,
instance_id=vm_uuid, port_id=port_id, logger=logger)
if not result:
action_result.success = "False"
action_result.actionId = action_resource_info.actionid
action_result.errorMessage = "Failed to Detach NIC {0} from Instance {1}".format(
port_id,
action_resource_info.deployed_app_resource_name)
action_result.infoMessage = ""
action_result.updatedInterface = ""
action_result.type = 'removeVlan'
else:
action_result.success = "True"
action_result.actionId = action_resource_info.actionid
action_result.errorMessage = ""
action_result.infoMessage = "Successfully detached NIC {0} from Instance {1}".format(
port_id,
action_resource_info.deployed_app_resource_name)
action_result.updatedInterface = result
action_result.type = 'removeVlan'

return action_result


# FIXME : Move this out to a different place
class ActionResourceInfo:

def __init__(self, deployed_app_resource_name, actionid, vm_uuid, interface_ip, interface_port_id, interface_mac):
self.deployed_app_resource_name = deployed_app_resource_name
self.vm_uuid = vm_uuid
self.actionid = actionid
self.iface_ip = interface_ip
self.interface_port_id = interface_port_id
self.interface_mac = interface_mac
Loading