-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
if action == rwdts.QueryAction.READ:
schema = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur.schema()
path_entry = schema.keyspec_to_entry(ks_path)
- self._log.debug("VDU Opdata path is {}".format(path_entry))
try:
console_url = yield from self._loop.run_in_executor(
vdur_console = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur()
vdur_console.id = self._vdur_id
vdur_console.console_url = 'none'
-
+
xact_info.respond_xpath(rsp_code=rwdts.XactRspCode.ACK,
xpath=self.vnfr_vdu_console_xpath,
msg=vdur_console)
#raise VnfRecordError("Not supported operation %s" % action)
self._log.error("Not supported operation %s" % action)
xact_info.respond_xpath(rsp_code=rwdts.XactRspCode.ACK)
- return
+ return
self._log.debug("Registering for VNFR VDU using xpath: %s",
self.vnfr_vdu_console_xpath)
class OpenmanoNsr(object):
- TIMEOUT_SECS = 120
+ TIMEOUT_SECS = 300
- def __init__(self, dts, log, loop, publisher, cli_api, http_api, nsd_msg, nsr_config_msg):
+ def __init__(self, dts, log, loop, publisher, cli_api, http_api, nsd_msg, nsr_config_msg,key_pairs):
self._dts = dts
self._log = log
self._loop = loop
self._nsd_msg = nsd_msg
self._nsr_config_msg = nsr_config_msg
+ self._vlrs = []
self._vnfrs = []
self._vdur_console_handler = {}
+ self._key_pairs = key_pairs
self._nsd_uuid = None
self._nsr_uuid = None
+ self._nsr_msg = None
+
self._created = False
self._monitor_task = None
def vnfds(self):
return {v.rift_vnfd_id: v.vnfd for v in self._vnfrs}
+ @property
+ def vnfr_ids(self):
+ return {v.rift_vnfd_id: v.openmano_vnfd_id for v in self._vnfrs}
+
@property
def vnfrs(self):
return self._vnfrs
@property
def openmano_nsd_yaml(self):
self._log.debug("Converting nsd %s from rift to openmano", self.nsd.id)
- openmano_nsd = rift2openmano.rift2openmano_nsd(self.nsd, self.vnfds)
+ openmano_nsd = rift2openmano.rift2openmano_nsd(self.nsd, self.vnfds,self.vnfr_ids)
return yaml.safe_dump(openmano_nsd, default_flow_style=False)
+ def get_ssh_key_pairs(self):
+ cloud_config = {}
+ key_pairs = list()
+ for authorized_key in self._nsr_config_msg.ssh_authorized_key:
+ self._log.debug("Key pair ref present is %s",authorized_key.key_pair_ref)
+ if authorized_key.key_pair_ref in self._key_pairs:
+ key_pairs.append(self._key_pairs[authorized_key.key_pair_ref].key)
+
+ for authorized_key in self._nsd_msg.key_pair:
+ self._log.debug("Key pair NSD is %s",authorized_key)
+ key_pairs.append(authorized_key.key)
+
+ if key_pairs:
+ cloud_config["key-pairs"] = key_pairs
+
+ users = list()
+ for user_entry in self._nsr_config_msg.user:
+ self._log.debug("User present is %s",user_entry)
+ user = {}
+ user["name"] = user_entry.name
+ user["key-pairs"] = list()
+ for ssh_key in user_entry.key_pair:
+ user["key-pairs"].append(ssh_key.key)
+ users.append(user)
+
+ for user_entry in self._nsd_msg.user:
+ self._log.debug("User present in NSD is %s",user_entry)
+ user = {}
+ user["name"] = user_entry.name
+ user["key-pairs"] = list()
+ for ssh_key in user_entry.key_pair:
+ user["key-pairs"].append(ssh_key.key)
+ users.append(user)
+
+ if users:
+ cloud_config["users"] = users
+
+ self._log.debug("Cloud config formed is %s",cloud_config)
+ return cloud_config
+
@property
def openmano_instance_create_yaml(self):
openmano_instance_create["name"] = self._nsr_config_msg.name
openmano_instance_create["description"] = self._nsr_config_msg.description
openmano_instance_create["scenario"] = self._nsd_uuid
+
+ cloud_config = self.get_ssh_key_pairs()
+ if cloud_config:
+ openmano_instance_create["cloud-config"] = cloud_config
if self._nsr_config_msg.has_field("om_datacenter"):
openmano_instance_create["datacenter"] = self._nsr_config_msg.om_datacenter
+ openmano_instance_create["vnfs"] = {}
+ for vnfr in self._vnfrs:
+ if "om_datacenter" in vnfr.vnfr.vnfr_msg:
+ vnfr_name = vnfr.vnfr.vnfd.name + "__" + str(vnfr.vnfr.vnfr_msg.member_vnf_index_ref)
+ openmano_instance_create["vnfs"][vnfr_name] = {"datacenter": vnfr.vnfr.vnfr_msg.om_datacenter}
openmano_instance_create["networks"] = {}
for vld_msg in self._nsd_msg.vld:
- if vld_msg.vim_network_name:
- network = {}
- network["name"] = vld_msg.name
- network["netmap-use"] = vld_msg.vim_network_name
- #network["datacenter"] = vld_msg.om_datacenter
- openmano_instance_create["networks"][vld_msg.name] = network
-
- return yaml.safe_dump(openmano_instance_create, default_flow_style=False)
+ openmano_instance_create["networks"][vld_msg.name] = {}
+ openmano_instance_create["networks"][vld_msg.name]["sites"] = list()
+ for vlr in self._vlrs:
+ if vlr.vld_msg.name == vld_msg.name:
+ self._log.debug("Received VLR name %s, VLR DC: %s for VLD: %s",vlr.vld_msg.name,
+ vlr.om_datacenter_name,vld_msg.name)
+ #network["vim-network-name"] = vld_msg.name
+ network = {}
+ ip_profile = {}
+ if vld_msg.vim_network_name:
+ network["netmap-use"] = vld_msg.vim_network_name
+ elif vlr._ip_profile and vlr._ip_profile.has_field("ip_profile_params"):
+ ip_profile_params = vlr._ip_profile.ip_profile_params
+ if ip_profile_params.ip_version == "ipv6":
+ ip_profile['ip-version'] = "IPv6"
+ else:
+ ip_profile['ip-version'] = "IPv4"
+ if ip_profile_params.has_field('subnet_address'):
+ ip_profile['subnet-address'] = ip_profile_params.subnet_address
+ if ip_profile_params.has_field('gateway_address'):
+ ip_profile['gateway-address'] = ip_profile_params.gateway_address
+ if ip_profile_params.has_field('dns_server') and len(ip_profile_params.dns_server) > 0:
+ ip_profile['dns-address'] = ip_profile_params.dns_server[0].address
+ if ip_profile_params.has_field('dhcp_params'):
+ ip_profile['dhcp'] = {}
+ ip_profile['dhcp']['enabled'] = ip_profile_params.dhcp_params.enabled
+ ip_profile['dhcp']['start-address'] = ip_profile_params.dhcp_params.start_address
+ ip_profile['dhcp']['count'] = ip_profile_params.dhcp_params.count
+ else:
+ network["netmap-create"] = vlr.name
+ if vlr.om_datacenter_name:
+ network["datacenter"] = vlr.om_datacenter_name
+ elif vld_msg.has_field("om_datacenter"):
+ network["datacenter"] = vld_msg.om_datacenter
+ elif "datacenter" in openmano_instance_create:
+ network["datacenter"] = openmano_instance_create["datacenter"]
+ if network:
+ openmano_instance_create["networks"][vld_msg.name]["sites"].append(network)
+ if ip_profile:
+ openmano_instance_create["networks"][vld_msg.name]['ip-profile'] = ip_profile
+
+ return yaml.safe_dump(openmano_instance_create, default_flow_style=False,width=1000)
+ @asyncio.coroutine
+ def add_vlr(self, vlr):
+ self._vlrs.append(vlr)
+ yield from asyncio.sleep(1, loop=self._loop)
@asyncio.coroutine
def add_vnfr(self, vnfr):
for vnfr in self._vnfrs:
yield from vnfr.delete()
+
@asyncio.coroutine
def create(self):
self._log.debug("Creating openmano scenario")
for vm in vnf_status["vms"]:
if vm["uuid"] not in self._vdur_console_handler:
- vdur_console_handler = VnfrConsoleOperdataDtsHandler(self._dts, self._log, self._loop,
+ vdur_console_handler = VnfrConsoleOperdataDtsHandler(self._dts, self._log, self._loop,
self, vnfr_msg.id,vm["uuid"],vm["name"])
yield from vdur_console_handler.register()
self._vdur_console_handler[vm["uuid"]] = vdur_console_handler
-
+
vdur_msg = vnfr_msg.vdur.add()
vdur_msg.vim_id = vm["vim_vm_id"]
vdur_msg.id = vm["uuid"]
return
@asyncio.coroutine
- def deploy(self):
+ def deploy(self,nsr_msg):
if self._nsd_uuid is None:
raise ValueError("Cannot deploy an uncreated nsd")
self._log.debug("Found existing instance with nsr name: %s", self._nsr_config_msg.name)
self._nsr_uuid = name_uuid_map[self._nsr_config_msg.name]
else:
- self._nsr_uuid = yield from self._loop.run_in_executor(
- None,
- self._cli_api.ns_instance_scenario_create,
- self.openmano_instance_create_yaml)
-
+ self._nsr_msg = nsr_msg
fpath = dump_openmano_descriptor(
"{}_instance_sce_create".format(self._nsr_config_msg.name),
self.openmano_instance_create_yaml,
)
-
self._log.debug("Dumped Openmano NS Scenario Cretae to: %s", fpath)
+ self._nsr_uuid = yield from self._loop.run_in_executor(
+ None,
+ self._cli_api.ns_instance_scenario_create,
+ self.openmano_instance_create_yaml)
+
self._monitor_task = asyncio.ensure_future(
self.instance_monitor_task(), loop=self._loop
for _,handler in self._vdur_console_handler.items():
handler._regh.deregister()
-
+
if self._nsr_uuid is None:
self._log.warning("Cannot terminate an un-instantiated nsr")
return
ro_account.openmano.tenant_id,
)
- def create_nsr(self, nsr_config_msg, nsd_msg):
+ def create_nsr(self, nsr_config_msg, nsd_msg, key_pairs=None):
"""
Create Network service record
"""
self._cli_api,
self._http_api,
nsd_msg,
- nsr_config_msg
+ nsr_config_msg,
+ key_pairs
)
self._openmano_nsrs[nsr_config_msg.id] = openmano_nsr
@asyncio.coroutine
def deploy(self, nsr_msg):
+ self._log.debug("Received NSR Deploy msg : %s", nsr_msg)
openmano_nsr = self._openmano_nsrs[nsr_msg.ns_instance_config_ref]
yield from openmano_nsr.create()
- yield from openmano_nsr.deploy()
+ yield from openmano_nsr.deploy(nsr_msg)
@asyncio.coroutine
def instantiate_ns(self, nsr, xact):
"""
Instantiate NSR with the passed nsr id
"""
- pass
+ self._log.debug("Received instantiate VL for NSR {}; VLR {}".format(nsr.id,vlr))
+ openmano_nsr = self._openmano_nsrs[nsr.id]
+ yield from openmano_nsr.add_vlr(vlr)
@asyncio.coroutine
def terminate_ns(self, nsr):
projects / osm / SO.git / blobdiff