-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
import time
import uuid
import yaml
+import requests
+import json
from collections import deque
if self._vnffgr_state == VnffgRecordState.INIT:
vnffgr_dict = {"id": self._vnffgr_id,
- "nsd_id": self._nsr.nsd_id,
"vnffgd_id_ref": self._vnffgd_msg.id,
"vnffgd_name_ref": self._vnffgd_msg.name,
"sdn_account": self._sdn_account_name,
vnffgr = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_Vnffgr.from_dict(vnffgr_dict)
elif self._vnffgr_state == VnffgRecordState.TERMINATED:
vnffgr_dict = {"id": self._vnffgr_id,
- "nsd_id": self._nsr.nsd_id,
"vnffgd_id_ref": self._vnffgd_msg.id,
"vnffgd_name_ref": self._vnffgd_msg.name,
"sdn_account": self._sdn_account_name,
self._log.exception("Fetching VNFFGR for VNFFG with id %s failed", self._vnffgr_id)
self._vnffgr_state = VnffgRecordState.FAILED
vnffgr_dict = {"id": self._vnffgr_id,
- "nsd_id": self._nsr.nsd_id,
"vnffgd_id_ref": self._vnffgd_msg.id,
"vnffgd_name_ref": self._vnffgd_msg.name,
"sdn_account": self._sdn_account_name,
def vnffgr_create_msg(self):
""" Virtual Link Record message for Creating VLR in VNS """
vnffgr_dict = {"id": self._vnffgr_id,
- "nsd_id": self._nsr.nsd_id,
"vnffgd_id_ref": self._vnffgd_msg.id,
"vnffgd_name_ref": self._vnffgd_msg.name,
"sdn_account": self._sdn_account_name,
- }
+ }
vnffgr = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_Vnffgr.from_dict(vnffgr_dict)
for rsp in self._vnffgd_msg.rsp:
vnffgr_rsp = vnffgr.rsp.add()
vnfr_cp_ref.vnfd_id_ref =rsp_cp_ref.vnfd_id_ref
vnfr_cp_ref.service_function_type = vnfd[0].service_function_type
for nsr_vnfr in self._nsr.vnfrs.values():
- if (nsr_vnfr.vnfd.id == vnfr_cp_ref.vnfd_id_ref and
- nsr_vnfr.member_vnf_index == vnfr_cp_ref.member_vnf_index_ref):
- vnfr_cp_ref.vnfr_id_ref = nsr_vnfr.id
- vnfr_cp_ref.vnfr_name_ref = nsr_vnfr.name
- vnfr_cp_ref.vnfr_connection_point_ref = rsp_cp_ref.vnfd_connection_point_ref
-
- vnfr = yield from self._nsr.fetch_vnfr(nsr_vnfr.xpath)
- self._log.debug(" Received VNFR is %s", vnfr)
- while vnfr.operational_status != 'running':
- self._log.info("Received vnf op status is %s; retrying",vnfr.operational_status)
- if vnfr.operational_status == 'failed':
- self._log.error("Fetching VNFR for %s failed", vnfr.id)
- raise NsrInstantiationFailed("Failed NS %s instantiation due to VNFR %s failure" % (self.id, vnfr.id))
- yield from asyncio.sleep(2, loop=self._loop)
- vnfr = yield from self._nsr.fetch_vnfr(nsr_vnfr.xpath)
- self._log.debug("Received VNFR is %s", vnfr)
-
- vnfr_cp_ref.connection_point_params.mgmt_address = vnfr.mgmt_interface.ip_address
- for cp in vnfr.connection_point:
- if cp.name == vnfr_cp_ref.vnfr_connection_point_ref:
- vnfr_cp_ref.connection_point_params.port_id = cp.connection_point_id
- vnfr_cp_ref.connection_point_params.name = self._nsr.name + '.' + cp.name
- for vdu in vnfr.vdur:
- for ext_intf in vdu.external_interface:
- if ext_intf.name == vnfr_cp_ref.vnfr_connection_point_ref:
- vnfr_cp_ref.connection_point_params.vm_id = vdu.vim_id
- self._log.debug("VIM ID for CP %s in VNFR %s is %s",cp.name,nsr_vnfr.id,
+ if (nsr_vnfr.vnfd.id == vnfr_cp_ref.vnfd_id_ref and
+ nsr_vnfr.member_vnf_index == vnfr_cp_ref.member_vnf_index_ref):
+ vnfr_cp_ref.vnfr_id_ref = nsr_vnfr.id
+ vnfr_cp_ref.vnfr_name_ref = nsr_vnfr.name
+ vnfr_cp_ref.vnfr_connection_point_ref = rsp_cp_ref.vnfd_connection_point_ref
+
+ vnfr = yield from self._nsr.fetch_vnfr(nsr_vnfr.xpath)
+ self._log.debug(" Received VNFR is %s", vnfr)
+ while vnfr.operational_status != 'running':
+ self._log.info("Received vnf op status is %s; retrying",vnfr.operational_status)
+ if vnfr.operational_status == 'failed':
+ self._log.error("Fetching VNFR for %s failed", vnfr.id)
+ raise NsrInstantiationFailed("Failed NS %s instantiation due to VNFR %s failure" % (self.id, vnfr.id))
+ yield from asyncio.sleep(2, loop=self._loop)
+ vnfr = yield from self._nsr.fetch_vnfr(nsr_vnfr.xpath)
+ self._log.debug("Received VNFR is %s", vnfr)
+
+ vnfr_cp_ref.connection_point_params.mgmt_address = vnfr.mgmt_interface.ip_address
+ for cp in vnfr.connection_point:
+ if cp.name == vnfr_cp_ref.vnfr_connection_point_ref:
+ vnfr_cp_ref.connection_point_params.port_id = cp.connection_point_id
+ vnfr_cp_ref.connection_point_params.name = self._nsr.name + '.' + cp.name
+ for vdu in vnfr.vdur:
+ for ext_intf in vdu.external_interface:
+ if ext_intf.name == vnfr_cp_ref.vnfr_connection_point_ref:
+ vnfr_cp_ref.connection_point_params.vm_id = vdu.vim_id
+ self._log.debug("VIM ID for CP %s in VNFR %s is %s",cp.name,nsr_vnfr.id,
vnfr_cp_ref.connection_point_params.vm_id)
- break
+ break
- vnfr_cp_ref.connection_point_params.address = cp.ip_address
- vnfr_cp_ref.connection_point_params.port = VnffgRecord.SFF_DP_PORT
+ vnfr_cp_ref.connection_point_params.address = cp.ip_address
+ vnfr_cp_ref.connection_point_params.port = VnffgRecord.SFF_DP_PORT
for vnffgd_classifier in self._vnffgd_msg.classifier:
_rsp = [rsp for rsp in vnffgr.rsp if rsp.vnffgd_rsp_id_ref == vnffgd_classifier.rsp_id_ref]
vnffgr_classifier.rsp_id_ref = rsp_id_ref
vnffgr_classifier.rsp_name = rsp_name
for nsr_vnfr in self._nsr.vnfrs.values():
- if (nsr_vnfr.vnfd.id == vnffgd_classifier.vnfd_id_ref and
- nsr_vnfr.member_vnf_index == vnffgd_classifier.member_vnf_index_ref):
- vnffgr_classifier.vnfr_id_ref = nsr_vnfr.id
- vnffgr_classifier.vnfr_name_ref = nsr_vnfr.name
- vnffgr_classifier.vnfr_connection_point_ref = vnffgd_classifier.vnfd_connection_point_ref
-
- if nsr_vnfr.vnfd.service_function_chain == 'CLASSIFIER':
- vnffgr_classifier.sff_name = nsr_vnfr.name
-
- vnfr = yield from self._nsr.fetch_vnfr(nsr_vnfr.xpath)
- self._log.debug(" Received VNFR is %s", vnfr)
- while vnfr.operational_status != 'running':
- self._log.info("Received vnf op status is %s; retrying",vnfr.operational_status)
- if vnfr.operational_status == 'failed':
- self._log.error("Fetching VNFR for %s failed", vnfr.id)
- raise NsrInstantiationFailed("Failed NS %s instantiation due to VNFR %s failure" % (self.id, vnfr.id))
- yield from asyncio.sleep(2, loop=self._loop)
- vnfr = yield from self._nsr.fetch_vnfr(nsr_vnfr.xpath)
- self._log.debug("Received VNFR is %s", vnfr)
-
- for cp in vnfr.connection_point:
- if cp.name == vnffgr_classifier.vnfr_connection_point_ref:
- vnffgr_classifier.port_id = cp.connection_point_id
- vnffgr_classifier.ip_address = cp.ip_address
- for vdu in vnfr.vdur:
- for ext_intf in vdu.external_interface:
- if ext_intf.name == vnffgr_classifier.vnfr_connection_point_ref:
- vnffgr_classifier.vm_id = vdu.vim_id
- self._log.debug("VIM ID for CP %s in VNFR %s is %s",cp.name,nsr_vnfr.id,
- vnfr_cp_ref.connection_point_params.vm_id)
- break
+ if (nsr_vnfr.vnfd.id == vnffgd_classifier.vnfd_id_ref and
+ nsr_vnfr.member_vnf_index == vnffgd_classifier.member_vnf_index_ref):
+ vnffgr_classifier.vnfr_id_ref = nsr_vnfr.id
+ vnffgr_classifier.vnfr_name_ref = nsr_vnfr.name
+ vnffgr_classifier.vnfr_connection_point_ref = vnffgd_classifier.vnfd_connection_point_ref
+
+ if nsr_vnfr.vnfd.service_function_chain == 'CLASSIFIER':
+ vnffgr_classifier.sff_name = nsr_vnfr.name
+
+ vnfr = yield from self._nsr.fetch_vnfr(nsr_vnfr.xpath)
+ self._log.debug(" Received VNFR is %s", vnfr)
+ while vnfr.operational_status != 'running':
+ self._log.info("Received vnf op status is %s; retrying",vnfr.operational_status)
+ if vnfr.operational_status == 'failed':
+ self._log.error("Fetching VNFR for %s failed", vnfr.id)
+ raise NsrInstantiationFailed("Failed NS %s instantiation due to VNFR %s failure" % (self.id, vnfr.id))
+ yield from asyncio.sleep(2, loop=self._loop)
+ vnfr = yield from self._nsr.fetch_vnfr(nsr_vnfr.xpath)
+ self._log.debug("Received VNFR is %s", vnfr)
+
+ for cp in vnfr.connection_point:
+ if cp.name == vnffgr_classifier.vnfr_connection_point_ref:
+ vnffgr_classifier.port_id = cp.connection_point_id
+ vnffgr_classifier.ip_address = cp.ip_address
+ for vdu in vnfr.vdur:
+ for ext_intf in vdu.external_interface:
+ if ext_intf.name == vnffgr_classifier.vnfr_connection_point_ref:
+ vnffgr_classifier.vm_id = vdu.vim_id
+ self._log.debug("VIM ID for CP %s in VNFR %s is %s",cp.name,nsr_vnfr.id,
+ vnfr_cp_ref.connection_point_params.vm_id)
+ break
self._log.info("VNFFGR msg to be sent is %s", vnffgr)
return vnffgr
while vnfr.operational_status != 'running':
self._log.info("Received vnf op status is %s; retrying",vnfr.operational_status)
if vnfr.operational_status == 'failed':
- self._log.error("Fetching VNFR for %s failed", vnfr.id)
- raise NsrInstantiationFailed("Failed NS %s instantiation due to VNFR %s failure" % (self.id, vnfr.id))
+ self._log.error("Fetching VNFR for %s failed", vnfr.id)
+ raise NsrInstantiationFailed("Failed NS %s instantiation due to VNFR %s failure" % (self.id, vnfr.id))
yield from asyncio.sleep(2, loop=self._loop)
vnfr = yield from self._nsr.fetch_vnfr(nsr_vnfr.xpath)
self._log.debug("Received VNFR is %s", vnfr)
def vnffgr_in_vnffgrm(self):
""" Is there a VNFR record in VNFM """
if (self._vnffgr_state == VnffgRecordState.ACTIVE or
- self._vnffgr_state == VnffgRecordState.INSTANTIATION_PENDING or
- self._vnffgr_state == VnffgRecordState.FAILED):
+ self._vnffgr_state == VnffgRecordState.INSTANTIATION_PENDING or
+ self._vnffgr_state == VnffgRecordState.FAILED):
return True
return False
class VirtualLinkRecord(object):
""" Virtual Link Records class"""
+ XPATH = "D,/vlr:vlr-catalog/vlr:vlr"
@staticmethod
@asyncio.coroutine
- def create_record(dts, log, loop, nsr_name, vld_msg, cloud_account_name, ip_profile, nsr_id, restart_mode=False):
+ def create_record(dts, log, loop, nsr_name, vld_msg, cloud_account_name, om_datacenter, ip_profile, nsr_id, restart_mode=False):
"""Creates a new VLR object based on the given data.
If restart mode is enabled, then we look for existing records in the
VirtualLinkRecord
"""
vlr_obj = VirtualLinkRecord(
- dts,
- log,
- loop,
- nsr_name,
- vld_msg,
- cloud_account_name,
- ip_profile,
- nsr_id,
- )
+ dts,
+ log,
+ loop,
+ nsr_name,
+ vld_msg,
+ cloud_account_name,
+ om_datacenter,
+ ip_profile,
+ nsr_id,
+ )
if restart_mode:
res_iter = yield from dts.query_read(
- "D,/vlr:vlr-catalog/vlr:vlr",
- rwdts.XactFlag.MERGE)
+ "D,/vlr:vlr-catalog/vlr:vlr",
+ rwdts.XactFlag.MERGE)
for fut in res_iter:
response = yield from fut
return vlr_obj
- def __init__(self, dts, log, loop, nsr_name, vld_msg, cloud_account_name, ip_profile, nsr_id):
+ def __init__(self, dts, log, loop, nsr_name, vld_msg, cloud_account_name, om_datacenter, ip_profile, nsr_id):
self._dts = dts
self._log = log
self._loop = loop
self._nsr_name = nsr_name
self._vld_msg = vld_msg
self._cloud_account_name = cloud_account_name
+ self._om_datacenter_name = om_datacenter
self._assigned_subnet = None
self._nsr_id = nsr_id
self._ip_profile = ip_profile
self._vlr_id = str(uuid.uuid4())
self._state = VlRecordState.INIT
self._prev_state = None
-
+ self._create_time = int(time.time())
+
@property
def xpath(self):
""" path for this object """
""" Cloud account that this VLR should be created in """
return self._cloud_account_name
+ @property
+ def om_datacenter_name(self):
+ """ Datacenter that this VLR should be created in """
+ return self._om_datacenter_name
+
@staticmethod
def vlr_xpath(vlr):
""" Get the VLR path from VLR """
"nsr_id_ref": self._nsr_id,
"vld_ref": self.vld_msg.id,
"name": self.name,
+ "create_time": self._create_time,
"cloud_account": self.cloud_account_name,
+ "om_datacenter": self.om_datacenter_name,
}
if self._ip_profile and self._ip_profile.has_field('ip_profile_params'):
nsr_vlr.vlr_ref = self._vlr_id
nsr_vlr.assigned_subnet = self.assigned_subnet
nsr_vlr.cloud_account = self.cloud_account_name
+ nsr_vlr.om_datacenter = self.om_datacenter_name
for conn in self.vld_msg.vnfd_connection_point_ref:
for vnfr in vnfrs:
if (vnfr.vnfd.id == conn.vnfd_id_ref and
- vnfr.member_vnf_index == conn.member_vnf_index_ref and
- self.cloud_account_name == vnfr.cloud_account_name):
+ vnfr.member_vnf_index == conn.member_vnf_index_ref and
+ self.cloud_account_name == vnfr.cloud_account_name and
+ self.om_datacenter_name == vnfr.om_datacenter_name):
cp_entry = nsr_vlr.vnfr_connection_point_ref.add()
cp_entry.vnfr_id = vnfr.id
cp_entry.connection_point = conn.vnfd_connection_point_ref
@asyncio.coroutine
def instantiate(self):
""" Instantiate this VL """
-
self._log.debug("Instaniating VLR key %s, vld %s",
self.xpath, self._vld_msg)
vlr = None
def vlr_in_vns(self):
""" Is there a VLR record in VNS """
if (self._state == VlRecordState.ACTIVE or
- self._state == VlRecordState.INSTANTIATION_PENDING or
- self._state == VlRecordState.TERMINATE_PENDING or
- self._state == VlRecordState.FAILED):
+ self._state == VlRecordState.INSTANTIATION_PENDING or
+ self._state == VlRecordState.TERMINATE_PENDING or
+ self._state == VlRecordState.FAILED):
return True
return False
@staticmethod
@asyncio.coroutine
def create_record(dts, log, loop, vnfd, const_vnfd_msg, nsd_id, nsr_name,
- cloud_account_name, nsr_id, group_name, group_instance_id,
- placement_groups, restart_mode=False):
+ cloud_account_name, om_datacenter_name, nsr_id, group_name, group_instance_id,
+ placement_groups, restart_mode=False):
"""Creates a new VNFR object based on the given data.
If restart mode is enabled, then we look for existing records in the
VirtualNetworkFunctionRecord
"""
vnfr_obj = VirtualNetworkFunctionRecord(
- dts,
- log,
- loop,
- vnfd,
- const_vnfd_msg,
- nsd_id,
- nsr_name,
- cloud_account_name,
- nsr_id,
- group_name,
- group_instance_id,
- placement_groups,
- restart_mode=restart_mode)
+ dts,
+ log,
+ loop,
+ vnfd,
+ const_vnfd_msg,
+ nsd_id,
+ nsr_name,
+ cloud_account_name,
+ om_datacenter_name,
+ nsr_id,
+ group_name,
+ group_instance_id,
+ placement_groups,
+ restart_mode=restart_mode)
if restart_mode:
res_iter = yield from dts.query_read(
- "D,/vnfr:vnfr-catalog/vnfr:vnfr",
- rwdts.XactFlag.MERGE)
+ "D,/vnfr:vnfr-catalog/vnfr:vnfr",
+ rwdts.XactFlag.MERGE)
for fut in res_iter:
response = yield from fut
nsd_id,
nsr_name,
cloud_account_name,
+ om_datacenter_name,
nsr_id,
group_name=None,
group_instance_id=None,
self._nsr_name = nsr_name
self._nsr_id = nsr_id
self._cloud_account_name = cloud_account_name
+ self._om_datacenter_name = om_datacenter_name
self._group_name = group_name
self._group_instance_id = group_instance_id
self._placement_groups = placement_groups
self._config_status = NsrYang.ConfigStates.INIT
+ self._create_time = int(time.time())
self._prev_state = VnfRecordState.INIT
self._state = VnfRecordState.INIT
@property
def const_vnfr_msg(self):
""" VNFR message """
- return RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_ConstituentVnfrRef(vnfr_id=self.id,cloud_account=self.cloud_account_name)
+ return RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_ConstituentVnfrRef(vnfr_id=self.id,cloud_account=self.cloud_account_name,om_datacenter=self._om_datacenter_name)
@property
def vnfd(self):
""" Cloud account that this VNF should be created in """
return self._cloud_account_name
+ @property
+ def om_datacenter_name(self):
+ """ Datacenter that this VNF should be created in """
+ return self._om_datacenter_name
+
@property
def active(self):
def configure(self):
self.config_store.merge_vnfd_config(
- self._nsd_id,
- self._vnfd,
- self.member_vnf_index,
- )
+ self._nsd_id,
+ self._vnfd,
+ self.member_vnf_index,
+ )
def create_vnfr_msg(self):
""" VNFR message for this VNFR """
vnfd_fields = [
- "short_name",
- "vendor",
- "description",
- "version",
- "type_yang",
- ]
+ "short_name",
+ "vendor",
+ "description",
+ "version",
+ "type_yang",
+ ]
vnfd_copy_dict = {k: v for k, v in self._vnfd.as_dict().items() if k in vnfd_fields}
vnfr_dict = {
- "id": self.id,
- "nsr_id_ref": self._nsr_id,
- "vnfd_ref": self.vnfd.id,
- "name": self.name,
- "cloud_account": self._cloud_account_name,
- "config_status": self.config_status
- }
+ "id": self.id,
+ "nsr_id_ref": self._nsr_id,
+ "name": self.name,
+ "cloud_account": self._cloud_account_name,
+ "om_datacenter": self._om_datacenter_name,
+ "config_status": self.config_status
+ }
vnfr_dict.update(vnfd_copy_dict)
vnfr = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr.from_dict(vnfr_dict)
+ vnfr.vnfd = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vnfd.from_dict(self.vnfd.as_dict(),
+ ignore_missing_keys=True)
vnfr.member_vnf_index_ref = self.member_vnf_index
vnfr.vnf_configuration.from_dict(self._vnfd.vnf_configuration.as_dict())
self._log.debug("Send an update to VNFM for VNFR {} with {}".
format(self.name, self.vnfr_msg))
yield from self._dts.query_update(
- self.xpath,
- rwdts.XactFlag.TRACE,
- self.vnfr_msg
- )
+ self.xpath,
+ rwdts.XactFlag.TRACE,
+ self.vnfr_msg
+ )
def get_config_status(self):
"""Return the config status as YANG ENUM"""
yield from self.update_vnfm()
except Exception as e:
self._log.error("Exception updating VNFM with new status {} of VNFR {}: {}".
- format(status, self.name, e))
+ format(status, self.name, e))
self._log.exception(e)
def is_configured(self):
for vlr in nsr.vlrs:
for vnfd_cp in vlr.vld_msg.vnfd_connection_point_ref:
if (vnfd_cp.vnfd_id_ref == self._vnfd.id and
- vnfd_cp.vnfd_connection_point_ref == conn.name and
- vnfd_cp.member_vnf_index_ref == self.member_vnf_index and
- vlr.cloud_account_name == self.cloud_account_name):
+ vnfd_cp.vnfd_connection_point_ref == conn.name and
+ vnfd_cp.member_vnf_index_ref == self.member_vnf_index and
+ vlr.cloud_account_name == self.cloud_account_name):
self._log.debug("Found VLR for cp_name:%s and vnf-index:%d",
conn.name, self.member_vnf_index)
return vlr
cpr = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_ConnectionPoint()
cpr.name = conn_p.name
cpr.type_yang = conn_p.type_yang
+ if conn_p.has_field('port_security_enabled'):
+ cpr.port_security_enabled = conn_p.port_security_enabled
+
vlr_ref = find_vlr_for_cp(conn_p)
if vlr_ref is None:
msg = "Failed to find VLR for cp = %s" % conn_p.name
self._log.debug("%s", msg)
-# raise VirtualNetworkFunctionRecordError(msg)
+ # raise VirtualNetworkFunctionRecordError(msg)
continue
cpr.vlr_ref = vlr_ref.id
self.vnfr_msg.connection_point.append(cpr)
self._log.debug("Connection point [%s] added, vnf id=%s vnfd id=%s",
- cpr, self.vnfr_msg.id, self.vnfr_msg.vnfd_ref)
+ cpr, self.vnfr_msg.id, self.vnfr_msg.vnfd.id)
if not self.restart_mode:
yield from self._dts.query_create(self.xpath,
def vnfr_in_vnfm(self):
""" Is there a VNFR record in VNFM """
if (self._state == VnfRecordState.ACTIVE or
- self._state == VnfRecordState.INSTANTIATION_PENDING or
- self._state == VnfRecordState.FAILED):
+ self._state == VnfRecordState.INSTANTIATION_PENDING or
+ self._state == VnfRecordState.FAILED):
return True
return False
"FAILED": "failed",
"VL_INSTANTIATE": "vl_instantiate",
"VL_TERMINATE": "vl_terminate",
- }
+ }
return state_to_str_map[self._state.name]
@property
""" Network service record """
XPATH = "D,/nsr:ns-instance-opdata/nsr:nsr"
- def __init__(self, dts, log, loop, nsm, nsm_plugin, nsr_cfg_msg, sdn_account_name, restart_mode=False):
+ def __init__(self, dts, log, loop, nsm, nsm_plugin, nsr_cfg_msg, sdn_account_name, key_pairs, restart_mode=False,
+ vlr_handler=None):
self._dts = dts
self._log = log
self._loop = loop
self._nsr_cfg_msg = nsr_cfg_msg
self._nsm_plugin = nsm_plugin
self._sdn_account_name = sdn_account_name
+ self._vlr_handler = vlr_handler
self._nsd = None
self._nsr_msg = None
self._nsr_regh = None
+ self._key_pairs = key_pairs
self._vlrs = []
self._vnfrs = {}
self._vnfds = {}
self._is_active = False
self._vl_phase_completed = False
self._vnf_phase_completed = False
+ self.vlr_uptime_tasks = {}
# Initalise the state to init
self._vnf_phase_completed = True
self._op_status.set_state(state)
+ self._nsm_plugin.set_state(self.id, state)
@property
def id(self):
def cloud_account_name(self):
return self._nsr_cfg_msg.cloud_account
+ @property
+ def om_datacenter_name(self):
+ if self._nsr_cfg_msg.has_field('om_datacenter'):
+ return self._nsr_cfg_msg.om_datacenter
+ return None
+
@property
def state(self):
"""State of this NetworkServiceRecord"""
def __str__(self):
return "NSR(name={}, nsd_id={}, cloud_account={})".format(
- self.name, self.nsd_id, self.cloud_account_name
- )
+ self.name, self.nsd_id, self.cloud_account_name
+ )
def _get_vnfd(self, vnfd_id, config_xact):
""" Fetch vnfd msg for the passed vnfd id """
def _get_vnfd_cloud_account(self, vnfd_member_index):
""" Fetch Cloud Account for the passed vnfd id """
if self._nsr_cfg_msg.vnf_cloud_account_map:
- vim_accounts = [vnf.cloud_account for vnf in self._nsr_cfg_msg.vnf_cloud_account_map \
- if vnfd_member_index == vnf.member_vnf_index_ref]
- if vim_accounts and vim_accounts[0]:
- return vim_accounts[0]
- return self.cloud_account_name
+ vim_accounts = [(vnf.cloud_account,vnf.om_datacenter) for vnf in self._nsr_cfg_msg.vnf_cloud_account_map \
+ if vnfd_member_index == vnf.member_vnf_index_ref]
+ if vim_accounts and vim_accounts[0]:
+ return vim_accounts[0]
+ return (self.cloud_account_name,self.om_datacenter_name)
def _get_constituent_vnfd_msg(self, vnf_index):
for const_vnfd in self.nsd_msg.constituent_vnfd:
for vlr in self._vlrs:
yield from self.nsm_plugin.instantiate_vl(self, vlr)
vlr.state = VlRecordState.ACTIVE
+ self.vlr_uptime_tasks[vlr.id] = self._loop.create_task(self.vlr_uptime_update(vlr))
+
+
+ def vlr_uptime_update(self, vlr):
+ try:
+
+ vlr_ = RwVlrYang.YangData_Vlr_VlrCatalog_Vlr.from_dict({'id': vlr.id})
+ while True:
+ vlr_.uptime = int(time.time()) - vlr._create_time
+ yield from self._vlr_handler.update(None, VirtualLinkRecord.vlr_xpath(vlr), vlr_)
+ yield from asyncio.sleep(2, loop=self._loop)
+ except asyncio.CancelledError:
+ self._log.debug("Received cancellation request for vlr_uptime_update task")
+ yield from self._vlr_handler.delete(None, VirtualLinkRecord.vlr_xpath(vlr))
+
@asyncio.coroutine
def create(self, config_xact):
tmp_file = None
with tempfile.NamedTemporaryFile(delete=False) as tmp_file:
tmp_file.write(yaml.dump(data, default_flow_style=True)
- .encode("UTF-8"))
+ .encode("UTF-8"))
self._log.debug("Creating a temp file: {} with input data: {}".
format(tmp_file.name, data))
err_msg = None
if not rc:
err_msg = "Failed config for trigger {} using config script '{}'". \
- format(self.scaling_trigger_str(trigger),
- config_primitive.user_defined_script)
+ format(self.scaling_trigger_str(trigger),
+ config_primitive.user_defined_script)
yield from update_config_status(success=rc, err_msg=err_msg)
return rc
else:
err_msg = "Failed config for trigger {} as config script is not specified". \
- format(self.scaling_trigger_str(trigger))
+ format(self.scaling_trigger_str(trigger))
yield from update_config_status(success=False, err_msg=err_msg)
raise NotImplementedError("Only script based config support for scale group for now: {}".
format(group.name))
else:
- err_msg = "Failed config for trigger {} as config primitive is not specified".\
- format(self.scaling_trigger_str(trigger))
+ err_msg = "Failed config for trigger {} as config primitive is not specified". \
+ format(self.scaling_trigger_str(trigger))
yield from update_config_status(success=False, err_msg=err_msg)
self._log.error("Config primitive not specified for config action in scale group %s" %
(group.name))
scaling_group_msg.name, self.id)
group_record = scale_group.ScalingGroup(
- self._log,
- scaling_group_msg
- )
+ self._log,
+ scaling_group_msg
+ )
self._scaling_groups[group_record.name] = group_record
const_vnfd_msg = self._get_constituent_vnfd_msg(vnf_index)
vnfd_msg = self._get_vnfd(const_vnfd_msg.vnfd_id_ref, config_xact)
- cloud_account_name = self._get_vnfd_cloud_account(const_vnfd_msg.member_vnf_index)
+ cloud_account_name, om_datacenter_name = self._get_vnfd_cloud_account(const_vnfd_msg.member_vnf_index)
if cloud_account_name is None:
cloud_account_name = self.cloud_account_name
for _ in range(count):
- vnfr = yield from self.create_vnf_record(vnfd_msg, const_vnfd_msg, cloud_account_name, group_name, index)
+ vnfr = yield from self.create_vnf_record(vnfd_msg, const_vnfd_msg, cloud_account_name, om_datacenter_name, group_name, index)
scale_instance.add_vnfr(vnfr)
vnfrs.append(vnfr)
-
return vnfrs
@asyncio.coroutine
format(group.name, index))
scale_instance.operational_status = "failed"
else:
- yield from self.instantiate_vnfs(vnfrs)
+ yield from self.instantiate_vnfs(vnfrs, scaleout=True)
except Exception as e:
self._log.exception("Failed to begin instantiatiation of vnfs for scale group {}: {}".
if all([state == VnfRecordState.TERMINATED for state in instance_vnf_state_list]):
instance.operational_status = "terminated"
rc = yield from self.apply_scaling_group_config(NsdYang.ScalingTrigger.POST_SCALE_IN,
- group, instance)
+ group, instance)
if rc:
self._log.debug("Scale in for group {} and instance {} succeeded".
format(group.name, instance.instance_id))
self._vnffgrs[vnffgr.id] = vnffgr
def resolve_vld_ip_profile(self, nsd_msg, vld):
+ self._log.debug("Receieved ip profile ref is %s",vld.ip_profile_ref)
if not vld.has_field('ip_profile_ref'):
return None
- profile = [ profile for profile in nsd_msg.ip_profiles if profile.name == vld.ip_profile_ref ]
+ profile = [profile for profile in nsd_msg.ip_profiles if profile.name == vld.ip_profile_ref]
return profile[0] if profile else None
@asyncio.coroutine
- def _create_vls(self, vld, cloud_account):
+ def _create_vls(self, vld, cloud_account,om_datacenter):
"""Create a VLR in the cloud account specified using the given VLD
-
+
Args:
vld : VLD yang obj
cloud_account : Cloud account name
-
+
Returns:
VirtualLinkRecord
"""
vlr = yield from VirtualLinkRecord.create_record(
- self._dts,
- self._log,
- self._loop,
- self.name,
- vld,
- cloud_account,
- self.resolve_vld_ip_profile(self.nsd_msg, vld),
- self.id,
- restart_mode=self.restart_mode)
+ self._dts,
+ self._log,
+ self._loop,
+ self.name,
+ vld,
+ cloud_account,
+ om_datacenter,
+ self.resolve_vld_ip_profile(self.nsd_msg, vld),
+ self.id,
+ restart_mode=self.restart_mode)
return vlr
# Handle case where cloud_account is None
vnf_cloud_map = {}
for vnf in self._nsr_cfg_msg.vnf_cloud_account_map:
- if vnf.cloud_account is not None:
- vnf_cloud_map[vnf.member_vnf_index_ref] = vnf.cloud_account
+ if vnf.cloud_account is not None or vnf.om_datacenter is not None:
+ vnf_cloud_map[vnf.member_vnf_index_ref] = (vnf.cloud_account,vnf.om_datacenter)
for vnfc in vld.vnfd_connection_point_ref:
cloud_account = vnf_cloud_map.get(
- vnfc.member_vnf_index_ref,
- self.cloud_account_name)
+ vnfc.member_vnf_index_ref,
+ (self.cloud_account_name,self.om_datacenter_name))
cloud_account_list.append(cloud_account)
if self._nsr_cfg_msg.vl_cloud_account_map:
for vld_map in self._nsr_cfg_msg.vl_cloud_account_map:
if vld_map.vld_id_ref == vld.id:
- cloud_account_list.extend(vld_map.cloud_accounts)
+ for cloud_account in vld_map.cloud_accounts:
+ cloud_account_list.extend((cloud_account,None))
+ for om_datacenter in vld_map.om_datacenters:
+ cloud_account_list.extend((None,om_datacenter))
# If no config has been provided then fall-back to the default
# account
if not cloud_account_list:
- cloud_account_list = [self.cloud_account_name]
+ cloud_account_list = [(self.cloud_account_name,self.om_datacenter_name)]
self._log.debug("VL {} cloud accounts: {}".
format(vld.name, cloud_account_list))
""" This function creates VLs for every VLD in the NSD
associated with this NSR"""
for vld in self.nsd_msg.vld:
+
self._log.debug("Found vld %s in nsr id %s", vld, self.id)
cloud_account_list = self._extract_cloud_accounts_for_vl(vld)
- for account in cloud_account_list:
- vlr = yield from self._create_vls(vld, account)
+ for cloud_account,om_datacenter in cloud_account_list:
+ vlr = yield from self._create_vls(vld, cloud_account,om_datacenter)
self._vlrs.append(vlr)
if vlr is None:
cloud_account_list = self._extract_cloud_accounts_for_vl(vld)
- for account in cloud_account_list:
- vlr = yield from self._create_vls(vld, account)
+ for account,om_datacenter in cloud_account_list:
+ vlr = yield from self._create_vls(vld, account,om_datacenter)
self._vlrs.append(vlr)
vlr.state = VlRecordState.INSTANTIATION_PENDING
except Exception as e:
err_msg = "Error instantiating VL for NSR {} and VLD {}: {}". \
- format(self.id, vld.id, e)
+ format(self.id, vld.id, e)
self._log.error(err_msg)
self._log.exception(e)
vlr.state = VlRecordState.FAILED
except Exception as e:
err_msg = "Error terminating VL for NSR {} and VLD {}: {}". \
- format(self.id, vld.id, e)
+ format(self.id, vld.id, e)
self._log.error(err_msg)
self._log.exception(e)
vlr.state = VlRecordState.FAILED
continue
vnfd_msg = self._get_vnfd(const_vnfd.vnfd_id_ref, config_xact)
- cloud_account_name = self._get_vnfd_cloud_account(const_vnfd.member_vnf_index)
+ cloud_account_name,om_datacenter_name = self._get_vnfd_cloud_account(const_vnfd.member_vnf_index)
if cloud_account_name is None:
cloud_account_name = self.cloud_account_name
- yield from self.create_vnf_record(vnfd_msg, const_vnfd, cloud_account_name)
+ yield from self.create_vnf_record(vnfd_msg, const_vnfd, cloud_account_name, om_datacenter_name)
def get_placement_groups(self, vnfd_msg, const_vnfd):
for group in self.nsd_msg.placement_groups:
for member_vnfd in group.member_vnfd:
if (member_vnfd.vnfd_id_ref == vnfd_msg.id) and \
- (member_vnfd.member_vnf_index_ref == const_vnfd.member_vnf_index):
+ (member_vnfd.member_vnf_index_ref == const_vnfd.member_vnf_index):
group_info = self.resolve_placement_group_cloud_construct(group)
if group_info is None:
self._log.error("Could not resolve cloud-construct for placement group: %s", group.name)
return placement_groups
@asyncio.coroutine
- def create_vnf_record(self, vnfd_msg, const_vnfd, cloud_account_name, group_name=None, group_instance_id=None):
+ def create_vnf_record(self, vnfd_msg, const_vnfd, cloud_account_name, om_datacenter_name, group_name=None, group_instance_id=None):
# Fetch the VNFD associated with this VNF
placement_groups = self.get_placement_groups(vnfd_msg, const_vnfd)
self._log.info("Cloud Account for VNF %d is %s",const_vnfd.member_vnf_index,cloud_account_name)
const_vnfd.member_vnf_index,
[ group.name for group in placement_groups])
vnfr = yield from VirtualNetworkFunctionRecord.create_record(self._dts,
- self._log,
- self._loop,
- vnfd_msg,
- const_vnfd,
- self.nsd_id,
- self.name,
- cloud_account_name,
- self.id,
- group_name,
- group_instance_id,
- placement_groups,
- restart_mode=self.restart_mode,
- )
+ self._log,
+ self._loop,
+ vnfd_msg,
+ const_vnfd,
+ self.nsd_id,
+ self.name,
+ cloud_account_name,
+ om_datacenter_name,
+ self.id,
+ group_name,
+ group_instance_id,
+ placement_groups,
+ restart_mode=self.restart_mode,
+ )
if vnfr.id in self._vnfrs:
err = "VNF with VNFR id %s already in vnf list" % (vnfr.id,)
raise NetworkServiceRecordError(err)
end_value = param_pool.range.end_value
if end_value < start_value:
raise NetworkServiceRecordError(
- "Parameter pool %s has invalid range (start: {}, end: {})".format(
- start_value, end_value
- )
- )
+ "Parameter pool %s has invalid range (start: {}, end: {})".format(
+ start_value, end_value
+ )
+ )
self._param_pools[param_pool.name] = config_value_pool.ParameterValuePool(
- self._log,
- param_pool.name,
- range(start_value, end_value)
- )
+ self._log,
+ param_pool.name,
+ range(start_value, end_value)
+ )
@asyncio.coroutine
def fetch_vnfr(self, vnfr_path):
return vnfr
@asyncio.coroutine
- def instantiate_vnfs(self, vnfrs):
+ def instantiate_vnfs(self, vnfrs, scaleout=False):
"""
This function instantiates VNFs for every VNF in this Network Service
"""
self._log.debug("Instantiating %u VNFs in NS %s", len(vnfrs), self.id)
for vnf in vnfrs:
self._log.debug("Instantiating VNF: %s in NS %s", vnf, self.id)
- yield from self.nsm_plugin.instantiate_vnf(self, vnf)
+ yield from self.nsm_plugin.instantiate_vnf(self, vnf,scaleout)
@asyncio.coroutine
def instantiate_vnffgs(self):
for i in range(group.min_instance_count):
self._log.debug("Instantiating %s default scaling instance %s", group, i)
yield from self.create_scale_group_instance(
- group.name, i, config_xact, is_default=True
- )
+ group.name, i, config_xact, is_default=True
+ )
for group_msg in self._nsr_cfg_msg.scaling_group:
if group_msg.scaling_group_name_ref != group.name:
for instance in group_msg.instance:
self._log.debug("Reloading %s scaling instance %s", group_msg, instance.id)
yield from self.create_scale_group_instance(
- group.name, instance.id, config_xact, is_default=False
- )
+ group.name, instance.id, config_xact, is_default=False
+ )
def has_scaling_instances(self):
""" Return boolean indicating if the network service has default scaling groups """
return(
"D,/nsr:ns-instance-opdata" +
"/nsr:nsr[nsr:ns-instance-config-ref = '{}']"
- ).format(self.id)
+ ).format(self.id)
@staticmethod
def xpath_from_nsr(nsr):
""" Return NSD config xpath."""
return(
"C,/nsd:nsd-catalog/nsd:nsd[nsd:id = '{}']"
- ).format(self.nsd_id)
+ ).format(self.nsd_id)
@asyncio.coroutine
def instantiate(self, config_xact):
def on_instantiate_done(fut):
# If the do_instantiate fails, then publish NSR with failed result
- if fut.exception() is not None:
- self._log.error("NSR instantiation failed for NSR id %s: %s", self.id, str(fut.exception()))
- self._loop.create_task(self.instantiation_failed(failed_reason=str(fut.exception())))
+ e = fut.exception()
+ if e is not None:
+ import traceback, sys
+ print(traceback.format_exception(None,e, e.__traceback__), file=sys.stderr, flush=True)
+ self._log.error("NSR instantiation failed for NSR id %s: %s", self.id, str(e))
+ self._loop.create_task(self.instantiation_failed(failed_reason=str(e)))
instantiate_task = self._loop.create_task(do_instantiate())
instantiate_task.add_done_callback(on_instantiate_done)
if self._config_status == NsrYang.ConfigStates.FAILED:
self.record_event("config-failed", "NS configuration failed",
- evt_details=self._config_status_details)
+ evt_details=self._config_status_details)
yield from self.publish()
for vlr in self.vlrs:
yield from self.nsm_plugin.terminate_vl(vlr)
vlr.state = VlRecordState.TERMINATED
+ if vlr.id in self.vlr_uptime_tasks:
+ self.vlr_uptime_tasks[vlr.id].cancel()
self._log.debug("Terminating network service id %s", self.id)
nsr.config_status = self.map_config_status()
nsr.config_status_details = self._config_status_details
nsr.create_time = self._create_time
+ nsr.uptime = int(time.time()) - self._create_time
for cfg_prim in self.nsd_msg.service_primitive:
cfg_prim = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_ServicePrimitive.from_dict(
- cfg_prim.as_dict())
+ cfg_prim.as_dict())
nsr.service_primitive.append(cfg_prim)
for init_cfg in self.nsd_msg.initial_config_primitive:
break
else:
self._log.info("VNFFGR %s in NSR %s is still not active; current state is: %s",
- vnffgr.id, self.id, vnffgr.state)
+ vnffgr.id, self.id, vnffgr.state)
new_state = curr_state
# Update all the scaling group instance operational status to
continue
self.log.debug(
- "input-parameter:{} = {}".format(
- param.xpath,
- param.value,
- )
- )
+ "input-parameter:{} = {}".format(
+ param.xpath,
+ param.value,
+ )
+ )
try:
xpath.setxattr(nsd, param.xpath, param.value)
self._log.debug(
"Registering for NSD config using xpath: %s",
NsdDtsHandler.XPATH,
- )
+ )
acg_hdl = rift.tasklets.AppConfGroup.Handler(on_apply=on_apply)
with self._dts.appconf_group_create(handler=acg_hdl) as acg:
self._log.debug(
"Registering for VNFD config using xpath: %s",
VnfdDtsHandler.XPATH,
- )
+ )
acg_hdl = rift.tasklets.AppConfGroup.Handler(on_apply=on_apply)
with self._dts.appconf_group_create(handler=acg_hdl) as acg:
# Need a list in scratch to store VNFDs to create/update later
EXEC_NSR_CONF_O_XPATH = "O,/nsr:start-network-service"
NETCONF_IP_ADDRESS = "127.0.0.1"
NETCONF_PORT = 2022
+ RESTCONF_PORT = 8888
NETCONF_USER = "admin"
NETCONF_PW = "admin"
+ REST_BASE_V2_URL = 'https://{}:{}/v2/api/'.format("127.0.0.1",8888)
def __init__(self, dts, log, loop, nsm):
self._dts = dts
self._ns_regh = None
self._manager = None
+ self._nsr_config_url = NsrRpcDtsHandler.REST_BASE_V2_URL + 'config/ns-instance-config'
self._model = RwYang.Model.create_libncx()
self._model.load_schema_ypbc(RwNsrYang.get_schema())
self._log.debug("Attemping NsmTasklet netconf connection.")
manager = yield from ncclient.asyncio_manager.asyncio_connect(
- loop=self._loop,
- host=NsrRpcDtsHandler.NETCONF_IP_ADDRESS,
- port=NsrRpcDtsHandler.NETCONF_PORT,
- username=NsrRpcDtsHandler.NETCONF_USER,
- password=NsrRpcDtsHandler.NETCONF_PW,
- allow_agent=False,
- look_for_keys=False,
- hostkey_verify=False,
- )
+ loop=self._loop,
+ host=NsrRpcDtsHandler.NETCONF_IP_ADDRESS,
+ port=NsrRpcDtsHandler.NETCONF_PORT,
+ username=NsrRpcDtsHandler.NETCONF_USER,
+ password=NsrRpcDtsHandler.NETCONF_PW,
+ allow_agent=False,
+ look_for_keys=False,
+ hostkey_verify=False,
+ )
return manager
yield from asyncio.sleep(5, loop=self._loop)
raise NsrInstantiationFailed("Failed to connect to Launchpad within %s seconds" %
- timeout_secs)
+ timeout_secs)
+
+ def _apply_ns_instance_config(self,payload_dict):
+ #self._log.debug("At apply NS instance config with payload %s",payload_dict)
+ req_hdr= {'accept':'application/vnd.yang.data+json','content-type':'application/vnd.yang.data+json'}
+ response=requests.post(self._nsr_config_url, headers=req_hdr, auth=('admin', 'admin'),data=payload_dict,verify=False)
+ return response
@asyncio.coroutine
def register(self):
assert action == rwdts.QueryAction.RPC
rpc_ip = msg
rpc_op = NsrYang.YangOutput_Nsr_StartNetworkService.from_dict({
- "nsr_id":str(uuid.uuid4())
- })
-
- if not ('name' in rpc_ip and 'nsd_ref' in rpc_ip and 'cloud_account' in rpc_ip):
+ "nsr_id":str(uuid.uuid4())
+ })
+
+ if not ('name' in rpc_ip and 'nsd_ref' in rpc_ip and ('cloud_account' in rpc_ip or 'om_datacenter' in rpc_ip)):
self._log.error("Mandatory parameters name or nsd_ref or cloud account not found in start-network-service {}".format(rpc_ip))
-
+
self._log.debug("start-network-service RPC input: {}".format(rpc_ip))
try:
# Add used value to the pool
self._log.debug("RPC output: {}".format(rpc_op))
+
nsd_copy = self.nsm.get_nsd(rpc_ip.nsd_ref)
- if not self._manager:
- self._manager = yield from self._connect()
-
+ #if not self._manager:
+ # self._manager = yield from self._connect()
+
self._log.debug("Configuring ns-instance-config with name %s nsd-ref: %s",
- rpc_ip.name, rpc_ip.nsd_ref)
+ rpc_ip.name, rpc_ip.nsd_ref)
ns_instance_config_dict = {"id":rpc_op.nsr_id, "admin_status":"ENABLED"}
ns_instance_config_copy_dict = {k:v for k, v in rpc_ip.as_dict().items()
ns_instance_config.nsd = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_Nsd()
ns_instance_config.nsd.from_dict(nsd_copy.msg.as_dict())
- xml = ns_instance_config.to_xml_v2(self._model)
- netconf_xml = self.wrap_netconf_config_xml(xml)
-
- self._log.debug("Sending configure ns-instance-config xml to %s: %s",
- netconf_xml, NsrRpcDtsHandler.NETCONF_IP_ADDRESS)
-
- response = yield from self._manager.edit_config(
- target="running",
- config=netconf_xml,
- )
- self._log.debug("Received edit config response: %s", str(response))
+ payload_dict = ns_instance_config.to_json(self._model)
+ #xml = ns_instance_config.to_xml_v2(self._model)
+ #netconf_xml = self.wrap_netconf_config_xml(xml)
+
+ #self._log.debug("Sending configure ns-instance-config xml to %s: %s",
+ # netconf_xml, NsrRpcDtsHandler.NETCONF_IP_ADDRESS)
+ self._log.debug("Sending configure ns-instance-config json to %s: %s",
+ self._nsr_config_url,ns_instance_config)
+
+ #response = yield from self._manager.edit_config(
+ # target="running",
+ # config=netconf_xml,
+ # )
+ response = yield from self._loop.run_in_executor(
+ None,
+ self._apply_ns_instance_config,
+ payload_dict
+ )
+ response.raise_for_status()
+ self._log.debug("Received edit config response: %s", response.json())
xact_info.respond_xpath(rwdts.XactRspCode.ACK,
NsrRpcDtsHandler.EXEC_NSR_CONF_O_XPATH,
self._ns_regh = group.register(xpath=NsrRpcDtsHandler.EXEC_NSR_CONF_XPATH,
handler=hdl_ns,
flags=rwdts.Flag.PUBLISHER,
- )
+ )
class NsrDtsHandler(object):
""" The network service DTS handler """
NSR_XPATH = "C,/nsr:ns-instance-config/nsr:nsr"
SCALE_INSTANCE_XPATH = "C,/nsr:ns-instance-config/nsr:nsr/nsr:scaling-group/nsr:instance"
+ KEY_PAIR_XPATH = "C,/nsr:key-pair"
def __init__(self, dts, log, loop, nsm):
self._dts = dts
self._nsr_regh = None
self._scale_regh = None
+ self._key_pair_regh = None
@property
def nsm(self):
return added_cfgs, deleted_cfgs, updated_cfgs
+ def get_nsr_key_pairs(dts_member_reg, xact):
+ key_pairs = {}
+ for instance_cfg, keyspec in dts_member_reg.get_xact_elements(xact, include_keyspec=True):
+ self._log.debug("Key pair received is {} KS: {}".format(instance_cfg, keyspec))
+ xpath = keyspec.to_xpath(RwNsrYang.get_schema())
+ key_pairs[instance_cfg.name] = instance_cfg
+ return key_pairs
+
def on_apply(dts, acg, xact, action, scratch):
"""Apply the configuration"""
self._log.debug("Got nsr apply (xact: %s) (action: %s)(scr: %s)",
xact, action, scratch)
- def handle_create_nsr(msg, restart_mode=False):
+ def handle_create_nsr(msg, key_pairs=None, restart_mode=False):
# Handle create nsr requests """
# Do some validations
if not msg.has_field("nsd"):
raise NetworkServiceRecordError(err)
self._log.debug("Creating NetworkServiceRecord %s from nsr config %s",
- msg.id, msg.as_dict())
- nsr = self.nsm.create_nsr(msg, restart_mode=restart_mode)
+ msg.id, msg.as_dict())
+ nsr = self.nsm.create_nsr(msg, key_pairs=key_pairs, restart_mode=restart_mode)
return nsr
def handle_delete_nsr(msg):
xact, action, scratch)
if action == rwdts.AppconfAction.INSTALL and xact.id is None:
+ key_pairs = []
+ for element in self._key_pair_regh.elements:
+ key_pairs.append(element)
for element in self._nsr_regh.elements:
- nsr = handle_create_nsr(element, restart_mode=True)
+ nsr = handle_create_nsr(element, key_pairs, restart_mode=True)
self._loop.create_task(begin_instantiation(nsr))
for msg in added_msgs:
if msg.id not in self._nsm.nsrs:
self._log.info("Create NSR received in on_apply to instantiate NS:%s", msg.id)
- nsr = handle_create_nsr(msg)
+ key_pairs = get_nsr_key_pairs(self._key_pair_regh, xact)
+ nsr = handle_create_nsr(msg,key_pairs)
self._loop.create_task(begin_instantiation(nsr))
for msg in deleted_msgs:
xpath = ks_path.to_xpath(RwNsrYang.get_schema())
action = xact_info.query_action
self._log.debug(
- "Got Nsr prepare callback (xact: %s) (action: %s) (info: %s), %s:%s)",
- xact, action, xact_info, xpath, msg
- )
+ "Got Nsr prepare callback (xact: %s) (action: %s) (info: %s), %s:%s)",
+ xact, action, xact_info, xpath, msg
+ )
@asyncio.coroutine
def delete_instantiation(ns_id):
acg_hdl = rift.tasklets.AppConfGroup.Handler(on_apply=on_apply)
with self._dts.appconf_group_create(handler=acg_hdl) as acg:
self._nsr_regh = acg.register(xpath=NsrDtsHandler.NSR_XPATH,
- flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY | rwdts.Flag.CACHE,
- on_prepare=on_prepare)
+ flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY | rwdts.Flag.CACHE,
+ on_prepare=on_prepare)
self._scale_regh = acg.register(
- xpath=NsrDtsHandler.SCALE_INSTANCE_XPATH,
- flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY| rwdts.Flag.CACHE,
- )
+ xpath=NsrDtsHandler.SCALE_INSTANCE_XPATH,
+ flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY| rwdts.Flag.CACHE,
+ )
+
+ self._key_pair_regh = acg.register(
+ xpath=NsrDtsHandler.KEY_PAIR_XPATH,
+ flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY | rwdts.Flag.CACHE,
+ )
class NsrOpDataDtsHandler(object):
self._log.debug(
"Got vnfr on_prepare cb (xact_info: %s, action: %s): %s:%s",
xact_info, action, ks_path, msg
- )
+ )
schema = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr.schema()
path_entry = schema.keyspec_to_entry(ks_path)
self._ro_plugin_selector = ro_plugin_selector
self._ncclient = rift.mano.ncclient.NcClient(
- host="127.0.0.1",
- port=2022,
- username="admin",
- password="admin",
- loop=self._loop)
+ host="127.0.0.1",
+ port=2022,
+ username="admin",
+ password="admin",
+ loop=self._loop)
self._nsrs = {}
self._nsds = {}
ScalingGroup = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_ScalingGroup
xpath = ('C,/nsr:ns-instance-config/nsr:nsr[nsr:id="{}"]').format(
- msg.nsr_id_ref)
+ msg.nsr_id_ref)
instance = ScalingGroupInstance.from_dict({"id": msg.instance_id})
@asyncio.coroutine
else:
self._loop.create_task(scale_in())
- # Opdata based calls, disabled for now!
- # if action == ScalingRpcHandler.ACTION.SCALE_OUT:
- # self.scale_nsr_out(
- # msg.nsr_id_ref,
- # msg.scaling_group_name_ref,
- # msg.instance_id,
- # xact)
- # else:
- # self.scale_nsr_in(
- # msg.nsr_id_ref,
- # msg.scaling_group_name_ref,
- # msg.instance_id)
-
+ # Opdata based calls, disabled for now!
+ # if action == ScalingRpcHandler.ACTION.SCALE_OUT:
+ # self.scale_nsr_out(
+ # msg.nsr_id_ref,
+ # msg.scaling_group_name_ref,
+ # msg.instance_id,
+ # xact)
+ # else:
+ # self.scale_nsr_in(
+ # msg.nsr_id_ref,
+ # msg.scaling_group_name_ref,
+ # msg.instance_id)
+
def nsr_update_cfg(self, nsr_id, msg):
nsr = self._nsrs[nsr_id]
nsr.nsr_cfg_msg= msg
# Not calling in a separate task as this is called from a separate task
yield from nsr.delete_vl_instance(vld)
- def create_nsr(self, nsr_msg, restart_mode=False):
+ def create_nsr(self, nsr_msg, key_pairs=None,restart_mode=False):
""" Create an NSR instance """
if nsr_msg.id in self._nsrs:
msg = "NSR id %s already exists" % nsr_msg.id
nsm_plugin,
nsr_msg,
sdn_account_name,
- restart_mode=restart_mode
+ key_pairs,
+ restart_mode=restart_mode,
+ vlr_handler=self._ro_plugin_selector._records_publisher._vlr_pub_hdlr
)
self._nsrs[nsr_msg.id] = nsr
- nsm_plugin.create_nsr(nsr_msg, nsr_msg.nsd)
+ nsm_plugin.create_nsr(nsr_msg, nsr_msg.nsd, key_pairs)
return nsr
raise NetworkServiceDescriptorError("NSD already exists-%s", nsd_msg.id)
nsd = NetworkServiceDescriptor(
- self._dts,
- self._log,
- self._loop,
- nsd_msg,
- self
- )
+ self._dts,
+ self._log,
+ self._loop,
+ nsd_msg,
+ self
+ )
self._nsds[nsd_msg.id] = nsd
return nsd
self.create_nsd(nsd)
else:
self._log.debug("Updating NSD id = %s, nsd = %s", nsd.id, nsd)
- self._nsds[nsd.id].update(nsd)
+ self._nsds[nsd.id].update(nsd)
def delete_nsd(self, nsd_id):
""" Delete the Network service descriptor with the passed id """
""" Update the virtual network function descriptor """
self._log.debug("Update virtual network function descriptor- %s", vnfd)
- # Hack to remove duplicates from leaf-lists - to be fixed by RIFT-6511
- for ivld in vnfd.internal_vld:
- ivld.internal_connection_point_ref = list(set(ivld.internal_connection_point_ref))
if vnfd.id not in self._vnfds:
self._log.debug("No VNFD found - creating VNFD id = %s", vnfd.id)
# Terminate the instances/networks assocaited with this nw service
self._log.debug("Terminating the network service %s", nsr_id)
- yield from self._nsrs[nsr_id].terminate()
+ try :
+ yield from self._nsrs[nsr_id].terminate()
+ except Exception as e:
+ self.log.exception("Failed to terminate NSR[id=%s]", nsr_id)
# Unref the NSD
yield from self.nsd_unref_by_nsr_id(nsr_id)
self.callback(xact_info.xact, msg, self.ACTION.SCALE_IN)
rpc_op = NsrYang.YangOutput_Nsr_ExecScaleIn.from_dict({
- "instance_id": msg.instance_id})
+ "instance_id": msg.instance_id})
xact_info.respond_xpath(
rwdts.XactRspCode.ACK,
self.callback(xact_info.xact, msg, self.ACTION.SCALE_OUT)
rpc_op = NsrYang.YangOutput_Nsr_ExecScaleOut.from_dict({
- "instance_id": msg.instance_id})
+ "instance_id": msg.instance_id})
xact_info.respond_xpath(
rwdts.XactRspCode.ACK,
except Exception as e:
self.log.exception(e)
xact_info.respond_xpath(
- rwdts.XactRspCode.NACK,
- self.__class__.SCALE_OUT_OUTPUT_XPATH)
+ rwdts.XactRspCode.NACK,
+ self.__class__.SCALE_OUT_OUTPUT_XPATH)
scale_in_hdl = rift.tasklets.DTS.RegistrationHandler(
- on_prepare=on_scale_in_prepare)
+ on_prepare=on_scale_in_prepare)
scale_out_hdl = rift.tasklets.DTS.RegistrationHandler(
- on_prepare=on_scale_out_prepare)
+ on_prepare=on_scale_out_prepare)
with self.dts.group_create() as group:
group.register(
- xpath=self.__class__.SCALE_IN_INPUT_XPATH,
- handler=scale_in_hdl,
- flags=rwdts.Flag.PUBLISHER)
+ xpath=self.__class__.SCALE_IN_INPUT_XPATH,
+ handler=scale_in_hdl,
+ flags=rwdts.Flag.PUBLISHER)
group.register(
- xpath=self.__class__.SCALE_OUT_INPUT_XPATH,
- handler=scale_out_hdl,
- flags=rwdts.Flag.PUBLISHER)
+ xpath=self.__class__.SCALE_OUT_INPUT_XPATH,
+ handler=scale_out_hdl,
+ flags=rwdts.Flag.PUBLISHER)
class NsmTasklet(rift.tasklets.Tasklet):
self._vnfd_pub_handler = publisher.VnfdPublisher(use_ssl, ssl_cert, ssl_key, self.loop)
self._records_publisher_proxy = NsmRecordsPublisherProxy(
- self._dts,
- self.log,
- self.loop,
- self._nsr_pub_handler,
- self._vnfr_pub_handler,
- self._vlr_pub_handler,
- )
+ self._dts,
+ self.log,
+ self.loop,
+ self._nsr_pub_handler,
+ self._vnfr_pub_handler,
+ self._vlr_pub_handler,
+ )
# Register the NSM to receive the nsm plugin
# when cloud account is configured
self._ro_plugin_selector = cloud.ROAccountPluginSelector(
- self._dts,
- self.log,
- self.loop,
- self._records_publisher_proxy,
- )
+ self._dts,
+ self.log,
+ self.loop,
+ self._records_publisher_proxy,
+ )
yield from self._ro_plugin_selector.register()
self._cloud_account_handler = cloud.CloudAccountConfigSubscriber(
- self._log,
- self._dts,
- self.log_hdl)
+ self._log,
+ self._dts,
+ self.log_hdl)
yield from self._cloud_account_handler.register()
yield from self._vnffgmgr.register()
self._nsm = NsManager(
- self._dts,
- self.log,
- self.loop,
- self._nsr_pub_handler,
- self._vnfr_pub_handler,
- self._vlr_pub_handler,
- self._ro_plugin_selector,
- self._vnffgmgr,
- self._vnfd_pub_handler,
- self._cloud_account_handler
- )
+ self._dts,
+ self.log,
+ self.loop,
+ self._nsr_pub_handler,
+ self._vnfr_pub_handler,
+ self._vlr_pub_handler,
+ self._ro_plugin_selector,
+ self._vnffgmgr,
+ self._vnfd_pub_handler,
+ self._cloud_account_handler
+ )
yield from self._nsm.register()