update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try
Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
diff --git a/rwlaunchpad/CMakeLists.txt b/rwlaunchpad/CMakeLists.txt
index 5a52897..1ce5d1d 100644
--- a/rwlaunchpad/CMakeLists.txt
+++ b/rwlaunchpad/CMakeLists.txt
@@ -20,11 +20,6 @@
cmake_minimum_required(VERSION 2.8)
-set(PKG_NAME rwlaunchpad)
-set(PKG_VERSION 1.0)
-set(PKG_RELEASE 1)
-set(PKG_LONG_NAME ${PKG_NAME}-${PKG_VERSION})
-
set(subdirs
mock
plugins
diff --git a/rwlaunchpad/mock/plugins/yang/CMakeLists.txt b/rwlaunchpad/mock/plugins/yang/CMakeLists.txt
index 2d8f2d9..9fb29f9 100644
--- a/rwlaunchpad/mock/plugins/yang/CMakeLists.txt
+++ b/rwlaunchpad/mock/plugins/yang/CMakeLists.txt
@@ -25,7 +25,7 @@
YANG_FILES
lpmocklet.yang
COMPONENT
- ${PKG_LONG_NAME}
+ ${INSTALL_COMPONENT}
LIBRARIES
mano-types_yang_gen
)
diff --git a/rwlaunchpad/mock/plugins/yang/lpmocklet.yang b/rwlaunchpad/mock/plugins/yang/lpmocklet.yang
index 819ee40..0f8b4de 100644
--- a/rwlaunchpad/mock/plugins/yang/lpmocklet.yang
+++ b/rwlaunchpad/mock/plugins/yang/lpmocklet.yang
@@ -23,10 +23,6 @@
namespace "http://riftio.com/ns/riftware-1.0/lpmocklet";
prefix "lpmocklet";
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import ietf-inet-types {
prefix "inet";
}
@@ -83,14 +79,12 @@
rpc start-vnfr {
input {
- rwpb:msg-new "StartVnfrInput";
leaf id {
type yang:uuid;
mandatory true;
}
}
output {
- rwpb:msg-new "StartVnfrOutput";
leaf status {
description "status of the start request";
type string;
@@ -100,7 +94,6 @@
rpc stop-vnfr {
input {
- rwpb:msg-new "StopVnfr";
leaf id {
type yang:uuid;
mandatory true;
diff --git a/rwlaunchpad/plugins/cli/CMakeLists.txt b/rwlaunchpad/plugins/cli/CMakeLists.txt
index 0819297..681c20c 100644
--- a/rwlaunchpad/plugins/cli/CMakeLists.txt
+++ b/rwlaunchpad/plugins/cli/CMakeLists.txt
@@ -25,6 +25,7 @@
install(
FILES
cli_launchpad_schema_listing.txt
+ cli_launchpad_rift_specific_schema_listing.txt
DESTINATION usr/data/manifest
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
)
diff --git a/rwlaunchpad/plugins/cli/cli_launchpad_rift_specific_schema_listing.txt b/rwlaunchpad/plugins/cli/cli_launchpad_rift_specific_schema_listing.txt
new file mode 100644
index 0000000..5f17731
--- /dev/null
+++ b/rwlaunchpad/plugins/cli/cli_launchpad_rift_specific_schema_listing.txt
@@ -0,0 +1,4 @@
+rw-project-nsd
+rw-project-vnfd
+rw-nsr
+rw-vnfr
\ No newline at end of file
diff --git a/rwlaunchpad/plugins/cli/cli_launchpad_schema_listing.txt b/rwlaunchpad/plugins/cli/cli_launchpad_schema_listing.txt
index f11616c..add9a12 100644
--- a/rwlaunchpad/plugins/cli/cli_launchpad_schema_listing.txt
+++ b/rwlaunchpad/plugins/cli/cli_launchpad_schema_listing.txt
@@ -1,57 +1,31 @@
-ietf-inet-types
ietf-l2-topology
-ietf-netconf-notifications
ietf-network
ietf-network-topology
-ietf-restconf-monitoring
-ietf-yang-types
-mano-types
-nsd
+nsd-base
nsr
-rw-base
-rwcal
-rw-cli-ext
+project-nsd
+project-vnfd
rw-cloud
+rw-ro-account
rw-config-agent
rw-conman
-rw-debug
-rw-dts
-rw-dtsperf
-rw-dtsperfmgr
rw-launchpad
rw-image-mgmt
rw-pkg-mgmt
rw-staging-mgmt
-rw-log
-rwlog-mgmt
-rw-manifest
-rw-memlog
-rw-mgmtagt
-rw-mgmt-schema
-rwmsg-data
-rw-netconf
-rw-restconf
-rw-notify-ext
-rw-nsd
rw-nsm
-rw-nsr
-rw-pb-ext
+rw-project-mano
rw-resource-mgr
-rw-restportforward
rwsdnal
rw-sdn
-rwshell-mgmt
-rw-sorch
rw-topology
-rw-vcs
-rwvcs-types
rw-vld
rw-vlr
-rw-vnfd
-rw-vnfr
+rw-vnfd-base
rw-yang-types
+rw-ha
vld
vlr
-vnfd
+vnfd-base
vnffgd
vnfr
diff --git a/rwlaunchpad/plugins/rwautoscaler/CMakeLists.txt b/rwlaunchpad/plugins/rwautoscaler/CMakeLists.txt
index 533588e..3a6f538 100644
--- a/rwlaunchpad/plugins/rwautoscaler/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwautoscaler/CMakeLists.txt
@@ -24,7 +24,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
# anything not in a site-packages directory so we have to
@@ -37,5 +37,5 @@
rift/tasklets/${TASKLET_NAME}/engine.py
rift/tasklets/${TASKLET_NAME}/scaling_operation.py
rift/tasklets/${TASKLET_NAME}/subscribers.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
diff --git a/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/engine.py b/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/engine.py
index d71aefc..3bd2645 100644
--- a/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/engine.py
+++ b/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/engine.py
@@ -1,5 +1,5 @@
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,7 +38,8 @@
# 0 -> contains a list of all timestamps
# 1 -> contains a list of all values.
- self._series = numpy.empty(shape=(2, 1), dtype='int64')
+ # self._series = numpy.empty(shape=(2, 1), dtype='int64')
+ self._series = numpy.array([[],[]], dtype='int64')
self.threshold_time = threshold_time
def add_value(self, timestamp, value):
@@ -62,7 +63,7 @@
def is_window_full(self):
"""Verify if there is sufficient data for the current window.
"""
- if len(self._series[0]) <= 2:
+ if len(self._series[0]) < 2:
return False
start_time = self._series[0][0]
@@ -106,6 +107,7 @@
log,
dts,
loop,
+ project,
nsr_id,
monp_id,
scaling_criteria,
@@ -143,6 +145,7 @@
self.log,
self.dts,
self.loop,
+ project,
self.nsr_id,
self.monp_id,
callback=self.add_value)
@@ -175,12 +178,13 @@
"""
if self._timeseries.average() >= self.scale_out:
- # Enable the scale in limit, only when a scale-out has happened.
- self._scl_in_limit_enabled = True
+ self.log.info("Triggering a scaling-out request for the criteria {}".format(
+ self.name))
self.delegate.threshold_out_breached(self.name, avg)
- elif self._timeseries.average() < self.scale_in and self._scl_in_limit_enabled:
- self._scl_in_limit_enabled = False
+ elif self._timeseries.average() < self.scale_in :
+ self.log.info("Triggering a scaling-in request for the criteria {}".format(
+ self.name))
self.delegate.threshold_in_breached(self.name, avg)
@@ -202,6 +206,10 @@
if not self._timeseries.is_window_full():
return
+ self.log.debug("Sufficient sampling data obtained for criteria {}."
+ "Checking the scaling condition for the criteria".format(
+ self.name))
+
if not self.delegate:
return
@@ -211,7 +219,7 @@
class ScalingPolicy(ScalingCriteria.Delegate):
class Delegate:
@abc.abstractmethod
- def scale_in(self, scaling_group_name, nsr_id):
+ def scale_in(self, scaling_group_name, nsr_id, instance_id):
"""Delegate called when all the criteria for scaling-in are met.
Args:
@@ -236,6 +244,7 @@
log,
dts,
loop,
+ project,
nsr_id,
nsd_id,
scaling_group_name,
@@ -258,6 +267,7 @@
self.loop = loop
self.log = log
self.dts = dts
+ self.project = project
self.nsd_id = nsd_id
self.nsr_id = nsr_id
self.scaling_group_name = scaling_group_name
@@ -270,15 +280,25 @@
self.log,
self.dts,
self.loop,
+ self.project,
self.nsr_id,
callback=self.handle_nsr_monp)
+ self.nsr_scale_sub = monp_subscriber.NsrScalingGroupRecordSubscriber(
+ self.log,
+ self.dts,
+ self.loop,
+ self.project,
+ self.nsr_id,
+ self.scaling_group_name)
+
self.criteria_store = {}
# Timestamp at which the scale-in/scale-out request was generated.
self._last_triggered_time = None
self.scale_in_status = {cri.name: False for cri in self.scaling_criteria}
self.scale_out_status = {cri.name: False for cri in self.scaling_criteria}
+ self.scale_out_count = 0
def get_nsd_monp_cfg(self, nsr_monp):
"""Get the NSD's mon-param config.
@@ -294,7 +314,7 @@
Args:
monp : Yang Model
action : rwdts.QueryAction
-
+
"""
def handle_create():
if monp.id in self.criteria_store:
@@ -307,10 +327,14 @@
# Create a criteria object as soon as the first monitoring data
# is published.
+ self.log.debug("Created a ScalingCriteria monitor for {}".format(
+ cri.as_dict()))
+
criteria = ScalingCriteria(
self.log,
self.dts,
self.loop,
+ self.project,
self.nsr_id,
monp.id,
cri,
@@ -365,6 +389,7 @@
@asyncio.coroutine
def register(self):
yield from self.monp_sub.register()
+ yield from self.nsr_scale_sub.register()
def deregister(self):
self.monp_sub.deregister()
@@ -380,6 +405,14 @@
return True
+ def can_trigger_action(self):
+ if self._is_in_cooldown():
+ self.log.debug("In cooldown phase ignoring the scale action ")
+ return False
+
+ return True
+
+
def threshold_in_breached(self, criteria_name, value):
"""Delegate callback when scale-in threshold is breached
@@ -387,19 +420,46 @@
criteria_name : Criteria name
value : Average value
"""
- if self._is_in_cooldown():
+ self.log.debug("Avg value {} has fallen below the threshold limit for "
+ "{}".format(value, criteria_name))
+
+ if not self.can_trigger_action():
+ return
+
+ if self.scale_out_count < 1:
+ self.log.debug('There is no scaled-out VNFs at this point. Hence ignoring the scale-in')
return
self.scale_in_status[criteria_name] = True
+ self.log.info("Applying {} operation to check if all criteria {} for"
+ " scale-in-threshold are met".format(
+ self.scale_out_op,
+ self.scale_out_status))
statuses = self.scale_in_status.values()
is_breached = self.scale_in_op(statuses)
if is_breached and self.delegate:
- self._last_triggered_time = time.time()
- # Reset all statuses
- self.scale_in_status = {cri.name: False for cri in self.scaling_criteria}
- self.delegate.scale_in(self.scaling_group_name, self.nsr_id)
+ self.log.info("Triggering a scale-in action for policy {} as "
+ "all criteria have been met".format(self.name))
+
+ @asyncio.coroutine
+ def check_and_scale_in():
+ # data = yield from self.nsr_scale_sub.data()
+ # if len(data) <= 1:
+ # return
+
+ # # Get an instance ID
+ # instance_id = data[-1].instance_id
+
+ instance_id = 0 #assigning a value to follow existing scale_in signature
+ self._last_triggered_time = time.time()
+ self.scale_out_count -= 1
+ # Reset all statuses
+ self.scale_in_status = {cri.name: False for cri in self.scaling_criteria}
+ self.delegate.scale_in(self.scaling_group_name, self.nsr_id, instance_id)
+
+ self.loop.create_task(check_and_scale_in())
def threshold_out_breached(self, criteria_name, value):
"""Delegate callback when scale-out threshold is breached.
@@ -407,16 +467,27 @@
criteria_name : Criteria name
value : Average value
"""
- if self._is_in_cooldown():
+ self.log.debug("Avg value {} has gone above the threshold limit for "
+ "{}".format(value, criteria_name))
+
+ if not self.can_trigger_action():
return
self.scale_out_status[criteria_name] = True
+ self.log.info("Applying {} operation to check if all criteria {} for"
+ " scale-out-threshold are met".format(
+ self.scale_out_op,
+ self.scale_out_status))
+
statuses = self.scale_out_status.values()
is_breached = self.scale_out_op(statuses)
if is_breached and self.delegate:
+ self.log.info("Triggering a scale-out action for policy {} as "
+ "all criteria have been met".format(self.name))
self._last_triggered_time = time.time()
+ self.scale_out_count += 1
# Reset all statuses
self.scale_out_status = {cri.name: False for cri in self.scaling_criteria}
self.delegate.scale_out(self.scaling_group_name, self.nsr_id)
diff --git a/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/rwautoscaler.py b/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/rwautoscaler.py
index affa579..1741a58 100644
--- a/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/rwautoscaler.py
+++ b/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/rwautoscaler.py
@@ -1,6 +1,6 @@
"""
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -39,10 +39,161 @@
import rift.mano.cloud
import rift.mano.dts as subscriber
import rift.tasklets
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectHandler,
+ )
+
+class AutoScalerProject(ManoProject, engine.ScalingPolicy.Delegate):
+
+ def __init__(self, name, tasklet, **kw):
+ super(AutoScalerProject, self).__init__(tasklet.log, name)
+ self.update(tasklet)
+
+ self.store = None
+ self.monparam_store = None
+ self.nsr_sub = None
+ self.nsr_monp_subscribers = {}
+ self.instance_id_store = collections.defaultdict(list)
+
+ self.store = subscriber.SubscriberStore.from_project(self)
+ self.nsr_sub = subscriber.NsrCatalogSubscriber(self.log, self.dts, self.loop,
+ self, self.handle_nsr)
+
+ def deregister(self):
+ self.log.debug("De-register project {}".format(self.name))
+ self.nsr_sub.deregister()
+ self.store.deregister()
+ @asyncio.coroutine
+ def register (self):
+ self.log.debug("creating vnfr subscriber")
+ yield from self.store.register()
+ yield from self.nsr_sub.register()
-class AutoScalerTasklet(rift.tasklets.Tasklet, engine.ScalingPolicy.Delegate):
+ def scale_in(self, scaling_group_name, nsr_id, instance_id):
+ """Delegate callback
+
+ Args:
+ scaling_group_name (str): Scaling group name to be scaled in
+ nsr_id (str): NSR id
+ instance_id (str): Instance id of the scaling group
+
+ """
+ self.log.info("Sending a scaling-in request for {} in NSR: {}".format(
+ scaling_group_name,
+ nsr_id))
+
+ @asyncio.coroutine
+ def _scale_in():
+
+ # Purposely ignore passed instance_id
+ instance_id_ = self.instance_id_store[(scaling_group_name, nsr_id)].pop()
+ # Trigger an rpc
+ rpc_ip = NsrYang.YangInput_Nsr_ExecScaleIn.from_dict({
+ 'project_name': self.name,
+ 'nsr_id_ref': nsr_id,
+ 'instance_id': instance_id_,
+ 'scaling_group_name_ref': scaling_group_name})
+
+ rpc_out = yield from self.dts.query_rpc(
+ "/nsr:exec-scale-in",
+ 0,
+ rpc_ip)
+
+ # Check for existing scaled-out VNFs if any.
+ if len(self.instance_id_store):
+ self.loop.create_task(_scale_in())
+
+ def scale_out(self, scaling_group_name, nsr_id):
+ """Delegate callback for scale out requests
+
+ Args:
+ scaling_group_name (str): Scaling group name
+ nsr_id (str): NSR ID
+ """
+ self.log.info("Sending a scaling-out request for {} in NSR: {}".format(
+ scaling_group_name,
+ nsr_id))
+
+ @asyncio.coroutine
+ def _scale_out():
+ # Trigger an rpc
+ rpc_ip = NsrYang.YangInput_Nsr_ExecScaleOut.from_dict({
+ 'project_name': self.name,
+ 'nsr_id_ref': nsr_id ,
+ 'scaling_group_name_ref': scaling_group_name})
+
+ itr = yield from self.dts.query_rpc("/nsr:exec-scale-out", 0, rpc_ip)
+
+ key = (scaling_group_name, nsr_id)
+ for res in itr:
+ result = yield from res
+ rpc_out = result.result
+ self.instance_id_store[key].append(rpc_out.instance_id)
+
+ self.log.info("Created new scaling group {} with instance id {}".format(
+ scaling_group_name,
+ rpc_out.instance_id))
+
+ self.loop.create_task(_scale_out())
+
+
+ def handle_nsr(self, nsr, action):
+ """Callback for NSR opdata changes. Creates a publisher for every
+ NS that moves to config state.
+
+ Args:
+ nsr (RwNsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr): Ns Opdata
+ action (rwdts.QueryAction): Action type of the change.
+ """
+ def nsr_create():
+ if nsr.config_status == "configured" and nsr.ns_instance_config_ref not in self.nsr_monp_subscribers:
+ nsr_id = nsr.ns_instance_config_ref
+ self.nsr_monp_subscribers[nsr_id] = []
+ nsd = self.store.get_nsd(nsr.nsd_ref)
+ self.log.debug ("Creating a scaling policy monitor for NSR: {}".format(
+ nsr_id))
+
+ @asyncio.coroutine
+ def task():
+ for scaling_group in nsd.scaling_group_descriptor:
+ for policy_cfg in scaling_group.scaling_policy:
+ policy = engine.ScalingPolicy(
+ self.log, self.dts, self.loop, self,
+ nsr.ns_instance_config_ref,
+ nsr.nsd_ref,
+ scaling_group.name,
+ policy_cfg,
+ self.store,
+ delegate=self)
+ self.nsr_monp_subscribers[nsr_id].append(policy)
+ yield from policy.register()
+ self.log.debug ("Started a scaling policy monitor for NSR: {}".format(
+ nsr_id))
+
+
+ self.loop.create_task(task())
+
+
+ def nsr_delete():
+ if nsr.ns_instance_config_ref in self.nsr_monp_subscribers:
+ policies = self.nsr_monp_subscribers[nsr.ns_instance_config_ref]
+ for policy in policies:
+ policy.deregister()
+ del self.nsr_monp_subscribers[nsr.ns_instance_config_ref]
+ self.log.debug ("Deleted the scaling policy monitor for NSD: {}".format(
+ nsr.ns_instance_config_ref))
+
+
+ if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE]:
+ nsr_create()
+ elif action == rwdts.QueryAction.DELETE:
+ nsr_delete()
+
+
+class AutoScalerTasklet(rift.tasklets.Tasklet):
"""The main task of this Tasklet is to listen for NSR changes and once the
NSR is configured, ScalingPolicy is created.
"""
@@ -50,12 +201,10 @@
try:
super().__init__(*args, **kwargs)
- self.store = None
- self.monparam_store = None
+ self.rwlog.set_category("rw-mano-log")
- self.nsr_sub = None
- self.nsr_monp_subscribers = {}
- self.instance_id_store = collections.defaultdict(list)
+ self._project_handler = None
+ self.projects = {}
except Exception as e:
self.log.exception(e)
@@ -72,9 +221,6 @@
self.on_dts_state_change
)
- self.store = subscriber.SubscriberStore.from_tasklet(self)
- self.nsr_sub = subscriber.NsrCatalogSubscriber(self.log, self.dts, self.loop, self.handle_nsr)
-
self.log.debug("Created DTS Api GI Object: %s", self.dts)
def stop(self):
@@ -85,9 +231,9 @@
@asyncio.coroutine
def init(self):
- self.log.debug("creating vnfr subscriber")
- yield from self.store.register()
- yield from self.nsr_sub.register()
+ self.log.debug("creating project handler")
+ self.project_handler = ProjectHandler(self, AutoScalerProject)
+ self.project_handler.register()
@asyncio.coroutine
def run(self):
@@ -124,107 +270,3 @@
if next_state is not None:
self.dts.handle.set_state(next_state)
- def scale_in(self, scaling_group_name, nsr_id):
- """Delegate callback
-
- Args:
- scaling_group_name (str): Scaling group name to be scaled in
- nsr_id (str): NSR id
-
- """
- self.log.info("Sending a scaling-in request for {} in NSR: {}".format(
- scaling_group_name,
- nsr_id))
-
- @asyncio.coroutine
- def _scale_in():
- instance_id = self.instance_id_store[(scaling_group_name, nsr_id)].pop()
-
- # Trigger an rpc
- rpc_ip = NsrYang.YangInput_Nsr_ExecScaleIn.from_dict({
- 'nsr_id_ref': nsr_id,
- 'instance_id': instance_id,
- 'scaling_group_name_ref': scaling_group_name})
-
- rpc_out = yield from self.dts.query_rpc(
- "/nsr:exec-scale-in",
- 0,
- rpc_ip)
-
- self.loop.create_task(_scale_in())
-
- def scale_out(self, scaling_group_name, nsr_id):
- """Delegate callback for scale out requests
-
- Args:
- scaling_group_name (str): Scaling group name
- nsr_id (str): NSR ID
- """
- self.log.info("Sending a scaling-out request for {} in NSR: {}".format(
- scaling_group_name,
- nsr_id))
-
- @asyncio.coroutine
- def _scale_out():
- # Trigger an rpc
- rpc_ip = NsrYang.YangInput_Nsr_ExecScaleOut.from_dict({
- 'nsr_id_ref': nsr_id ,
- 'scaling_group_name_ref': scaling_group_name})
-
- itr = yield from self.dts.query_rpc("/nsr:exec-scale-out", 0, rpc_ip)
-
- key = (scaling_group_name, nsr_id)
- for res in itr:
- result = yield from res
- rpc_out = result.result
- self.instance_id_store[key].append(rpc_out.instance_id)
-
- self.log.info("Created new scaling group {} with instance id {}".format(
- scaling_group_name,
- rpc_out.instance_id))
-
- self.loop.create_task(_scale_out())
-
-
- def handle_nsr(self, nsr, action):
- """Callback for NSR opdata changes. Creates a publisher for every
- NS that moves to config state.
-
- Args:
- nsr (RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr): Ns Opdata
- action (rwdts.QueryAction): Action type of the change.
- """
- def nsr_create():
- if nsr.config_status == "configured" and nsr.ns_instance_config_ref not in self.nsr_monp_subscribers:
- nsr_id = nsr.ns_instance_config_ref
- self.nsr_monp_subscribers[nsr_id] = []
- nsd = self.store.get_nsd(nsr.nsd_ref)
- @asyncio.coroutine
- def task():
- for scaling_group in nsd.scaling_group_descriptor:
- for policy_cfg in scaling_group.scaling_policy:
- policy = engine.ScalingPolicy(
- self.log, self.dts, self.loop,
- nsr.ns_instance_config_ref,
- nsr.nsd_ref,
- scaling_group.name,
- policy_cfg,
- self.store,
- delegate=self)
- self.nsr_monp_subscribers[nsr_id].append(policy)
- yield from policy.register()
-
- self.loop.create_task(task())
-
-
- def nsr_delete():
- if nsr.ns_instance_config_ref in self.nsr_monp_subscribers:
- policies = self.nsr_monp_subscribers[nsr.ns_instance_config_ref]
- for policy in policies:
- policy.deregister()
- del self.nsr_monp_subscribers[nsr.ns_instance_config_ref]
-
- if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE]:
- nsr_create()
- elif action == rwdts.QueryAction.DELETE:
- nsr_delete()
diff --git a/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/subscribers.py b/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/subscribers.py
index 04185b6..30d494f 100644
--- a/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/subscribers.py
+++ b/rwlaunchpad/plugins/rwautoscaler/rift/tasklets/rwautoscaler/subscribers.py
@@ -1,6 +1,6 @@
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,26 +15,41 @@
# limitations under the License.
#
+import gi
+
import rift.mano.dts as mano_dts
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
class NsrMonParamSubscriber(mano_dts.AbstractOpdataSubscriber):
"""Registers for NSR monitoring parameter changes.
-
+
Attributes:
monp_id (str): Monitoring Param ID
nsr_id (str): NSR ID
"""
- def __init__(self, log, dts, loop, nsr_id, monp_id=None, callback=None):
- super().__init__(log, dts, loop, callback)
+ def __init__(self, log, dts, loop, project, nsr_id, monp_id=None, callback=None):
+ super().__init__(log, dts, loop, project, callback)
self.nsr_id = nsr_id
self.monp_id = monp_id
def get_xpath(self):
- return ("D,/nsr:ns-instance-opdata/nsr:nsr" +
- "[nsr:ns-instance-config-ref='{}']".format(self.nsr_id) +
+ return self.project.add_project("D,/nsr:ns-instance-opdata/nsr:nsr" +
+ "[nsr:ns-instance-config-ref={}]".format(quoted_key(self.nsr_id)) +
"/nsr:monitoring-param" +
- ("[nsr:id='{}']".format(self.monp_id) if self.monp_id else ""))
+ ("[nsr:id={}]".format(quoted_key(self.monp_id)) if self.monp_id else ""))
+class NsrScalingGroupRecordSubscriber(mano_dts.AbstractOpdataSubscriber):
+ def __init__(self, log, dts, loop, project, nsr_id, scaling_group, callback=None):
+ super().__init__(log, dts, loop, project, callback)
+ self.nsr_id = nsr_id
+ self.scaling_group = scaling_group
+
+ def get_xpath(self):
+ return self.project.add_project("D,/nsr:ns-instance-opdata/nsr:nsr" +
+ "[nsr:ns-instance-config-ref={}]".format(quoted_key(self.nsr_id)) +
+ "/nsr:scaling-group-record" +
+ "[nsr:scaling-group-name-ref={}]/instance".format(quoted_key(self.scaling_group)))
diff --git a/rwlaunchpad/plugins/rwautoscaler/test/utest_autoscaler_dts.py b/rwlaunchpad/plugins/rwautoscaler/test/utest_autoscaler_dts.py
index c00ca11..d40c285 100644
--- a/rwlaunchpad/plugins/rwautoscaler/test/utest_autoscaler_dts.py
+++ b/rwlaunchpad/plugins/rwautoscaler/test/utest_autoscaler_dts.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python3
-#
+
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,32 +19,35 @@
import argparse
import asyncio
+import gi
+import logging
import os
+import random
import sys
import unittest
-import random
-
import xmlrunner
+
import unittest.mock as mock
import rift.test.dts
import rift.tasklets.rwautoscaler.engine as engine
-import gi
gi.require_version('RwDtsYang', '1.0')
from gi.repository import (
RwNsrYang,
NsrYang,
- NsdYang,
+ ProjectNsdYang as NsdYang,
RwLaunchpadYang as launchpadyang,
RwVnfrYang,
- RwVnfdYang,
- RwNsdYang,
+ RwProjectVnfdYang as RwVnfdYang,
+ RwProjectNsdYang as RwNsdYang,
VnfrYang
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
-ScalingCriteria = NsdYang.YangData_Nsd_NsdCatalog_Nsd_ScalingGroupDescriptor_ScalingPolicy_ScalingCriteria
-ScalingPolicy = NsdYang.YangData_Nsd_NsdCatalog_Nsd_ScalingGroupDescriptor_ScalingPolicy
+ScalingCriteria = NsdYang.YangData_RwProject_Project_NsdCatalog_Nsd_ScalingGroupDescriptor_ScalingPolicy_ScalingCriteria
+ScalingPolicy = NsdYang.YangData_RwProject_Project_NsdCatalog_Nsd_ScalingGroupDescriptor_ScalingPolicy
class MockDelegate(engine.ScalingCriteria.Delegate):
@@ -68,12 +72,12 @@
def __init__(self, aggregation_type="AVERAGE", legacy=False):
self.aggregation_type = aggregation_type
self.legacy = legacy
- self.threshold_time = 3
+ self.threshold_time = 2
def __call__(self):
store = mock.MagicMock()
- mock_vnfd = RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd.from_dict({
+ mock_vnfd = RwVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd.from_dict({
'id': "1",
'monitoring_param': [
{'description': 'no of ping requests',
@@ -98,12 +102,12 @@
store.get_vnfd = mock.MagicMock(return_value=mock_vnfd)
- mock_vnfr = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr.from_dict({'id': '1'})
- mock_vnfr.vnfd = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vnfd.from_dict({'id': '1'})
+ mock_vnfr = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr.from_dict({'id': '1'})
+ mock_vnfr.vnfd = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vnfd.from_dict({'id': '1'})
store.get_vnfr = mock.MagicMock(return_value=mock_vnfr)
- mock_nsr = RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr.from_dict({
+ mock_nsr = RwNsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr.from_dict({
'ns_instance_config_ref': "1",
'name_ref': "Foo",
'nsd_ref': '1',
@@ -138,8 +142,10 @@
scale_in_val = 100
scale_out_val = 200
- mock_nsd = RwNsdYang.YangData_Nsd_NsdCatalog_Nsd.from_dict({
+ mock_nsd = RwNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd.from_dict({
'id': '1',
+ 'name': 'mock',
+ 'short_name': 'm',
'monitoring_param': (monp_cfg if not self.legacy else []),
'constituent_vnfd': [{'member_vnf_index': 1,
'start_by_default': True,
@@ -206,17 +212,17 @@
def _populate_mock_values(self, criterias, nsr_id, floor, ceil):
# Mock publish
# Verify Scale in AND operator
- NsMonParam = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_MonitoringParam
+ NsMonParam = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_MonitoringParam
publisher = rift.test.dts.DescriptorPublisher(self.log, self.dts, self.loop)
for criteria in criterias:
monp_id = criteria.ns_monitoring_param_ref
- w_xpath = "D,/nsr:ns-instance-opdata/nsr:nsr"
- w_xpath = w_xpath + "[nsr:ns-instance-config-ref='{}']/nsr:monitoring-param".format(nsr_id)
- xpath = w_xpath + "[nsr:id ='{}']".format(monp_id)
+ w_xpath = "D,/rw-project:project/nsr:ns-instance-opdata/nsr:nsr"
+ w_xpath = w_xpath + "[nsr:ns-instance-config-ref={}]/nsr:monitoring-param".format(quoted_key(nsr_id))
+ xpath = w_xpath + "[nsr:id={}]".format(quoted_key(monp_id))
- for i in range(self.mock_store.threshold_time + 1):
+ for i in range(self.mock_store.threshold_time + 2):
value = random.randint(floor, ceil)
monp = NsMonParam.from_dict({
@@ -259,7 +265,7 @@
yield from self._populate_mock_values(policy.scaling_criteria, nsr_id, floor, ceil)
assert mock_delegate.scale_in_called == 0
- # Test 2: AND operation
+ # Test 2: AND operation
yield from scale_out(policy)
yield from self._populate_mock_values(policy.scaling_criteria, nsr_id, floor, ceil)
assert mock_delegate.scale_in_called == 1
@@ -283,13 +289,13 @@
assert mock_delegate.scale_in_called == 1
@rift.test.dts.async_test
- def _test_scale_out(self):
+ def test_scale_out(self):
""" Tests scale out
Asserts:
1. Scale out
2. Scale out doesn't happen during cooldown
- 3. AND operation
+ 3. AND operation
4. OR operation.
"""
store = self.mock_store()
@@ -334,6 +340,7 @@
def main():
+ logging.basicConfig(format='TEST %(message)s')
runner = xmlrunner.XMLTestRunner(output=os.environ["RIFT_MODULE_TEST"])
parser = argparse.ArgumentParser()
@@ -343,6 +350,9 @@
if args.no_runner:
runner = None
+ # Set the global logging level
+ logging.getLogger().setLevel(logging.DEBUG if args.verbose else logging.ERROR)
+
unittest.main(testRunner=runner, argv=[sys.argv[0]] + unittest_args)
diff --git a/rwlaunchpad/plugins/rwimagemgr/CMakeLists.txt b/rwlaunchpad/plugins/rwimagemgr/CMakeLists.txt
index 58b3429..452483c 100644
--- a/rwlaunchpad/plugins/rwimagemgr/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwimagemgr/CMakeLists.txt
@@ -24,7 +24,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
# anything not in a site-packages directory so we have to
@@ -40,14 +40,14 @@
rift/tasklets/rwimagemgr/lib/__init__.py
rift/tasklets/rwimagemgr/lib/quickproxy/__init__.py
rift/tasklets/rwimagemgr/lib/quickproxy/proxy.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
rift_python_install_tree(
FILES
rift/imagemgr/__init__.py
rift/imagemgr/client.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
install(
@@ -55,7 +55,7 @@
bin/glance_start_wrapper
DESTINATION
usr/bin
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
)
if($ENV{RIFT_PLATFORM} MATCHES "fc20")
@@ -70,7 +70,7 @@
etc/fc20/glance-api-dist-paste.ini
DESTINATION
etc/glance
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
)
elseif($ENV{RIFT_PLATFORM} MATCHES "ub16")
install(
@@ -85,7 +85,7 @@
etc/ub16/schema-image.json
DESTINATION
etc/glance
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
)
else()
message(FATAL_ERROR "Unknown platform $ENV{RIFT_PLATFORM}")
diff --git a/rwlaunchpad/plugins/rwimagemgr/bin/upload_image.py b/rwlaunchpad/plugins/rwimagemgr/bin/upload_image.py
index 3870c50..f6b40ff 100755
--- a/rwlaunchpad/plugins/rwimagemgr/bin/upload_image.py
+++ b/rwlaunchpad/plugins/rwimagemgr/bin/upload_image.py
@@ -43,7 +43,7 @@
def create_account(log):
- account_msg = RwCloudYang.CloudAccount.from_dict(dict(
+ account_msg = RwCloudYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList.from_dict(dict(
name="openstack",
account_type="openstack",
openstack=dict(
diff --git a/rwlaunchpad/plugins/rwimagemgr/etc/fc20/glance-api.conf b/rwlaunchpad/plugins/rwimagemgr/etc/fc20/glance-api.conf
index 4f11820..24fa497 100644
--- a/rwlaunchpad/plugins/rwimagemgr/etc/fc20/glance-api.conf
+++ b/rwlaunchpad/plugins/rwimagemgr/etc/fc20/glance-api.conf
@@ -29,7 +29,7 @@
#image_size_cap = 1099511627776
# Address to bind the API server
-bind_host = 0.0.0.0
+bind_host = 127.0.0.1
# Port the bind the API server to
bind_port = 9292
diff --git a/rwlaunchpad/plugins/rwimagemgr/etc/fc20/glance-registry.conf b/rwlaunchpad/plugins/rwimagemgr/etc/fc20/glance-registry.conf
index 2529d1c..9fac70f 100644
--- a/rwlaunchpad/plugins/rwimagemgr/etc/fc20/glance-registry.conf
+++ b/rwlaunchpad/plugins/rwimagemgr/etc/fc20/glance-registry.conf
@@ -6,7 +6,7 @@
debug=True
# Address to bind the registry server
-bind_host = 0.0.0.0
+bind_host = 127.0.0.1
# Port the bind the registry server to
bind_port = 9191
diff --git a/rwlaunchpad/plugins/rwimagemgr/etc/ub16/glance-api.conf b/rwlaunchpad/plugins/rwimagemgr/etc/ub16/glance-api.conf
index 65e2e8d..0fc0aa9 100644
--- a/rwlaunchpad/plugins/rwimagemgr/etc/ub16/glance-api.conf
+++ b/rwlaunchpad/plugins/rwimagemgr/etc/ub16/glance-api.conf
@@ -160,7 +160,7 @@
# Address to bind the server. Useful when selecting a particular
# network interface. (string value)
-bind_host = 0.0.0.0
+bind_host = 127.0.0.1
# The port on which the server will listen. (port value)
# Minimum value: 0
diff --git a/rwlaunchpad/plugins/rwimagemgr/etc/ub16/glance-registry.conf b/rwlaunchpad/plugins/rwimagemgr/etc/ub16/glance-registry.conf
index 0fb7ed0..3912c40 100644
--- a/rwlaunchpad/plugins/rwimagemgr/etc/ub16/glance-registry.conf
+++ b/rwlaunchpad/plugins/rwimagemgr/etc/ub16/glance-registry.conf
@@ -131,7 +131,7 @@
# Address to bind the server. Useful when selecting a particular
# network interface. (string value)
-bind_host = 0.0.0.0
+bind_host = 127.0.0.1
# The port on which the server will listen. (port value)
# Minimum value: 0
diff --git a/rwlaunchpad/plugins/rwimagemgr/rift/imagemgr/client.py b/rwlaunchpad/plugins/rwimagemgr/rift/imagemgr/client.py
index 10df45b..6dcabac 100644
--- a/rwlaunchpad/plugins/rwimagemgr/rift/imagemgr/client.py
+++ b/rwlaunchpad/plugins/rwimagemgr/rift/imagemgr/client.py
@@ -1,6 +1,6 @@
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,12 +17,16 @@
import asyncio
import concurrent.futures
-
import gi
+
+from rift.mano.utils.project import ManoProject
+
gi.require_version("RwImageMgmtYang", "1.0")
from gi.repository import (
RwImageMgmtYang,
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
class UploadJobError(Exception):
@@ -48,7 +52,7 @@
self._loop = loop
self._dts = dts
- def create_job(self, image_name, image_checksum, cloud_account_names=None):
+ def create_job(self, image_name, image_checksum, project, cloud_account_names=None):
""" Create an image upload_job and return an UploadJob instance
Arguments:
@@ -60,7 +64,11 @@
Returns:
An UploadJob instance
"""
- create_job_msg = RwImageMgmtYang.CreateUploadJob.from_dict({
+ self._log.debug("Project {}: Create image upload job for image {} to {}".
+ format(project, image_name, cloud_account_names))
+
+ create_job_msg = RwImageMgmtYang.YangInput_RwImageMgmt_CreateUploadJob.from_dict({
+ "project_name": project,
"onboarded_image": {
"image_name": image_name,
"image_checksum": image_checksum,
@@ -81,9 +89,9 @@
job_id = rpc_result.job_id
- return UploadJob(self._log, self._loop, self._dts, job_id)
+ return UploadJob(self._log, self._loop, self._dts, job_id, project)
- def create_job_threadsafe(self, image_name, image_checksum, cloud_account_names=None):
+ def create_job_threadsafe(self, image_name, image_checksum, project, cloud_account_names=None):
""" A thread-safe, syncronous wrapper for create_job """
future = concurrent.futures.Future()
@@ -96,7 +104,7 @@
def add_task():
task = self._loop.create_task(
- self.create_job(image_name, image_checksum, cloud_account_names)
+ self.create_job(image_name, image_checksum, project, cloud_account_names)
)
task.add_done_callback(on_done)
@@ -106,11 +114,12 @@
class UploadJob(object):
""" A handle for a image upload job """
- def __init__(self, log, loop, dts, job_id):
+ def __init__(self, log, loop, dts, job_id, project):
self._log = log
self._loop = loop
self._dts = dts
self._job_id = job_id
+ self._project = project
@asyncio.coroutine
def wait_until_complete(self):
@@ -122,12 +131,14 @@
UploadJobCancelled: The upload job was cancelled
"""
self._log.debug("waiting for upload job %s to complete", self._job_id)
+ xpath = ManoProject.prefix_project("D,/rw-image-mgmt:upload-jobs/" +
+ "rw-image-mgmt:job[rw-image-mgmt:id={}]".
+ format(quoted_key(str(self._job_id))),
+ project=self._project,
+ log=self._log)
+
while True:
- query_iter = yield from self._dts.query_read(
- "D,/rw-image-mgmt:upload-jobs/rw-image-mgmt:job[rw-image-mgmt:id='{}']".format(
- self._job_id
- )
- )
+ query_iter = yield from self._dts.query_read(xpath)
job_status_msg = None
for fut_resp in query_iter:
job_status_msg = (yield from fut_resp).result
diff --git a/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/glance_client.py b/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/glance_client.py
index 614c152..a5a1929 100644
--- a/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/glance_client.py
+++ b/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/glance_client.py
@@ -329,7 +329,7 @@
create_args = dict(
location=image_url,
name=image_name,
- is_public="True",
+ is_public="False",
disk_format=disk_format,
container_format=container_format,
)
diff --git a/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/glance_proxy_server.py b/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/glance_proxy_server.py
index 9b3972e..2b3c1ad 100644
--- a/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/glance_proxy_server.py
+++ b/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/glance_proxy_server.py
@@ -175,7 +175,8 @@
req_callback=on_http_request,
resp_callback=on_http_response,
io_loop=io_loop,
- debug_level=QuickProxyServer.DEBUG_LEVEL
+ debug_level=QuickProxyServer.DEBUG_LEVEL,
+ address="127.0.0.1",
)
def stop(self):
diff --git a/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/lib/quickproxy/proxy.py b/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/lib/quickproxy/proxy.py
index 7a7d85b..e09aceb 100644
--- a/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/lib/quickproxy/proxy.py
+++ b/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/lib/quickproxy/proxy.py
@@ -380,6 +380,7 @@
test_ssl=False,
debug_level=0,
io_loop=None,
+ address="",
):
"""
@@ -423,7 +424,7 @@
kwargs = {"io_loop": io_loop}
http_server = tornado.httpserver.HTTPServer(app, **kwargs)
- http_server.listen(port)
+ http_server.listen(port, address)
return http_server
diff --git a/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/tasklet.py b/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/tasklet.py
index 027e582..9ea9cbc 100644
--- a/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/tasklet.py
+++ b/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/tasklet.py
@@ -22,6 +22,13 @@
import rift.tasklets
import rift.mano.cloud
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectConfigCallbacks,
+ ProjectHandler,
+ get_add_delete_update_cfgs,
+ DEFAULT_PROJECT,
+ )
from . import glance_proxy_server
from . import glance_client
@@ -53,22 +60,30 @@
class CloudAccountDtsHandler(object):
- def __init__(self, log, dts, log_hdl):
+ def __init__(self, log, dts, log_hdl, project):
self._dts = dts
self._log = log
self._log_hdl = log_hdl
self._cloud_cfg_subscriber = None
+ self._project = project
+ @asyncio.coroutine
def register(self, on_add_apply, on_delete_apply):
- self._log.debug("creating cloud account config handler")
+ self._log.debug("Project {}: creating cloud account config handler".
+ format(self._project.name))
self._cloud_cfg_subscriber = rift.mano.cloud.CloudAccountConfigSubscriber(
- self._dts, self._log, self._log_hdl,
+ self._dts, self._log, self._log_hdl, self._project,
rift.mano.cloud.CloudAccountConfigCallbacks(
on_add_apply=on_add_apply,
on_delete_apply=on_delete_apply,
)
)
- self._cloud_cfg_subscriber.register()
+ yield from self._cloud_cfg_subscriber.register()
+
+ def deregister(self):
+ self._log.debug("Project {}: Removing cloud account config handler".
+ format(self._project.name))
+ self._cloud_cfg_subscriber.deregister()
def openstack_image_to_image_info(openstack_image):
@@ -81,13 +96,19 @@
A ImageInfo CAL protobuf message
"""
- image_info = RwcalYang.ImageInfoItem()
+ image_info = RwcalYang.YangData_RwProject_Project_VimResources_ImageinfoList()
copy_fields = ["id", "name", "checksum", "container_format", "disk_format"]
for field in copy_fields:
value = getattr(openstack_image, field)
setattr(image_info, field, value)
+ value = getattr(openstack_image, "properties")
+ for key in value:
+ prop = image_info.properties.add()
+ prop.name = key
+ prop.property_value = value[key]
+
image_info.state = openstack_image.status
return image_info
@@ -95,19 +116,21 @@
class ImageDTSShowHandler(object):
""" A DTS publisher for the upload-jobs data container """
- def __init__(self, log, loop, dts, job_controller):
- self._log = log
- self._loop = loop
- self._dts = dts
+ def __init__(self, project, job_controller):
+ self._log = project.log
+ self._loop = project.loop
+ self._dts = project.dts
self._job_controller = job_controller
+ self._project = project
self._subscriber = None
+ def get_xpath(self):
+ return self._project.add_project("D,/rw-image-mgmt:upload-jobs")
+
@asyncio.coroutine
def register(self):
""" Register as a publisher and wait for reg_ready to complete """
- def get_xpath():
- return "D,/rw-image-mgmt:upload-jobs"
@asyncio.coroutine
def on_prepare(xact_info, action, ks_path, msg):
@@ -119,7 +142,7 @@
xact_info.respond_xpath(
rwdts.XactRspCode.ACK,
- xpath=get_xpath(),
+ xpath=self.get_xpath(),
msg=jobs_pb_msg,
)
@@ -130,7 +153,7 @@
reg_event.set()
self._subscriber = yield from self._dts.register(
- xpath=get_xpath(),
+ xpath=self.get_xpath(),
handler=rift.tasklets.DTS.RegistrationHandler(
on_prepare=on_prepare,
on_ready=on_ready,
@@ -141,18 +164,31 @@
yield from reg_event.wait()
+ def deregister(self):
+ self._log.debug("Project {}: De-register show image handler".
+ format(self._project.name))
+ if self._subscriber:
+ self._subscriber.delete_element(self.get_xpath())
+ self._subscriber.deregister()
+ self._subscriber = None
+
class ImageDTSRPCHandler(object):
""" A DTS publisher for the upload-job RPC's """
- def __init__(self, log, loop, dts, accounts, glance_client, upload_task_creator, job_controller):
- self._log = log
- self._loop = loop
- self._dts = dts
- self._accounts = accounts
+ def __init__(self, project, glance_client, upload_task_creator, job_controller):
+ self._log = project.log
+ self._loop = project.loop
+ self._dts = project.dts
self._glance_client = glance_client
self._upload_task_creator = upload_task_creator
self._job_controller = job_controller
+ self._project = project
- self._subscriber = None
+ self._create = None
+ self._cancel = None
+
+ @property
+ def accounts(self):
+ return self._project.cloud_accounts
@asyncio.coroutine
def _register_create_upload_job(self):
@@ -164,13 +200,20 @@
create_msg = msg
account_names = create_msg.cloud_account
+
+ self._log.debug("Create upload job msg: {} ".format(msg.as_dict()))
+
+ if not self._project.rpc_check(msg, xact_info):
+ return
+
# If cloud accounts were not specified, upload image to all cloud account
if not account_names:
- account_names = list(self._accounts.keys())
+ account_names = list(self.accounts.keys())
- for account_name in account_names:
- if account_name not in self._accounts:
- raise AccountNotFoundError("Could not find account %s", account_name)
+ else:
+ for account_name in account_names:
+ if account_name not in self.accounts:
+ raise AccountNotFoundError("Could not find account %s", account_name)
if create_msg.has_field("external_url"):
glance_image = yield from self._upload_task_creator.create_glance_image_from_url_create_rpc(
@@ -195,6 +238,8 @@
)
elif create_msg.has_field("onboarded_image"):
+ self._log.debug("onboarded_image {} to accounts {}".
+ format(create_msg.onboarded_image, account_names))
tasks = yield from self._upload_task_creator.create_tasks_from_onboarded_create_rpc(
account_names, create_msg.onboarded_image
)
@@ -203,7 +248,7 @@
else:
raise ImageRequestError("an image selection must be provided")
- rpc_out_msg = RwImageMgmtYang.CreateUploadJobOutput(job_id=job_id)
+ rpc_out_msg = RwImageMgmtYang.YangOutput_RwImageMgmt_CreateUploadJob(job_id=job_id)
xact_info.respond_xpath(
rwdts.XactRspCode.ACK,
@@ -217,14 +262,14 @@
def on_ready(_, status):
reg_event.set()
- self._subscriber = yield from self._dts.register(
- xpath="I," + get_xpath(),
- handler=rift.tasklets.DTS.RegistrationHandler(
- on_prepare=on_prepare,
- on_ready=on_ready,
- ),
- flags=rwdts.Flag.PUBLISHER,
- )
+ self._create = yield from self._dts.register(
+ xpath="I," + get_xpath(),
+ handler=rift.tasklets.DTS.RegistrationHandler(
+ on_prepare=on_prepare,
+ on_ready=on_ready,
+ ),
+ flags=rwdts.Flag.PUBLISHER,
+ )
yield from reg_event.wait()
@@ -235,6 +280,9 @@
@asyncio.coroutine
def on_prepare(xact_info, action, ks_path, msg):
+ if not self._project.rpc_check(msg, xact_info):
+ return
+
if not msg.has_field("job_id"):
self._log.error("cancel-upload-job missing job-id field.")
xact_info.respond_xpath(rwdts.XactRspCode.NACK)
@@ -256,14 +304,14 @@
def on_ready(_, status):
reg_event.set()
- self._subscriber = yield from self._dts.register(
- xpath="I," + get_xpath(),
- handler=rift.tasklets.DTS.RegistrationHandler(
- on_prepare=on_prepare,
- on_ready=on_ready,
- ),
- flags=rwdts.Flag.PUBLISHER,
- )
+ self._cancel = yield from self._dts.register(
+ xpath="I," + get_xpath(),
+ handler=rift.tasklets.DTS.RegistrationHandler(
+ on_prepare=on_prepare,
+ on_ready=on_ready,
+ ),
+ flags=rwdts.Flag.PUBLISHER,
+ )
yield from reg_event.wait()
@@ -273,16 +321,31 @@
yield from self._register_create_upload_job()
yield from self._register_cancel_upload_job()
+ def deregister(self):
+ self._log.debug("Project {}: Deregister image rpc handlers".
+ format(self._project.name))
+ if self._create:
+ self._create.deregister()
+ self._create = None
+
+ if self._cancel:
+ self._cancel.deregister()
+ self._cancel = None
+
class GlanceClientUploadTaskCreator(object):
""" This class creates upload tasks using configured cloud accounts and
configured image catalog glance client """
- def __init__(self, log, loop, accounts, glance_client):
- self._log = log
- self._loop = loop
- self._accounts = accounts
+ def __init__(self, project, glance_client):
+ self._log = project.log
+ self._loop = project.loop
self._glance_client = glance_client
+ self._project = project
+
+ @property
+ def accounts(self):
+ return self._project.cloud_accounts
@asyncio.coroutine
def create_tasks(self, account_names, image_id=None, image_name=None, image_checksum=None):
@@ -329,14 +392,14 @@
tasks = []
for account_name in account_names:
- if account_name not in self._accounts:
+ if account_name not in self.accounts:
raise AccountNotFoundError("Could not find account %s", account_name)
# For each account name provided, create a pipe (GlanceImagePipeGen)
# which feeds data into the UploadTask while also monitoring the various
# transmit stats (progress, bytes written, bytes per second, etc)
for account_name in account_names:
- account = self._accounts[account_name]
+ account = self.accounts[account_name]
self._log.debug("creating task for account %s", account.name)
glance_data_gen = self._glance_client.get_image_data(image_info.id)
@@ -397,6 +460,75 @@
create_msg.image_checksum if "image_checksum" in create_msg else None)
)
+class ImageMgrProject(ManoProject):
+
+ def __init__(self, name, tasklet, **kw):
+ super(ImageMgrProject, self).__init__(tasklet.log, name)
+ self.update(tasklet)
+ try:
+ self.glance_client = kw['client']
+ except KeyError as e:
+ self._log.exception("kw {}: {}".format(kw, e))
+
+ self.cloud_cfg_subscriber = None
+ self.job_controller = None
+ self.task_creator = None
+ self.rpc_handler = None
+ self.show_handler = None
+
+ self.cloud_accounts = {}
+
+ @asyncio.coroutine
+ def register(self):
+ try:
+ self.log.debug("creating cloud account handler")
+ self.cloud_cfg_subscriber = CloudAccountDtsHandler(self._log,
+ self._dts,
+ self._log_hdl,
+ self)
+ yield from self.cloud_cfg_subscriber.register(
+ self.on_cloud_account_create,
+ self.on_cloud_account_delete
+ )
+
+ self.job_controller = upload.ImageUploadJobController(
+ self
+ )
+
+ self.task_creator = GlanceClientUploadTaskCreator(
+ self, self.glance_client,
+ )
+
+ self.rpc_handler = ImageDTSRPCHandler(
+ self, self.glance_client, self.task_creator,
+ self.job_controller,
+ )
+ yield from self.rpc_handler.register()
+
+ self.show_handler = ImageDTSShowHandler(
+ self, self.job_controller,
+ )
+ yield from self.show_handler.register()
+ except Exception as e:
+ self.log.exception("Error during project {} register: e".
+ format(self.name, e))
+
+ def deregister(self):
+ self.log.debug("De-register handlers for project: {}".format(self.name))
+ self.rpc_handler.deregister()
+ self.show_handler.deregister()
+ self.cloud_cfg_subscriber.deregister()
+
+ def on_cloud_account_create(self, account):
+ self.log.debug("adding cloud account: %s", account.name)
+ self.cloud_accounts[account.name] = account
+
+ def on_cloud_account_delete(self, account_name):
+ self.log.debug("deleting cloud account: %s", account_name)
+ if account_name not in self.cloud_accounts:
+ self.log.warning("cloud account not found: %s", account_name)
+ else:
+ del self.cloud_accounts[account_name]
class ImageManagerTasklet(rift.tasklets.Tasklet):
"""
@@ -409,16 +541,13 @@
super().__init__(*args, **kwargs)
self.rwlog.set_category("rw-mano-log")
- self.cloud_cfg_subscriber = None
self.http_proxy = None
self.proxy_server = None
self.dts = None
- self.job_controller = None
- self.cloud_accounts = {}
self.glance_client = None
- self.task_creator = None
- self.rpc_handler = None
- self.show_handler = None
+ self.project_handler = None
+
+ self.projects = {}
def start(self):
super().start()
@@ -443,13 +572,6 @@
@asyncio.coroutine
def init(self):
try:
- self.log.debug("creating cloud account handler")
- self.cloud_cfg_subscriber = CloudAccountDtsHandler(self.log, self.dts, self.log_hdl)
- self.cloud_cfg_subscriber.register(
- self.on_cloud_account_create,
- self.on_cloud_account_delete
- )
-
self.log.debug("creating http proxy server")
self.http_proxy = glance_proxy_server.QuickProxyServer(self.log, self.loop)
@@ -459,43 +581,18 @@
)
self.proxy_server.start()
- self.job_controller = upload.ImageUploadJobController(
- self.log, self.loop
- )
-
self.glance_client = glance_client.OpenstackGlanceClient.from_token(
self.log, "127.0.0.1", "9292", "test"
)
- self.task_creator = GlanceClientUploadTaskCreator(
- self.log, self.loop, self.cloud_accounts, self.glance_client
- )
-
- self.rpc_handler = ImageDTSRPCHandler(
- self.log, self.loop, self.dts, self.cloud_accounts, self.glance_client, self.task_creator,
- self.job_controller
- )
- yield from self.rpc_handler.register()
-
- self.show_handler = ImageDTSShowHandler(
- self.log, self.loop, self.dts, self.job_controller
- )
- yield from self.show_handler.register()
+ self.log.debug("Creating project handler")
+ self.project_handler = ProjectHandler(self, ImageMgrProject,
+ client=self.glance_client)
+ self.project_handler.register()
except Exception as e:
self.log.exception("error during init")
- def on_cloud_account_create(self, account):
- self.log.debug("adding cloud account: %s", account.name)
- self.cloud_accounts[account.name] = account
-
- def on_cloud_account_delete(self, account_name):
- self.log.debug("deleting cloud account: %s", account_name)
- if account_name not in self.cloud_accounts:
- self.log.warning("cloud account not found: %s", account_name)
-
- del self.cloud_accounts[account_name]
-
@asyncio.coroutine
def run(self):
pass
diff --git a/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/upload.py b/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/upload.py
index c1716d3..ed79f3d 100644
--- a/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/upload.py
+++ b/rwlaunchpad/plugins/rwimagemgr/rift/tasklets/rwimagemgr/upload.py
@@ -51,9 +51,10 @@
""" This class starts and manages ImageUploadJobs """
MAX_COMPLETED_JOBS = 20
- def __init__(self, log, loop, max_completed_jobs=MAX_COMPLETED_JOBS):
- self._log = log
- self._loop = loop
+ def __init__(self, project, max_completed_jobs=MAX_COMPLETED_JOBS):
+ self._log = project.log
+ self._loop = project.loop
+ self._project = project
self._job_id_gen = itertools.count(1)
self._max_completed_jobs = max_completed_jobs
@@ -65,7 +66,7 @@
@property
def pb_msg(self):
""" the UploadJobs protobuf message """
- upload_jobs_msg = RwImageMgmtYang.UploadJobs()
+ upload_jobs_msg = RwImageMgmtYang.YangData_RwProject_Project_UploadJobs()
for job in self._jobs.values():
upload_jobs_msg.job.append(job.pb_msg)
@@ -210,7 +211,7 @@
@property
def pb_msg(self):
""" The UploadJob protobuf message """
- task = RwImageMgmtYang.UploadJob.from_dict({
+ task = RwImageMgmtYang.YangData_RwProject_Project_UploadJobs_Job.from_dict({
"id": self._job_id,
"status": self._state,
"start_time": self._start_time,
@@ -367,14 +368,17 @@
""" Start the rate monitoring task """
@asyncio.coroutine
def periodic_rate_task():
- while True:
- start_time = time.time()
- start_bytes = self._bytes_written
- yield from asyncio.sleep(1, loop=self._loop)
- time_period = time.time() - start_time
- num_bytes = self._bytes_written - start_bytes
+ try:
+ while True:
+ start_time = time.time()
+ start_bytes = self._bytes_written
+ yield from asyncio.sleep(1, loop=self._loop)
+ time_period = time.time() - start_time
+ num_bytes = self._bytes_written - start_bytes
- self._byte_rate = self._rate_calc.add_measurement(num_bytes, time_period)
+ self._byte_rate = self._rate_calc.add_measurement(num_bytes, time_period)
+ except asyncio.CancelledError:
+ self._log.debug("rate monitoring task cancelled")
self._log.debug("starting rate monitoring task")
self._rate_task = self._loop.create_task(periodic_rate_task())
@@ -421,6 +425,9 @@
self._write_hdl = os.fdopen(write_fd, 'wb')
self._close_hdl = self._write_hdl
+ self._stop = False
+ self._t = None
+
@property
def write_hdl(self):
return self._write_hdl
@@ -437,6 +444,9 @@
self._log.debug("starting image data write to pipe")
try:
for data in self._data_gen:
+ if self._stop:
+ break
+
try:
self._write_hdl.write(data)
except (BrokenPipeError, ValueError) as e:
@@ -458,9 +468,13 @@
t.daemon = True
t.start()
+ self._t = t
+
def stop(self):
self._log.debug("stop requested, closing write side of pipe")
- self._write_hdl.close()
+ self._stop = True
+ if self._t is not None:
+ self._t.join(timeout=1)
class AccountImageUploadTask(object):
@@ -543,7 +557,7 @@
@property
def pb_msg(self):
""" The UploadTask protobuf message """
- task = RwImageMgmtYang.UploadTask.from_dict({
+ task = RwImageMgmtYang.YangData_RwProject_Project_UploadJobs_Job_UploadTasks.from_dict({
"cloud_account": self.cloud_account,
"image_id": self.image_id,
"image_name": self.image_name,
diff --git a/rwlaunchpad/plugins/rwimagemgr/test/utest_dts_handlers.py b/rwlaunchpad/plugins/rwimagemgr/test/utest_dts_handlers.py
index 7ba4f76..d39b306 100755
--- a/rwlaunchpad/plugins/rwimagemgr/test/utest_dts_handlers.py
+++ b/rwlaunchpad/plugins/rwimagemgr/test/utest_dts_handlers.py
@@ -45,6 +45,7 @@
from rift.tasklets.rwimagemgr import tasklet
from rift.tasklets.rwimagemgr import upload
+from rift.mano.utils.project import ManoProject, DEFAULT_PROJECT
from rift.test.dts import async_test
@@ -75,17 +76,19 @@
def configure_test(self, loop, test_id):
self.log.debug("STARTING - %s", self.id())
self.tinfo = self.new_tinfo(self.id())
- self.dts = rift.tasklets.DTS(self.tinfo, self.schema, self.loop)
+
+ self.project = ManoProject(self.log, name=DEFAULT_PROJECT)
+ self.project._dts = rift.tasklets.DTS(self.tinfo, self.schema, self.loop)
+ self.project.cloud_accounts = {'mock'}
self.task_creator_mock = create_upload_task_creator_mock()
self.job_controller_mock = create_job_controller_mock()
self.rpc_handler = tasklet.ImageDTSRPCHandler(
- self.log, self.loop, self.dts, {'mock', None}, object(), self.task_creator_mock,
+ self.project, object(), self.task_creator_mock,
self.job_controller_mock
)
self.show_handler = tasklet.ImageDTSShowHandler(
- self.log, self.loop, self.dts, self.job_controller_mock
- )
+ self.project, self.job_controller_mock)
self.tinfo_c = self.new_tinfo(self.id() + "_client")
self.dts_c = rift.tasklets.DTS(self.tinfo_c, self.schema, self.loop)
@@ -103,7 +106,7 @@
self.task_creator_mock.create_tasks_from_onboarded_create_rpc.return_value = [upload_task]
self.job_controller_mock.create_job.return_value = 2
type(self.job_controller_mock).pb_msg = unittest.mock.PropertyMock(
- return_value=RwImageMgmtYang.UploadJobs.from_dict({
+ return_value=RwImageMgmtYang.YangData_RwProject_Project_UploadJobs.from_dict({
"job": [
{
"id": 2,
@@ -114,12 +117,13 @@
})
)
- create_job_msg = RwImageMgmtYang.CreateUploadJob.from_dict({
+ create_job_msg = RwImageMgmtYang.YangInput_RwImageMgmt_CreateUploadJob.from_dict({
"cloud_account": [upload_task.cloud_account],
"onboarded_image": {
"image_name": upload_task.image_name,
"image_checksum": upload_task.image_checksum,
- }
+ },
+ "project_name": self.project.name,
})
query_iter = yield from self.dts_c.query_rpc(
@@ -138,7 +142,7 @@
)
query_iter = yield from self.dts_c.query_read(
- "D,/rw-image-mgmt:upload-jobs",
+ self.project.add_project("D,/rw-image-mgmt:upload-jobs"),
)
for fut_resp in query_iter:
diff --git a/rwlaunchpad/plugins/rwimagemgr/test/utest_image_upload.py b/rwlaunchpad/plugins/rwimagemgr/test/utest_image_upload.py
index 9d4464f..6759413 100755
--- a/rwlaunchpad/plugins/rwimagemgr/test/utest_image_upload.py
+++ b/rwlaunchpad/plugins/rwimagemgr/test/utest_image_upload.py
@@ -34,6 +34,7 @@
from rift.tasklets.rwimagemgr import upload
from rift.package import checksums
from rift.test.dts import async_test
+from rift.mano.utils.project import ManoProject, DEFAULT_PROJECT
import rw_status
import gi
@@ -118,7 +119,7 @@
@rwstatus
def do_get_image_list(self, account):
- boxed_image_list = RwcalYang.VimResources()
+ boxed_image_list = RwcalYang.YangData_RwProject_Project_VimResources()
for msg in self._image_msgs:
boxed_image_list.imageinfo_list.append(msg)
@@ -154,7 +155,7 @@
def create_image_info(image_name, image_checksum):
- image = RwcalYang.ImageInfoItem()
+ image = RwcalYang.YangData_RwProject_Project_VimResources_ImageinfoList()
image.name = image_name
image.checksum = image_checksum
image.disk_format = os.path.splitext(image_name)[1][1:]
@@ -198,7 +199,7 @@
class ImageMockMixin(object):
- ACCOUNT_MSG = RwCloudYang.CloudAccount(
+ ACCOUNT_MSG = RwCloudYang.YangData_RwProject_Project_Cloud_Account(
name="mock",
account_type="mock",
)
@@ -252,6 +253,8 @@
task_pb_msg = upload_task.pb_msg
self.assertEqual(upload_task.image_name, task_pb_msg.image_name)
+ # TODO: Fix this
+ @unittest.skip("Causes coredump in OSM")
@async_test
def test_cancel_image_task(self):
@asyncio.coroutine
@@ -286,7 +289,7 @@
@async_test
def test_create_image_name_and_checksum_exists(self):
with self.create_upload_task(self.account) as upload_task:
- image_entry = RwcalYang.ImageInfoItem(
+ image_entry = RwcalYang.YangData_RwProject_Project_VimResources_ImageinfoList(
id="asdf",
name=upload_task.image_name,
checksum=upload_task.image_checksum
@@ -348,6 +351,8 @@
self.assertEqual("FAILED", job.state)
+ # TODO: Fix this
+ @unittest.skip("Causes coredump in OSM")
@async_test
def test_cancel_job(self):
@asyncio.coroutine
@@ -379,15 +384,14 @@
def __init__(self, *args, **kwargs):
self._loop = asyncio.get_event_loop()
self._log = logging.getLogger(__file__)
-
+ self._project = ManoProject(self._log, name=DEFAULT_PROJECT)
+ self._project._loop = self._loop
ImageMockMixin.__init__(self, self._log)
unittest.TestCase.__init__(self, *args, **kwargs)
@async_test
def test_controller_single_task_job(self):
- controller = upload.ImageUploadJobController(
- self._log, self._loop
- )
+ controller = upload.ImageUploadJobController(self._project)
with self.create_upload_task(self.account) as upload_task:
job_id = controller.create_job([upload_task])
@@ -405,9 +409,7 @@
@async_test
def test_controller_multi_task_job(self):
- controller = upload.ImageUploadJobController(
- self._log, self._loop
- )
+ controller = upload.ImageUploadJobController(self._project)
with self.create_upload_task(self.account) as upload_task1:
with self.create_upload_task(self.account) as upload_task2:
@@ -422,9 +424,7 @@
@async_test
def test_controller_multi_jobs(self):
- controller = upload.ImageUploadJobController(
- self._log, self._loop
- )
+ controller = upload.ImageUploadJobController(self._project)
with self.create_upload_task(self.account) as upload_task1:
with self.create_upload_task(self.account) as upload_task2:
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt b/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt
index 34463ef..c02e728 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/CMakeLists.txt
@@ -24,7 +24,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
# anything not in a site-packages directory so we have to
@@ -34,7 +34,6 @@
FILES
rift/tasklets/${TASKLET_NAME}/__init__.py
rift/tasklets/${TASKLET_NAME}/convert_pkg.py
- rift/tasklets/${TASKLET_NAME}/datacenters.py
rift/tasklets/${TASKLET_NAME}/export.py
rift/tasklets/${TASKLET_NAME}/extract.py
rift/tasklets/${TASKLET_NAME}/image.py
@@ -44,16 +43,14 @@
rift/tasklets/${TASKLET_NAME}/tasklet.py
rift/tasklets/${TASKLET_NAME}/tosca.py
rift/tasklets/${TASKLET_NAME}/uploader.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
rift_python_install_tree(
FILES
rift/package/__init__.py
rift/package/archive.py
- rift/package/charm.py
rift/package/checksums.py
- rift/package/config.py
rift/package/convert.py
rift/package/handler.py
rift/package/icon.py
@@ -62,7 +59,7 @@
rift/package/script.py
rift/package/store.py
rift/package/cloud_init.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
rift_add_subdirs(test scripts)
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/charm.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/charm.py
deleted file mode 100644
index d907731..0000000
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/charm.py
+++ /dev/null
@@ -1,96 +0,0 @@
-
-#
-# Copyright 2016 RIFT.IO Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import re
-import os.path
-
-from . import package
-
-
-class CharmExtractionError(Exception):
- pass
-
-
-class PackageCharmExtractor(object):
- """ This class is reponsible for extracting charms to the correct directory
-
- In order to remain compatible with the existing Jujuclient, we extract the charms
- to a known location (RIFT-13282)
- """
- DEFAULT_INSTALL_DIR = os.path.join(
- os.environ["RIFT_ARTIFACTS"],
- "launchpad"
- )
-
- CHARM_REGEX = "{prefix}charms/(trusty/)?(?P<charm_name>[^/]+)$"
-
- def __init__(self, log, install_dir=DEFAULT_INSTALL_DIR):
- self._log = log
- self._install_dir = install_dir
-
- def _get_rel_dest_path(self, descriptor_id, charm_name):
- dest_rel_path = "libs/{}/charms/trusty/{}".format(descriptor_id, charm_name)
- dest_path = os.path.join(self._install_dir, dest_rel_path)
- return dest_path
-
- @classmethod
- def charm_dir_map(cls, package):
- charm_map = {}
- regex = cls.CHARM_REGEX.format(prefix=package.prefix)
-
- for dir_name in package.dirs:
- match = re.match(
- cls.CHARM_REGEX.format(prefix=package.prefix), dir_name,
- )
- if match is None:
- continue
-
- charm_name = match.group("charm_name")
- if charm_name == "trusty":
- continue
-
- charm_map[charm_name] = dir_name
-
- return charm_map
-
- def get_extracted_charm_dir(self, package_id, charm_name):
- return os.path.join(
- self._get_rel_dest_path(package_id, charm_name),
- )
-
- def extract_charms(self, pkg):
- """ Extract charms contained within the DescriptorPackage
- to the known charm directory.
-
- Arguments:
- pkg - The descriptor package that MAY contain charm directories
-
- Raises:
- CharmExtractionError - Charms in the package failed to get extracted
- """
- descriptor_id = pkg.descriptor_id
- charm_dir_map = PackageCharmExtractor.charm_dir_map(pkg)
-
- for charm_name, charm_dir in charm_dir_map.items():
- dest_rel_path = self._get_rel_dest_path(descriptor_id, charm_name)
- dest_path = os.path.join(self._install_dir, dest_rel_path)
-
- self._log.debug("Extracting %s charm to %s", charm_name, dest_path)
- try:
- pkg.extract_dir(charm_dir, dest_path)
- except package.ExtractError as e:
- raise CharmExtractionError("Failed to extract charm %s" % charm_name) from e
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/checksums.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/checksums.py
index 975967e..cdbe754 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/checksums.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/checksums.py
@@ -74,6 +74,6 @@
def to_string(self):
string = ""
for file_name, file_checksum in self.items():
- string += "{} {}\n".format(file_name, file_checksum)
+ string += "{} {}\n".format(file_checksum, file_name)
return string
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/config.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/config.py
deleted file mode 100644
index 9a06116..0000000
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/config.py
+++ /dev/null
@@ -1,93 +0,0 @@
-
-#
-# Copyright 2016 RIFT.IO Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import re
-import os.path
-
-from . import package
-
-
-class ConfigExtractionError(Exception):
- pass
-
-
-class PackageConfigExtractor(object):
- """ This class is reponsible for extracting config data to the correct directory
-
- In order to remain compatible with the existing ConfigManager, we extract the config
- to a known location (RIFT-13282)
- """
- DEFAULT_INSTALL_DIR = os.path.join(
- os.environ["RIFT_ARTIFACTS"],
- "launchpad"
- )
-
- CONFIG_REGEX = "{prefix}(ns_config|vnf_config)/(?P<config_name>[^/]+.yaml)$"
-
- def __init__(self, log, install_dir=DEFAULT_INSTALL_DIR):
- self._log = log
- self._install_dir = install_dir
-
- def _get_rel_dest_path(self, descriptor_id, config_name):
- dest_rel_path = "libs/{}/config/{}".format(descriptor_id, config_name)
- dest_path = os.path.join(self._install_dir, dest_rel_path)
- return dest_path
-
- @classmethod
- def package_config_files(cls, package):
- config_map = {}
- regex = cls.CONFIG_REGEX.format(prefix=package.prefix)
-
- for file_name in package.files:
- match = re.match(
- cls.CONFIG_REGEX.format(prefix=package.prefix), file_name,
- )
- if match is None:
- continue
-
- config_name = match.group("config_name")
-
- config_map[config_name] = file_name
-
- return config_map
-
- def get_extracted_config_path(self, package_id, config_name):
- return os.path.join(
- self._get_rel_dest_path(package_id, os.path.basename(config_name)),
- )
-
- def extract_configs(self, pkg):
- """ Extract any configuration files from the DescriptorPackage
-
- Arguments:
- pkg - A DescriptorPackage
-
- Raises:
- ConfigExtractionError - The configuration could not be extracted
- """
- descriptor_id = pkg.descriptor_id
-
- config_files = PackageConfigExtractor.package_config_files(pkg).items()
- for config_name, config_file in config_files:
- dest_rel_path = self._get_rel_dest_path(descriptor_id, config_name)
- dest_path = os.path.join(self._install_dir, dest_rel_path)
-
- self._log.debug("Extracting %s config to %s", config_name, dest_path)
- try:
- pkg.extract_file(config_file, dest_path)
- except package.ExtractError as e:
- raise ConfigExtractionError("Failed to extract config %s" % config_name) from e
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/convert.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/convert.py
index 7571c57..143b3e2 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/convert.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/convert.py
@@ -1,6 +1,6 @@
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,21 +16,30 @@
#
import json
+import logging
import os
-import tempfile
+import yaml
import gi
gi.require_version('RwNsdYang', '1.0')
+gi.require_version('RwProjectNsdYang', '1.0')
gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
gi.require_version('RwYang', '1.0')
from gi.repository import (
RwNsdYang,
RwVnfdYang,
NsdYang,
VnfdYang,
+ RwProjectNsdYang,
+ RwProjectVnfdYang,
+ ProjectNsdYang,
+ ProjectVnfdYang,
RwYang,
)
+from rift.mano.utils.project import NS_PROJECT
+from rift.rwlib.translation.json2xml import InvalidSchemaException
class UnknownExtensionError(Exception):
pass
@@ -49,12 +58,17 @@
class ProtoMessageSerializer(object):
"""(De)Serializer/deserializer fo a specific protobuf message into various formats"""
- libncx_model = None
+ libyang_model = None
- def __init__(self, yang_ns, yang_pb_cls):
+ def __init__(self, yang_ns, yang_pb_cls,
+ yang_ns_project, yang_pb_project_cls):
""" Create a serializer for a specific protobuf message """
self._yang_ns = yang_ns
self._yang_pb_cls = yang_pb_cls
+ self._yang_ns_project = yang_ns_project
+ self._yang_pb_project_cls = yang_pb_project_cls
+
+ self._log = logging.getLogger('rw-maon-log')
@classmethod
def _deserialize_extension_method_map(cls):
@@ -101,36 +115,91 @@
return self._yang_pb_cls
@property
+ def yang_ns_project(self):
+ """ The Protobuf's GI namespace class (e.g. RwProjectVnfdYang) """
+ return self._yang_ns_project
+
+ @property
+ def yang_class_project(self):
+ """ The Protobuf's GI class (e.g. RwProjectVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd) """
+ return self._yang_pb_project_cls
+
+ @property
def model(self):
cls = self.__class__
- # Cache the libncx model for the serializer class
- if cls.libncx_model is None:
- cls.libncx_model = RwYang.model_create_libncx()
- cls.libncx_model.load_schema_ypbc(self.yang_namespace.get_schema())
+ # Cache the libyang model for the serializer class
+ if cls.libyang_model is None:
+ cls.libyang_model = RwYang.model_create_libyang()
+ cls.libyang_model.load_schema_ypbc(self.yang_namespace.get_schema())
+ cls.libyang_model.load_schema_ypbc(self.yang_ns_project.get_schema())
- return cls.libncx_model
+ return cls.libyang_model
- def _from_xml_file_hdl(self, file_hdl):
+ def _from_xml_file_hdl(self, file_hdl, project=None):
xml = file_hdl.read()
- return self.yang_class.from_xml_v2(self.model, decode(xml), strict=False)
+ return self.yang_class.from_xml_v2(self.model, decode(xml), strict=False) \
+ if not project else self._yang_pb_project_cls.from_xml_v2(self.model, decode(xml), strict=False)
- def _from_json_file_hdl(self, file_hdl):
- json = file_hdl.read()
+ def _from_json_file_hdl(self, file_hdl, project=None):
+ jstr = file_hdl.read()
+ self._log.debug("Convert from json file: {}".format(jstr))
- return self.yang_class.from_json(self.model, decode(json), strict=False)
+ try:
+ if not project:
+ desc_msg = self.yang_class.from_json(self.model, decode(jstr), strict=False)
+ else:
+ desc_msg = self._yang_pb_project_cls.from_json(self.model, decode(jstr), strict=False)
- def _from_yaml_file_hdl(self, file_hdl):
- yaml = file_hdl.read()
+ self._log.debug("desc_msg: {}".format(desc_msg.as_dict()))
+ return self.yang_class_project.from_dict(desc_msg.as_dict())
+ except Exception as e:
+ self._log.exception(e)
+ raise e
- return self.yang_class.from_yaml(self.model, decode(yaml), strict=False)
+ def _from_yaml_file_hdl(self, file_hdl, project=None):
+ yml = file_hdl.read()
- def to_json_string(self, pb_msg):
+ try:
+ desc_msg = self.yang_class.from_yaml(self.model, decode(yml), strict=True)
+ except InvalidSchemaException as invalid_scheme_exception:
+ self._log.error("Exception raised during schema translation, %s. Launchpad will" \
+ "continue to process the remaining elements ", str(invalid_scheme_exception))
+ desc_msg = self.yang_class.from_yaml(self.model, decode(yml), strict=False)
+ except Exception as e:
+ self._log.exception(e)
+ raise e
+
+ return self.yang_class_project.from_dict(desc_msg.as_dict())
+
+ def to_desc_msg(self, pb_msg, project_rooted=True):
+ """Convert to and from project rooted pb msg descriptor to catalog
+ rooted pb msg
+ project_rooted: if pb_msg is project rooted or not
+ """
+ if project_rooted:
+ if isinstance(pb_msg, self._yang_pb_project_cls):
+ return self._yang_pb_cls.from_dict(pb_msg.as_dict())
+ elif isinstance(pb_msg, self._yang_pb_cls):
+ return pb_msg
+
+ else:
+ if isinstance(pb_msg, self._yang_pb_cls):
+ return self._yang_pb_project_cls.from_dict(pb_msg.as_dict())
+ elif isinstance(pb_msg, self._yang_pb_project_cls):
+ return pb_msg
+
+ raise TypeError("Invalid protobuf message type provided: {}".format(type(pb_msg)))
+
+
+ def to_json_string(self, pb_msg, project_ns=False):
""" Serialize a protobuf message into JSON
Arguments:
pb_msg - A GI-protobuf object of type provided into constructor
+ project_ns - Need the desc in project namespace, required for
+ posting to Restconf as part of onboarding
Returns:
A JSON string representing the protobuf message
@@ -139,22 +208,32 @@
SerializationError - Message could not be serialized
TypeError - Incorrect protobuf type provided
"""
- if not isinstance(pb_msg, self._yang_pb_cls):
- raise TypeError("Invalid protobuf message type provided")
-
+ self._log.debug("Convert desc to json (ns:{}): {}".format(project_ns, pb_msg.as_dict()))
try:
- json_str = pb_msg.to_json(self.model)
+ # json_str = pb_msg.to_json(self.model)
+
+ desc_msg = self.to_desc_msg(pb_msg, not project_ns)
+ json_str = desc_msg.to_json(self.model)
+ if project_ns:
+ # Remove rw-project:project top level element
+ dic = json.loads(json_str)
+ jstr = json.dumps(dic[NS_PROJECT][0])
+ else:
+ jstr = json_str
except Exception as e:
raise SerializationError(e)
- return json_str
+ self._log.debug("Convert desc to json: {}".format(jstr))
+ return jstr
- def to_yaml_string(self, pb_msg):
+ def to_yaml_string(self, pb_msg, project_ns=False):
""" Serialize a protobuf message into YAML
Arguments:
pb_msg - A GI-protobuf object of type provided into constructor
+ project_ns - Need the desc in project namespace, required for
+ posting to Restconf as part of onboarding
Returns:
A YAML string representing the protobuf message
@@ -163,16 +242,23 @@
SerializationError - Message could not be serialized
TypeError - Incorrect protobuf type provided
"""
- if not isinstance(pb_msg, self._yang_pb_cls):
- raise TypeError("Invalid protobuf message type provided")
-
+ self._log.debug("Convert desc to yaml (ns:{}): {}".format(project_ns, pb_msg.as_dict()))
try:
- yaml_str = pb_msg.to_yaml(self.model)
+ desc_msg = self.to_desc_msg(pb_msg, not project_ns)
+ yaml_str = desc_msg.to_yaml(self.model)
+ if project_ns:
+ # Remove rw-project:project top level element
+ dic = yaml.loads(yaml_str)
+ ystr = yaml.dump(dic[NS_PROJECT][0])
+ else:
+ ystr = yaml_str
+
except Exception as e:
+ self._log.exception("Exception converting to yaml: {}".format(e))
raise SerializationError(e)
- return yaml_str
+ return ystr
def to_xml_string(self, pb_msg):
""" Serialize a protobuf message into XML
@@ -187,18 +273,17 @@
SerializationError - Message could not be serialized
TypeError - Incorrect protobuf type provided
"""
- if not isinstance(pb_msg, self._yang_pb_cls):
- raise TypeError("Invalid protobuf message type provided")
-
try:
- xml_str = pb_msg.to_xml_v2(self.model)
+ desc_msg = self.to_desc_msg(pb_msg)
+ xml_str = desc_msg.to_xml_v2(self.model)
except Exception as e:
+ self._log.exception("Exception converting to xml: {}".format(e))
raise SerializationError(e)
return xml_str
- def from_file_hdl(self, file_hdl, extension):
+ def from_file_hdl(self, file_hdl, extension, project=None):
""" Returns the deserialized protobuf message from file contents
This function determines the serialization format based on file extension
@@ -222,7 +307,8 @@
raise UnknownExtensionError("Cannot detect message format for %s extension" % extension_lc)
try:
- msg = extension_map[extension_lc](self, file_hdl)
+ self._log.debug("Converting from json..project = {}".format(project))
+ msg = extension_map[extension_lc](self, file_hdl, project)
except Exception as e:
raise SerializationError(e)
@@ -262,22 +348,26 @@
class VnfdSerializer(ProtoMessageSerializer):
""" Creates a serializer for the VNFD descriptor"""
def __init__(self):
- super().__init__(VnfdYang, VnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd)
+ super().__init__(VnfdYang, VnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd,
+ ProjectVnfdYang, ProjectVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd)
class NsdSerializer(ProtoMessageSerializer):
""" Creates a serializer for the NSD descriptor"""
def __init__(self):
- super().__init__(NsdYang, NsdYang.YangData_Nsd_NsdCatalog_Nsd)
+ super().__init__(NsdYang, NsdYang.YangData_Nsd_NsdCatalog_Nsd,
+ ProjectNsdYang, ProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd)
class RwVnfdSerializer(ProtoMessageSerializer):
""" Creates a serializer for the VNFD descriptor"""
def __init__(self):
- super().__init__(RwVnfdYang, RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd)
+ super().__init__(RwVnfdYang, RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd,
+ RwProjectVnfdYang, RwProjectVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd)
class RwNsdSerializer(ProtoMessageSerializer):
""" Creates a serializer for the NSD descriptor"""
def __init__(self):
- super().__init__(RwNsdYang, RwNsdYang.YangData_Nsd_NsdCatalog_Nsd)
+ super().__init__(RwNsdYang, RwNsdYang.YangData_Nsd_NsdCatalog_Nsd,
+ RwProjectNsdYang, RwProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd)
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/handler.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/handler.py
index 4c000cd..34b84b1 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/handler.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/handler.py
@@ -167,4 +167,5 @@
# Return the root object!
structure = folder_cache[root_dir].serialize()
+ self.set_header('Content-Type','application/json')
self.write(tornado.escape.json_encode(structure))
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/package.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/package.py
index 6f77985..0b5c499 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/package.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/package.py
@@ -646,7 +646,7 @@
raise PackageValidationError(msg) from e
if archive_checksums[pkg_file_no_prefix] != file_checksum:
- msg = "{} checksum ({}) did match expected checksum ({})".format(
+ msg = "{} checksum ({}) did not match expected checksum ({})".format(
pkg_file, file_checksum, archive_checksums[pkg_file_no_prefix]
)
self._log.error(msg)
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py
index 9ebd03c..ff25fed 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/package/store.py
@@ -1,5 +1,5 @@
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,9 +52,9 @@
@property
def root_dir(self):
return self._root_dir
-
def _get_package_dir(self, package_id):
+ self._log.debug("Package dir {}, {}".format(self._root_dir, package_id))
return os.path.join(self._root_dir, package_id)
def _get_package_files(self, package_id):
@@ -129,7 +129,7 @@
return pkg
- def store_package(self, pkg):
+ def store_package(self, pkg, project=None):
""" Store a DescriptorPackage to disk
Arguments:
@@ -142,7 +142,6 @@
raise PackageExistsError("Package %s already exists", pkg.descriptor_id)
package_dir = self._get_package_dir(pkg.descriptor_id)
-
try:
os.makedirs(package_dir, exist_ok=True)
except OSError as e:
@@ -168,6 +167,8 @@
PackageStoreError - The package could not be deleted
"""
+ self.refresh()
+
if descriptor_id not in self._package_dirs:
raise PackageNotFoundError("Package %s does not exists", descriptor_id)
@@ -199,20 +200,21 @@
class NsdPackageFilesystemStore(PackageFilesystemStore):
DEFAULT_ROOT_DIR = os.path.join(
- os.environ["RIFT_ARTIFACTS"],
+ os.environ["RIFT_VAR_ROOT"],
"launchpad", "packages", "nsd"
)
- def __init__(self, log, root_dir=DEFAULT_ROOT_DIR):
+ def __init__(self, log, root_dir=DEFAULT_ROOT_DIR, project=None):
+ root_dir = root_dir if not project else os.path.join(root_dir, project)
super().__init__(log, root_dir)
class VnfdPackageFilesystemStore(PackageFilesystemStore):
DEFAULT_ROOT_DIR = os.path.join(
- os.environ["RIFT_ARTIFACTS"],
+ os.environ["RIFT_VAR_ROOT"],
"launchpad", "packages", "vnfd"
)
- def __init__(self, log, root_dir=DEFAULT_ROOT_DIR):
+ def __init__(self, log, root_dir=DEFAULT_ROOT_DIR, project=None):
+ root_dir = root_dir if not project else os.path.join(root_dir, project)
super().__init__(log, root_dir)
-
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/datacenters.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/datacenters.py
deleted file mode 100644
index 05731a6..0000000
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/datacenters.py
+++ /dev/null
@@ -1,125 +0,0 @@
-
-#
-# Copyright 2016 RIFT.IO Inc
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-import asyncio
-
-from gi.repository import (
- RwDts,
- RwLaunchpadYang,
-)
-
-import rift.mano.dts as mano_dts
-import rift.openmano.openmano_client as openmano_client
-import rift.tasklets
-
-
-class DataCenterPublisher(mano_dts.DtsHandler):
- """
- This class is reponsible for exposing the data centers associated with an
- openmano cloud account.
- """
-
- XPATH = "D,/rw-launchpad:datacenters"
-
- def __init__(self, log, dts, loop):
- """Creates an instance of a DataCenterPublisher
-
- Arguments:
- tasklet - the tasklet that this publisher is registered for
-
- """
- super().__init__(log, dts, loop)
-
- self._ro_sub = mano_dts.ROAccountConfigSubscriber(
- self.log,
- self.dts,
- self.loop,
- callback=self.on_ro_account_change
- )
- self.ro_accounts = {}
-
- def on_ro_account_change(self, ro_account, action):
- if action in [ RwDts.QueryAction.CREATE, RwDts.QueryAction.UPDATE ]:
- self.ro_accounts[ro_account.name] = ro_account
- elif action == RwDts.QueryAction.DELETE and ro_account.name in self.ro_accounts:
- del self.ro_accounts[ro_account.name]
-
- @asyncio.coroutine
- def register(self):
- """Registers the publisher with DTS"""
- yield from self._ro_sub.register()
-
- @asyncio.coroutine
- def on_prepare(xact_info, action, ks_path, msg):
- try:
- # Create a datacenters instance to hold all of the cloud
- # account data.
- datacenters = RwLaunchpadYang.DataCenters()
-
- # Iterate over the known openmano accounts and populate cloud
- # account instances with the corresponding data center info
- for _, account in self.ro_accounts.items():
- if account.account_type != "openmano":
- continue
-
- try:
- ro_account = RwLaunchpadYang.ROAccount()
- ro_account.name = account.name
-
- # Create a client for this cloud account to query for
- # the associated data centers
- client = openmano_client.OpenmanoCliAPI(
- self.log,
- account.openmano.host,
- account.openmano.port,
- account.openmano.tenant_id,
- )
-
- # Populate the cloud account with the data center info
- for uuid, name in client.datacenter_list():
- ro_account.datacenters.append(
- RwLaunchpadYang.DataCenter(
- uuid=uuid,
- name=name,
- )
- )
-
- datacenters.ro_accounts.append(ro_account)
-
- except Exception as e:
- self.log.exception(e)
-
- xact_info.respond_xpath(
- RwDts.XactRspCode.MORE,
- 'D,/rw-launchpad:datacenters',
- datacenters,
- )
-
- xact_info.respond_xpath(RwDts.XactRspCode.ACK)
-
- except Exception as e:
- self.log.exception(e)
- raise
-
- handler = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare)
-
- with self.dts.group_create() as group:
- self.reg = group.register(
- xpath=DataCenterPublisher.XPATH,
- handler=handler,
- flags=RwDts.Flag.PUBLISHER,
- )
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/export.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/export.py
index e404852..df1e251 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/export.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/export.py
@@ -1,6 +1,6 @@
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -37,14 +37,15 @@
from . import tosca
import gi
-gi.require_version('NsdYang', '1.0')
-gi.require_version('VnfdYang', '1.0')
gi.require_version('RwPkgMgmtYang', '1.0')
from gi.repository import (
- NsdYang,
- VnfdYang,
- RwPkgMgmtYang)
+ RwPkgMgmtYang,
+ RwVnfdYang,
+ RwProjectVnfdYang,
+ RwNsdYang,
+ RwProjectNsdYang
+)
import rift.mano.dts as mano_dts
@@ -95,7 +96,7 @@
finally:
package.open = orig_open
- def create_archive(self, archive_hdl, package, desc_json_str, serializer):
+ def create_archive(self, archive_hdl, package, desc_json_str, serializer, project=None):
""" Create a package archive from an existing package, descriptor messages,
and a destination serializer.
@@ -117,7 +118,7 @@
ArchiveExportError - The exported archive failed to create
"""
- new_desc_msg = serializer.from_file_hdl(io.BytesIO(desc_json_str.encode()), ".json")
+ new_desc_msg = serializer.from_file_hdl(io.BytesIO(desc_json_str.encode()), ".json", project)
_, dest_ext = os.path.splitext(package.descriptor_file)
new_desc_hdl = io.BytesIO(serializer.to_string(new_desc_msg, dest_ext).encode())
descriptor_checksum = rift.package.checksums.checksum(new_desc_hdl)
@@ -141,7 +142,10 @@
checksum_hdl
)
- archive_checksums[package.descriptor_file] = descriptor_checksum
+ # Get the name of the descriptor file without the prefix
+ # (which is what is stored in the checksum file)
+ desc_file_no_prefix = os.path.relpath(package.descriptor_file, package.prefix)
+ archive_checksums[desc_file_no_prefix] = descriptor_checksum
checksum_hdl = io.BytesIO(archive_checksums.to_string().encode())
return checksum_hdl
@@ -160,7 +164,7 @@
return archive
- def export_package(self, package, export_dir, file_id, json_desc_str, dest_serializer):
+ def export_package(self, package, export_dir, file_id, json_desc_str, dest_serializer, project=None):
""" Export package as an archive to the export directory
Arguments:
@@ -185,7 +189,7 @@
with open(archive_path, 'wb') as archive_hdl:
try:
self.create_archive(
- archive_hdl, package, json_desc_str, dest_serializer
+ archive_hdl, package, json_desc_str, dest_serializer, project
)
except Exception as e:
os.remove(archive_path)
@@ -197,22 +201,20 @@
class ExportRpcHandler(mano_dts.AbstractRpcHandler):
- def __init__(self, log, dts, loop, application, store_map, exporter, onboarder, catalog_map):
+ def __init__(self, application, catalog_map):
"""
Args:
application: UploaderApplication
- store_map: dict containing VnfdStore & NsdStore
- exporter : DescriptorPackageArchiveExporter
calalog_map: Dict containing Vnfds and Nsd onboarding.
"""
- super().__init__(log, dts, loop)
+ super().__init__(application.log, application.dts, application.loop)
self.application = application
- self.store_map = store_map
- self.exporter = exporter
- self.onboarder = onboarder
+ self.exporter = application.exporter
+ self.onboarder = application.onboarder
self.catalog_map = catalog_map
- self.log = log
+
+
@property
def xpath(self):
@@ -235,6 +237,11 @@
return rpc_out
def export(self, transaction_id, log, msg):
+ DESC_TYPE_PB_MAP = {
+ "vnfd": RwProjectVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd,
+ "nsd": RwProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd
+ }
+
log.message(ExportStart())
desc_type = msg.package_type.lower()
@@ -243,12 +250,19 @@
# Parse the IDs
desc_id = msg.package_id
- catalog = self.catalog_map[desc_type]
+ catalog = self.catalog_map[desc_type](project=msg.project_name)
- if desc_id not in catalog:
- raise ValueError("Unable to find package ID: {}".format(desc_id))
-
- desc_msg = catalog[desc_id]
+ # TODO: Descriptor isn't available from catalog info passed in from launchpad tasklet.
+ # If unavailable, create a filler descriptor object, which will be updated
+ # via GET call to config.
+ if desc_id in catalog:
+ desc_msg = catalog[desc_id]
+ else:
+ log.warn("Unable to find package ID in catalog: {}".format(desc_id))
+ desc_msg = DESC_TYPE_PB_MAP[desc_type](id = desc_id)
+
+ self.store_map = self.application.build_store_map(project=msg.project_name)
+ self.project_name = msg.project_name if msg.has_field('project_name') else None
# Get the schema for exporting
schema = msg.export_schema.lower()
@@ -310,6 +324,11 @@
# If that fails, create a temporary package using the descriptor only
try:
package = package_store.get_package(desc_id)
+ #Remove the image file from the package while exporting
+ for file in package.files:
+ if rift.package.image.is_image_file(file):
+ package.remove_file(file)
+
except rift.package.store.PackageNotFoundError:
log.debug("stored package not found. creating package from descriptor config")
@@ -320,29 +339,34 @@
log, hdl
)
- # Try to get the updated descriptor from the api endpoint so that we have
- # the updated descriptor file in the exported archive and the name of the archive
- # tar matches the name in the yaml descriptor file. Proceed with the current
- # file if there's an error
+ # Get the updated descriptor from the api endpoint to get any updates
+ # made to the catalog. Also desc_msg may not be populated correctly as yet.
#
- json_desc_msg = src_serializer.to_json_string(desc_msg)
- desc_name, desc_version = desc_msg.name, desc_msg.version
- try:
- d = collections.defaultdict(dict)
- sub_dict = self.onboarder.get_updated_descriptor(desc_msg)
- root_key, sub_key = "{0}:{0}-catalog".format(desc_type), "{0}:{0}".format(desc_type)
- # root the dict under "vnfd:vnfd-catalog"
- d[root_key] = sub_dict
-
- json_desc_msg = json.dumps(d)
- desc_name, desc_version = sub_dict[sub_key]['name'], sub_dict[sub_key]['version']
+ try:
+ # merge the descriptor content: for rbac everything needs to be project rooted, with project name.
+ D = collections.defaultdict(dict)
+ sub_dict = self.onboarder.get_updated_descriptor(desc_msg, self.project_name)
+
+ if self.project_name:
+ D["project"] = dict(name = self.project_name)
+ root_key, sub_key = "project-{0}:{0}-catalog".format(desc_type), "project-{0}:{0}".format(desc_type)
+ D["project"].update({root_key: sub_dict})
+ else:
+ root_key, sub_key = "{0}:{0}-catalog".format(desc_type), "{0}:{0}".format(desc_type)
+ D[root_key] = sub_dict
+
+ json_desc_msg = json.dumps(D)
+ desc_name, desc_version = sub_dict[sub_key]['name'], sub_dict[sub_key].get('version', '')
+
except Exception as e:
msg = "Exception {} raised - {}".format(e.__class__.__name__, str(e))
- self.log.debug(msg)
+ self.log.error(msg)
+ raise ArchiveExportError(msg) from e
# exported filename based on the updated descriptor name
self.filename = "{}_{}".format(desc_name, desc_version)
+ self.log.debug("JSON string for descriptor: {}".format(json_desc_msg))
self.exporter.export_package(
package=package,
@@ -350,6 +374,7 @@
file_id = self.filename,
json_desc_str=json_desc_msg,
dest_serializer=dest_serializer,
+ project=self.project_name,
)
def export_tosca(self, format_, schema, desc_type, desc_id, desc_msg, log, transaction_id):
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/extract.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/extract.py
index 7c0eab8..07e8c58 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/extract.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/extract.py
@@ -121,7 +121,7 @@
upload_hdl))
else:
- # See if the pacakage can be converted
+ # See if the package can be converted
files = ConvertPackage(self._log,
uploaded_file,
extracted_pkgfile).convert(delete=True)
@@ -139,9 +139,10 @@
self._log.debug("Upload converted file: {}".format(f))
upload_hdl = open(f, "r+b")
package = create_package_from_tar_file(upload_hdl)
- tmp_pkgs.append(rift.package.package.TemporaryPackage(self._log,
- package,
- upload_hdl))
+ if package.descriptor_id:
+ tmp_pkgs.append(rift.package.package.TemporaryPackage(self._log,
+ package,
+ upload_hdl))
except Exception as e:
# Cleanup any TemporaryPackage instances created
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/image.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/image.py
index 7c4dfa0..8566d16 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/image.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/image.py
@@ -43,7 +43,7 @@
self._client = client.UploadJobClient(self._log, self._loop, self._dts)
- def upload_image(self, image_name, image_checksum, image_hdl):
+ def upload_image(self, image_name, image_checksum, image_hdl, set_image_property=None):
endpoint = "http://127.0.0.1:9292"
glance_client = glanceclient.Client('1', endpoint, token="asdf")
@@ -60,16 +60,15 @@
image = glance_client.images.create(name=image_name, data=image_hdl, is_public="False",
disk_format="qcow2", container_format="bare",
- checksum=image_checksum)
+ checksum=image_checksum, properties=set_image_property)
self._log.debug('Image upload complete: %s', image)
except Exception as e:
raise ImageUploadError("Failed to upload image to catalog: %s" % str(e)) from e
- def upload_image_to_cloud_accounts(self, image_name, image_checksum, cloud_accounts=None):
+ def upload_image_to_cloud_accounts(self, image_name, image_checksum, project, cloud_accounts=None):
self._log.debug("uploading image %s to all cloud accounts", image_name)
- upload_job = self._client.create_job_threadsafe(image_name, image_checksum, cloud_accounts)
+ upload_job = self._client.create_job_threadsafe(image_name, image_checksum, project, cloud_accounts)
try:
upload_job.wait_until_complete_threadsafe()
except client.UploadJobError as e:
raise ImageUploadError("Failed to upload image " + image_name + " to cloud accounts") from e
-
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/message.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/message.py
index 0ab6564..4b6a3fd 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/message.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/message.py
@@ -42,7 +42,7 @@
def __repr__(self):
return "{} {}:{}:{}".format(
self.timestamp,
- logging._levelNames.get(self.level, self.level),
+ logging._levelToName.get(self.level, self.level),
self.name,
self.text,
)
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/onboard.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/onboard.py
index 636880f..54c3e2a 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/onboard.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/onboard.py
@@ -17,12 +17,15 @@
import requests
+from rift.mano.utils.project import DEFAULT_PROJECT
from rift.package import convert
from gi.repository import (
- NsdYang,
- RwNsdYang,
- VnfdYang,
- RwVnfdYang,
+ ProjectNsdYang as NsdYang,
+ RwNsdYang as RwNsdYang,
+ RwProjectNsdYang as RwProjectNsdYang,
+ ProjectVnfdYang as VnfdYang,
+ RwVnfdYang as RwVnfdYang,
+ RwProjectVnfdYang as RwProjectVnfdYang,
)
@@ -37,17 +40,21 @@
class DescriptorOnboarder(object):
""" This class is responsible for onboarding descriptors using Restconf"""
DESC_ENDPOINT_MAP = {
- NsdYang.YangData_Nsd_NsdCatalog_Nsd: "nsd-catalog/nsd",
+ NsdYang.YangData_RwProject_Project_NsdCatalog_Nsd: "nsd-catalog/nsd",
RwNsdYang.YangData_Nsd_NsdCatalog_Nsd: "nsd-catalog/nsd",
- VnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd: "vnfd-catalog/vnfd",
- RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd: "vnfd-catalog/vnfd",
+ RwProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd: "nsd-catalog/nsd",
+ VnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd: "vnfd-catalog/vnfd",
+ RwProjectVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd: "vnfd-catalog/vnfd",
+ RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd: "vnfd-catalog/vnfd"
}
DESC_SERIALIZER_MAP = {
- NsdYang.YangData_Nsd_NsdCatalog_Nsd: convert.NsdSerializer(),
+ NsdYang.YangData_RwProject_Project_NsdCatalog_Nsd: convert.NsdSerializer(),
RwNsdYang.YangData_Nsd_NsdCatalog_Nsd: convert.RwNsdSerializer(),
- VnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd: convert.VnfdSerializer(),
- RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd: convert.RwVnfdSerializer(),
+ RwProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd: convert.RwNsdSerializer(),
+ VnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd: convert.VnfdSerializer(),
+ RwProjectVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd: convert.RwVnfdSerializer(),
+ RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd: convert.RwVnfdSerializer()
}
HEADERS = {"content-type": "application/vnd.yang.data+json"}
@@ -65,41 +72,43 @@
self.timeout = DescriptorOnboarder.TIMEOUT_SECS
@classmethod
- def _get_headers(cls, auth):
+ def _get_headers(cls):
headers = cls.HEADERS.copy()
- if auth is not None:
- headers['authorization'] = auth
return headers
- def _get_url(self, descriptor_msg):
+ def _get_url(self, descriptor_msg, project=None):
if type(descriptor_msg) not in DescriptorOnboarder.DESC_SERIALIZER_MAP:
raise TypeError("Invalid descriptor message type")
+ if project is None:
+ project = DEFAULT_PROJECT
+
endpoint = DescriptorOnboarder.DESC_ENDPOINT_MAP[type(descriptor_msg)]
+ ep = "project/{}/{}".format(project, endpoint)
url = "{}://{}:{}/api/config/{}".format(
"https" if self._use_ssl else "http",
self._host,
self.port,
- endpoint,
+ ep,
)
return url
- def _make_request_args(self, descriptor_msg, auth=None):
+ def _make_request_args(self, descriptor_msg, auth=None, project=None):
if type(descriptor_msg) not in DescriptorOnboarder.DESC_SERIALIZER_MAP:
raise TypeError("Invalid descriptor message type")
serializer = DescriptorOnboarder.DESC_SERIALIZER_MAP[type(descriptor_msg)]
- json_data = serializer.to_json_string(descriptor_msg)
- url = self._get_url(descriptor_msg)
+ json_data = serializer.to_json_string(descriptor_msg, project_ns=True)
+ url = self._get_url(descriptor_msg, project=project)
request_args = dict(
url=url,
data=json_data,
- headers=self._get_headers(auth),
- auth=DescriptorOnboarder.AUTH,
+ headers=self._get_headers(),
+ auth=DescriptorOnboarder.AUTH if auth is None else auth,
verify=False,
cert=(self._ssl_cert, self._ssl_key) if self._use_ssl else None,
timeout=self.timeout,
@@ -107,7 +116,7 @@
return request_args
- def update(self, descriptor_msg, auth=None):
+ def update(self, descriptor_msg, auth=None, project=None):
""" Update the descriptor config
Arguments:
@@ -134,7 +143,7 @@
self._log.error(msg)
raise UpdateError(msg) from e
- def onboard(self, descriptor_msg, auth=None):
+ def onboard(self, descriptor_msg, auth=None, project=None):
""" Onboard the descriptor config
Arguments:
@@ -145,24 +154,27 @@
OnboardError - The descriptor config update failed
"""
- request_args = self._make_request_args(descriptor_msg, auth)
+ request_args = self._make_request_args(descriptor_msg, auth, project)
try:
response = requests.post(**request_args)
response.raise_for_status()
except requests.exceptions.ConnectionError as e:
msg = "Could not connect to restconf endpoint: %s" % str(e)
self._log.error(msg)
+ self._log.exception(msg)
raise OnboardError(msg) from e
except requests.exceptions.HTTPError as e:
msg = "POST request to %s error: %s" % (request_args["url"], response.text)
self._log.error(msg)
+ self._log.exception(msg)
raise OnboardError(msg) from e
except requests.exceptions.Timeout as e:
msg = "Timed out connecting to restconf endpoint: %s", str(e)
self._log.error(msg)
+ self._log.exception(msg)
raise OnboardError(msg) from e
- def get_updated_descriptor(self, descriptor_msg, auth=None):
+ def get_updated_descriptor(self, descriptor_msg, project_name, auth=None):
""" Get updated descriptor file
Arguments:
@@ -178,15 +190,16 @@
endpoint = DescriptorOnboarder.DESC_ENDPOINT_MAP[type(descriptor_msg)]
- url = "{}://{}:{}/api/config/{}/{}".format(
+ url = "{}://{}:{}/api/config/project/{}/{}/{}".format(
"https" if self._use_ssl else "http",
self._host,
self.port,
+ project_name,
endpoint,
descriptor_msg.id
)
- hdrs = self._get_headers(auth)
+ hdrs = self._get_headers()
hdrs.update({'Accept': 'application/json'})
request_args = dict(
url=url,
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/state.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/state.py
index 0028c12..48c7360 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/state.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/state.py
@@ -1,5 +1,5 @@
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/tasklet.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/tasklet.py
index 0eff616..a738f81 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/tasklet.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/tasklet.py
@@ -21,6 +21,7 @@
import tornado.httputil
import tornado.httpserver
import tornado.platform.asyncio
+import abc
import tornadostreamform.multipart_streamer as multipart_streamer
@@ -28,6 +29,7 @@
gi.require_version('RwDts', '1.0')
gi.require_version('RwcalYang', '1.0')
gi.require_version('RwTypes', '1.0')
+gi.require_version('rwlib', '1.0')
gi.require_version('RwLaunchpadYang', '1.0')
from gi.repository import (
@@ -35,15 +37,25 @@
RwLaunchpadYang as rwlaunchpad,
RwcalYang as rwcal,
RwTypes,
+ RwPkgMgmtYang
)
+import gi.repository.rwlib as rwlib
+from gi.repository.RwKeyspec import quoted_key
import rift.tasklets
import rift.mano.cloud
+import rift.mano.ro_account
import rift.mano.config_agent
+import rift.downloader as downloader
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectHandler,
+ get_add_delete_update_cfgs,
+ DEFAULT_PROJECT,
+ )
from rift.package import store
from . import uploader
-from . import datacenters
MB = 1024 * 1024
GB = 1024 * MB
@@ -52,74 +64,55 @@
MAX_BUFFER_SIZE = 1 * MB # Max. size loaded into memory!
MAX_BODY_SIZE = 1 * MB # Max. size loaded into memory!
+TaskStatus = RwPkgMgmtYang.TaskStatus
-def get_add_delete_update_cfgs(dts_member_reg, xact, key_name):
- # Unforunately, it is currently difficult to figure out what has exactly
- # changed in this xact without Pbdelta support (RIFT-4916)
- # As a workaround, we can fetch the pre and post xact elements and
- # perform a comparison to figure out adds/deletes/updates
- xact_cfgs = list(dts_member_reg.get_xact_elements(xact))
- curr_cfgs = list(dts_member_reg.elements)
+class LaunchpadError(Exception):
+ pass
- xact_key_map = {getattr(cfg, key_name): cfg for cfg in xact_cfgs}
- curr_key_map = {getattr(cfg, key_name): cfg for cfg in curr_cfgs}
-
- # Find Adds
- added_keys = set(xact_key_map) - set(curr_key_map)
- added_cfgs = [xact_key_map[key] for key in added_keys]
-
- # Find Deletes
- deleted_keys = set(curr_key_map) - set(xact_key_map)
- deleted_cfgs = [curr_key_map[key] for key in deleted_keys]
-
- # Find Updates
- updated_keys = set(curr_key_map) & set(xact_key_map)
- updated_cfgs = [xact_key_map[key] for key in updated_keys if xact_key_map[key] != curr_key_map[key]]
-
- return added_cfgs, deleted_cfgs, updated_cfgs
-
+class LpProjectNotFound(Exception):
+ pass
class CatalogDtsHandler(object):
- def __init__(self, tasklet, app):
+ def __init__(self, project, app):
self.app = app
self.reg = None
- self.tasklet = tasklet
+ self.project = project
@property
def log(self):
- return self.tasklet.log
+ return self.project.log
@property
def dts(self):
- return self.tasklet.dts
+ return self.project.dts
class NsdCatalogDtsHandler(CatalogDtsHandler):
- XPATH = "C,/nsd:nsd-catalog/nsd:nsd"
+ XPATH = "C,/project-nsd:nsd-catalog/project-nsd:nsd"
def add_nsd(self, nsd):
self.log.debug('nsd-catalog-handler:add:{}'.format(nsd.id))
- if nsd.id not in self.tasklet.nsd_catalog:
- self.tasklet.nsd_catalog[nsd.id] = nsd
+ if nsd.id not in self.project.nsd_catalog:
+ self.project.nsd_catalog[nsd.id] = nsd
else:
self.log.error("nsd already in catalog: {}".format(nsd.id))
def update_nsd(self, nsd):
self.log.debug('nsd-catalog-handler:update:{}'.format(nsd.id))
- if nsd.id in self.tasklet.nsd_catalog:
- self.tasklet.nsd_catalog[nsd.id] = nsd
+ if nsd.id in self.project.nsd_catalog:
+ self.project.nsd_catalog[nsd.id] = nsd
else:
self.log.error("unrecognized NSD: {}".format(nsd.id))
def delete_nsd(self, nsd_id):
self.log.debug('nsd-catalog-handler:delete:{}'.format(nsd_id))
- if nsd_id in self.tasklet.nsd_catalog:
- del self.tasklet.nsd_catalog[nsd_id]
+ if nsd_id in self.project.nsd_catalog:
+ del self.project.nsd_catalog[nsd_id]
else:
self.log.error("unrecognized NSD: {}".format(nsd_id))
try:
- self.tasklet.nsd_package_store.delete_package(nsd_id)
+ self.project.nsd_package_store.delete_package(nsd_id)
except store.PackageStoreError as e:
self.log.warning("could not delete package from store: %s", str(e))
@@ -127,10 +120,16 @@
def register(self):
def apply_config(dts, acg, xact, action, _):
if xact.xact is None:
- # When RIFT first comes up, an INSTALL is called with the current config
- # Since confd doesn't actally persist data this never has any data so
- # skip this for now.
- self.log.debug("No xact handle. Skipping apply config")
+ if action == rwdts.AppconfAction.INSTALL:
+ if self.reg:
+ for element in self.reg.elements:
+ self.log.debug("Add NSD on restart: {}".format(element.id))
+ self.add_nsd(element)
+ else:
+ self.log.error("DTS handle is null for project {}".
+ format(self.project.name))
+ else:
+ self.log.debug("No xact handle. Skipping apply config")
return
add_cfgs, delete_cfgs, update_cfgs = get_add_delete_update_cfgs(
@@ -151,47 +150,55 @@
for cfg in update_cfgs:
self.update_nsd(cfg)
- self.log.debug("Registering for NSD catalog")
+ self.log.debug("Registering for NSD catalog in project".
+ format(self.project.name))
acg_handler = rift.tasklets.AppConfGroup.Handler(
on_apply=apply_config,
)
with self.dts.appconf_group_create(acg_handler) as acg:
+ xpath = self.project.add_project(NsdCatalogDtsHandler.XPATH)
self.reg = acg.register(
- xpath=NsdCatalogDtsHandler.XPATH,
+ xpath=xpath,
flags=rwdts.Flag.SUBSCRIBER,
)
+ def deregister(self):
+ if self.reg:
+ self.reg.deregister()
+ self.reg = None
+
class VnfdCatalogDtsHandler(CatalogDtsHandler):
- XPATH = "C,/vnfd:vnfd-catalog/vnfd:vnfd"
+ XPATH = "C,/project-vnfd:vnfd-catalog/project-vnfd:vnfd"
def add_vnfd(self, vnfd):
self.log.debug('vnfd-catalog-handler:add:{}'.format(vnfd.id))
- if vnfd.id not in self.tasklet.vnfd_catalog:
- self.tasklet.vnfd_catalog[vnfd.id] = vnfd
+ if vnfd.id not in self.project.vnfd_catalog:
+ self.project.vnfd_catalog[vnfd.id] = vnfd
else:
self.log.error("VNFD already in catalog: {}".format(vnfd.id))
def update_vnfd(self, vnfd):
self.log.debug('vnfd-catalog-handler:update:{}'.format(vnfd.id))
- if vnfd.id in self.tasklet.vnfd_catalog:
- self.tasklet.vnfd_catalog[vnfd.id] = vnfd
+
+ if vnfd.id in self.project.vnfd_catalog:
+ self.project.vnfd_catalog[vnfd.id] = vnfd
else:
self.log.error("unrecognized VNFD: {}".format(vnfd.id))
def delete_vnfd(self, vnfd_id):
self.log.debug('vnfd-catalog-handler:delete:{}'.format(vnfd_id))
- if vnfd_id in self.tasklet.vnfd_catalog:
- del self.tasklet.vnfd_catalog[vnfd_id]
+ if vnfd_id in self.project.vnfd_catalog:
+ del self.project.vnfd_catalog[vnfd_id]
else:
self.log.error("unrecognized VNFD: {}".format(vnfd_id))
try:
- self.tasklet.vnfd_package_store.delete_package(vnfd_id)
+ self.project.vnfd_package_store.delete_package(vnfd_id)
except store.PackageStoreError as e:
self.log.warning("could not delete package from store: %s", str(e))
@@ -199,10 +206,16 @@
def register(self):
def apply_config(dts, acg, xact, action, _):
if xact.xact is None:
- # When RIFT first comes up, an INSTALL is called with the current config
- # Since confd doesn't actally persist data this never has any data so
- # skip this for now.
- self.log.debug("No xact handle. Skipping apply config")
+ if action == rwdts.AppconfAction.INSTALL:
+ if self.reg:
+ for element in self.reg.elements:
+ self.log.error("Add VNFD on restart: {}".format(element.id))
+ self.add_vnfd(element)
+ else:
+ self.log.error("DTS handle is null for project {}".
+ format(self.project.name))
+ else:
+ self.log.debug("No xact handle. Skipping apply config")
return
add_cfgs, delete_cfgs, update_cfgs = get_add_delete_update_cfgs(
@@ -223,28 +236,36 @@
for cfg in update_cfgs:
self.update_vnfd(cfg)
- self.log.debug("Registering for VNFD catalog")
+ self.log.debug("Registering for VNFD catalog in project {}".
+ format(self.project.name))
acg_handler = rift.tasklets.AppConfGroup.Handler(
on_apply=apply_config,
)
with self.dts.appconf_group_create(acg_handler) as acg:
+ xpath = self.project.add_project(VnfdCatalogDtsHandler.XPATH)
self.reg = acg.register(
- xpath=VnfdCatalogDtsHandler.XPATH,
+ xpath=xpath,
flags=rwdts.Flag.SUBSCRIBER,
)
+ def deregister(self):
+ if self.reg:
+ self.reg.deregister()
+ self.reg = None
+
class CfgAgentAccountHandlers(object):
- def __init__(self, dts, log, log_hdl, loop):
+ def __init__(self, dts, log, log_hdl, loop, project):
self._dts = dts
self._log = log
self._log_hdl = log_hdl
self._loop = loop
+ self._project = project
self._log.debug("creating config agent account config handler")
self.cfg_agent_cfg_handler = rift.mano.config_agent.ConfigAgentSubscriber(
- self._dts, self._log,
+ self._dts, self._log, self._project,
rift.mano.config_agent.ConfigAgentCallbacks(
on_add_apply=self.on_cfg_agent_account_added,
on_delete_apply=self.on_cfg_agent_account_deleted,
@@ -253,7 +274,7 @@
self._log.debug("creating config agent account opdata handler")
self.cfg_agent_operdata_handler = rift.mano.config_agent.CfgAgentDtsOperdataHandler(
- self._dts, self._log, self._loop,
+ self._dts, self._log, self._loop, self._project
)
def on_cfg_agent_account_deleted(self, account):
@@ -269,46 +290,324 @@
self.cfg_agent_cfg_handler.register()
yield from self.cfg_agent_operdata_handler.register()
+ def deregister(self):
+ self.cfg_agent_operdata_handler.deregister()
+ self.cfg_agent_cfg_handler.deregister()
+
+
class CloudAccountHandlers(object):
- def __init__(self, dts, log, log_hdl, loop, app):
+ def __init__(self, dts, log, log_hdl, loop, app, project):
self._log = log
self._log_hdl = log_hdl
self._dts = dts
self._loop = loop
self._app = app
+ self._project = project
- self._log.debug("creating cloud account config handler")
+ self._log.debug("Creating cloud account config handler for project {}".
+ format(project.name))
self.cloud_cfg_handler = rift.mano.cloud.CloudAccountConfigSubscriber(
- self._dts, self._log, self._log_hdl,
+ self._dts, self._log, self._log_hdl, self._project,
rift.mano.cloud.CloudAccountConfigCallbacks(
on_add_apply=self.on_cloud_account_added,
on_delete_apply=self.on_cloud_account_deleted,
- )
+ ),
)
self._log.debug("creating cloud account opdata handler")
self.cloud_operdata_handler = rift.mano.cloud.CloudAccountDtsOperdataHandler(
- self._dts, self._log, self._loop,
+ self._dts, self._log, self._loop, self._project,
)
def on_cloud_account_deleted(self, account_name):
self._log.debug("cloud account deleted")
- self._app.accounts.clear()
- self._app.accounts.extend(list(self.cloud_cfg_handler.accounts.values()))
+ self._app.accounts[self._project.name] = \
+ list(self.cloud_cfg_handler.accounts.values())
self.cloud_operdata_handler.delete_cloud_account(account_name)
def on_cloud_account_added(self, account):
self._log.debug("cloud account added")
- self._app.accounts.clear()
- self._app.accounts.extend(list(self.cloud_cfg_handler.accounts.values()))
+ self._app.accounts[self._project.name] = \
+ list(self.cloud_cfg_handler.accounts.values())
self._log.debug("accounts: %s", self._app.accounts)
self.cloud_operdata_handler.add_cloud_account(account)
@asyncio.coroutine
def register(self):
- self.cloud_cfg_handler.register()
+ yield from self.cloud_cfg_handler.register()
yield from self.cloud_operdata_handler.register()
+ def deregister(self):
+ self.cloud_cfg_handler.deregister()
+ self.cloud_operdata_handler.deregister()
+
+class ROAccountHandlers(object):
+ def __init__(self, dts, log, loop, app, project):
+ self._log = log
+ self._dts = dts
+ self._loop = loop
+ self._app = app
+ self._project = project
+
+ self._log.debug("Creating RO account config handler for project {}".
+ format(project.name))
+ self.ro_cfg_handler = rift.mano.ro_account.ROAccountConfigSubscriber(
+ self._dts, self._log, self._loop, self._project, None,
+ rift.mano.ro_account.ROAccountConfigCallbacks(
+ on_add_apply=self.on_ro_account_added,
+ on_delete_apply=self.on_ro_account_deleted,
+ ),
+ )
+
+ self._log.debug("Creating RO account opdata handler")
+ self.ro_operdata_handler = rift.mano.ro_account.ROAccountDtsOperdataHandler(
+ self._dts, self._log, self._loop, self._project
+ )
+
+ def on_ro_account_deleted(self, account_name):
+ self._log.debug(" launchpad tasklet RO account deleted")
+ self._app.ro_accounts[self._project.name] = \
+ list(self.ro_cfg_handler.accounts.values())
+ self.ro_operdata_handler.delete_ro_account(account_name)
+
+ def on_ro_account_added(self, account):
+ self._log.debug(" launchpad tasklet RO account added")
+ self._app.ro_accounts[self._project.name] = \
+ list(self.ro_cfg_handler.accounts.values())
+ self._log.debug("Accounts: %s", self._app.ro_accounts)
+ self.ro_operdata_handler.add_ro_account(account)
+
+ @asyncio.coroutine
+ def register(self):
+ yield from self.ro_cfg_handler.register()
+ yield from self.ro_operdata_handler.register()
+
+ def deregister(self):
+ self.ro_cfg_handler.deregister()
+ self.ro_operdata_handler.deregister()
+
+class StatusHandlers(object):
+ STATUS_MAP = {
+ downloader.DownloadStatus.STARTED: TaskStatus.QUEUED.value_nick.upper(),
+ downloader.DownloadStatus.IN_PROGRESS: TaskStatus.IN_PROGRESS.value_nick.upper(),
+ downloader.DownloadStatus.COMPLETED: TaskStatus.COMPLETED.value_nick.upper(),
+ downloader.DownloadStatus.FAILED: TaskStatus.FAILED.value_nick.upper(),
+ downloader.DownloadStatus.CANCELLED: TaskStatus.CANCELLED.value_nick.upper()
+ }
+
+ def __init__(self, dts, log, loop, app, project):
+ self.log = log
+ self.dts = dts
+ self.loop = loop
+ self.app = app
+ self.project = project
+
+ @abc.abstractmethod
+ def xpath(self, transaction_id=None):
+ return
+
+ @asyncio.coroutine
+ def register(self):
+ self.reg = yield from self.dts.register(xpath=self.xpath(),
+ flags=rwdts.Flag.PUBLISHER|rwdts.Flag.CACHE|rwdts.Flag.NO_PREP_READ)
+
+ assert self.reg is not None
+
+ def deregister(self):
+ if self.reg:
+ self.reg.deregister()
+ self.reg = None
+
+
+class UploadStatusHandlers(StatusHandlers):
+ """Publisher for status of onboarded packages.
+ """
+ def __init__(self, dts, log, loop, app, project):
+ super(UploadStatusHandlers, self).__init__(dts, log, loop, app, project)
+ self.reg = None
+ self.transaction_to_job_map = {}
+
+ def xpath(self, transaction_id=None):
+ return self.project.add_project("D,/rw-pkg-mgmt:create-jobs/rw-pkg-mgmt:job" +
+ ("[transaction-id={}]".format(quoted_key(transaction_id)) if transaction_id else ""))
+
+ def create_job_xpath(self):
+ return self.project.add_project("D,/rw-pkg-mgmt:create-jobs")
+
+ @asyncio.coroutine
+ def register(self):
+ @asyncio.coroutine
+ def on_prepare(xact_info, action, ks_path, msg):
+ """ prepare callback from dts """
+
+ if action == rwdts.QueryAction.READ:
+ xpath = ks_path.to_xpath(RwPkgMgmtYang.get_schema())
+ path_entry = RwPkgMgmtYang.YangData_RwProject_Project_CreateJobs_Job().schema().keyspec_to_entry(ks_path)
+ transaction_id = path_entry.key00.transaction_id
+ if transaction_id:
+ create_job_msg = msg.as_dict()
+ if create_job_msg:
+ if transaction_id in self.transaction_to_job_map:
+ job = self.transaction_to_job_map[transaction_id]
+ xact_info.respond_xpath(rsp_code=rwdts.XactRspCode.ACK,
+ xpath=xpath,
+ msg=job)
+ return
+ else:
+ jobs = RwPkgMgmtYang.YangData_RwProject_Project_CreateJobs()
+ for job in self.transaction_to_job_map.values():
+ jb = RwPkgMgmtYang.YangData_RwProject_Project_CreateJobs_Job.from_dict({
+ "transaction_id": job.transaction_id,
+ "status": job.status
+ })
+ jobs.job.append(jb)
+ xact_info.respond_xpath(rsp_code=rwdts.XactRspCode.ACK,
+ xpath=self.create_job_xpath(),
+ msg=jobs)
+ return
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+
+ hdl = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare,)
+ with self.dts.group_create() as group:
+ self.reg = group.register(xpath=self.xpath(),
+ handler=hdl,
+ flags=rwdts.Flag.PUBLISHER,
+ )
+
+ def upload_status(self, job, trans_id):
+ try:
+ create_job = RwPkgMgmtYang.YangData_RwProject_Project_CreateJobs_Job.from_dict({
+ "transaction_id": trans_id,
+ "status": StatusHandlers.STATUS_MAP[job.status]
+ })
+ self.transaction_to_job_map[trans_id] = create_job
+ except Exception as e:
+ self.log.error("Exception : {}".format(e))
+
+class UpdateStatusHandlers(StatusHandlers):
+ """Publisher for status of updated packages.
+ """
+ def __init__(self, dts, log, loop, app, project):
+ super(UpdateStatusHandlers, self).__init__(dts, log, loop, app, project)
+
+ def xpath(self, transaction_id=None):
+ return self.project.add_project("D,/rw-pkg-mgmt:update-jobs/rw-pkg-mgmt:job" +
+ ("[transaction-id={}]".format(quoted_key(transaction_id)) if transaction_id else ""))
+
+ @asyncio.coroutine
+ def schedule_dts_work(self, job, transaction_id):
+ # Publish the download state
+ create_job = RwPkgMgmtYang.YangData_RwProject_Project_UpdateJobs_Job.from_dict({
+ "transaction_id": transaction_id,
+ "status": StatusHandlers.STATUS_MAP[job.status]
+ })
+
+ self.reg.update_element(
+ self.xpath(transaction_id=transaction_id), create_job)
+
+ def update_status(self, job, trans_id):
+ self.log.debug("Download completed, writing status of task")
+ asyncio.ensure_future(self.schedule_dts_work(job, trans_id), loop=self.loop)
+
+class LaunchpadProject(ManoProject):
+
+ def __init__(self, name, tasklet, **kw):
+ super(LaunchpadProject, self).__init__(tasklet.log, name)
+ self.update(tasklet)
+ self._app = kw['app']
+
+ self.config_handler = None
+ self.nsd_catalog_handler = None
+ self.vld_catalog_handler = None
+ self.vnfd_catalog_handler = None
+ self.cloud_handler = None
+ self.ro_handler = None
+ self.lp_config_handler = None
+ self.account_handler = None
+ self.upload_handlers = None
+ self.update_handlers = None
+
+ self.nsd_catalog = dict()
+ self.vld_catalog = dict()
+ self.vnfd_catalog = dict()
+ self.nsd_package_store = rift.package.store.NsdPackageFilesystemStore(tasklet.log,
+ project=name)
+ self.vnfd_package_store = rift.package.store.VnfdPackageFilesystemStore(tasklet.log,
+ project=name)
+
+ @property
+ def dts(self):
+ return self._dts
+
+ @property
+ def loop(self):
+ return self._loop
+
+ @property
+ def upload_status_handler(self):
+ return self.upload_handlers
+
+ @property
+ def update_status_handler(self):
+ return self.update_handlers
+
+ @asyncio.coroutine
+ def register(self):
+ self.log.debug("creating NSD catalog handler for project {}".format(self.name))
+ self.nsd_catalog_handler = NsdCatalogDtsHandler(self, self._app)
+ yield from self.nsd_catalog_handler.register()
+
+ self.log.debug("creating VNFD catalog handler for project {}".format(self.name))
+ self.vnfd_catalog_handler = VnfdCatalogDtsHandler(self, self._app)
+ yield from self.vnfd_catalog_handler.register()
+
+ self.log.debug("creating cloud account handler for project {}".format(self.name))
+ self.cloud_handler = CloudAccountHandlers(self.dts, self.log, self.log_hdl,
+ self.loop, self._app, self)
+ yield from self.cloud_handler.register()
+
+ self.log.debug("creating RO account handler for project {}".format(self.name))
+ self.ro_handler = ROAccountHandlers(self.dts, self.log, self.loop, self._app, self)
+ yield from self.ro_handler.register()
+
+ self.log.debug("creating config agent handler for project {}".format(self.name))
+ self.config_handler = CfgAgentAccountHandlers(self.dts, self.log, self.log_hdl,
+ self.loop, self)
+ yield from self.config_handler.register()
+
+ self.log.debug("creating upload handler for project {}".format(self.name))
+ self.upload_handlers = UploadStatusHandlers(self.dts, self.log, self.loop,
+ self._app, self)
+ yield from self.upload_handlers.register()
+
+ self.log.debug("creating update handler for project {}".format(self.name))
+ self.update_handlers = UpdateStatusHandlers(self.dts, self.log, self.loop,
+ self._app, self)
+ yield from self.update_handlers.register()
+
+ def deregister(self):
+ self.log.debug("De-register handlers for project: {}".format(self.name))
+ self.config_handler.deregister()
+ self.cloud_handler.deregister()
+ self.ro_handler.deregister()
+ self.vnfd_catalog_handler.deregister()
+ self.nsd_catalog_handler.deregister()
+ self.update_handlers.deregister()
+ self.upload_handlers.deregister()
+
+ @property
+ def cloud_accounts(self):
+ if self.cloud_handler is None:
+ return list()
+
+ return list(self.cloud_handler.cloud_cfg_handler.accounts.values())
+
+ @property
+ def ro_accounts(self):
+ if self.ro_handler is None:
+ return list()
+
+ return list(self.ro_handler.ro_cfg_handler.accounts.values())
class LaunchpadTasklet(rift.tasklets.Tasklet):
UPLOAD_MAX_BODY_SIZE = MAX_BODY_SIZE
@@ -320,31 +619,32 @@
self.rwlog.set_category("rw-mano-log")
self.rwlog.set_subcategory("launchpad")
+ self.dts = None
+ self.project_handler = None
+
self.app = None
self.server = None
+ self.projects = {}
- self.account_handler = None
- self.config_handler = None
- self.nsd_catalog_handler = None
- self.vld_catalog_handler = None
- self.vnfd_catalog_handler = None
- self.cloud_handler = None
- self.datacenter_handler = None
- self.lp_config_handler = None
+ def _get_project(self, project=None):
+ if project is None:
+ project = DEFAULT_PROJECT
- self.vnfd_package_store = store.VnfdPackageFilesystemStore(self.log)
- self.nsd_package_store = store.NsdPackageFilesystemStore(self.log)
+ if project in self.projects:
+ return self.projects[project]
- self.nsd_catalog = dict()
- self.vld_catalog = dict()
- self.vnfd_catalog = dict()
+ msg = "Project {} not found".format(project)
+ self._log.error(msg)
+ raise LpProjectNotFound(msg)
- @property
- def cloud_accounts(self):
- if self.cloud_handler is None:
- return list()
+ def nsd_catalog_get(self, project=None):
+ return self._get_project(project=project).nsd_catalog
- return list(self.cloud_handler.cloud_cfg_handler.accounts.values())
+ def vnfd_catalog_get(self, project=None):
+ return self._get_project(project=project).vnfd_catalog
+
+ def get_cloud_accounts(self, project=None):
+ return self._get_project(project=project).cloud_accounts
def start(self):
super(LaunchpadTasklet, self).start()
@@ -368,60 +668,58 @@
self.log.exception("Caught Exception in LP stop")
raise
+ def get_vnfd_catalog(self, project):
+ return self.projects[project].vnfd_catalog
+
+ def get_nsd_catalog(self, project):
+ return self.projects[project].nsd_catalog
+
@asyncio.coroutine
def init(self):
- io_loop = rift.tasklets.tornado.TaskletAsyncIOLoop(asyncio_loop=self.loop)
- self.app = uploader.UploaderApplication.from_tasklet(self)
- yield from self.app.register()
+ try:
+ io_loop = rift.tasklets.tornado.TaskletAsyncIOLoop(asyncio_loop=self.loop)
+ self.app = uploader.UploaderApplication.from_tasklet(self)
+ yield from self.app.register()
- manifest = self.tasklet_info.get_pb_manifest()
- ssl_cert = manifest.bootstrap_phase.rwsecurity.cert
- ssl_key = manifest.bootstrap_phase.rwsecurity.key
- ssl_options = {
+ manifest = self.tasklet_info.get_pb_manifest()
+ ssl_cert = manifest.bootstrap_phase.rwsecurity.cert
+ ssl_key = manifest.bootstrap_phase.rwsecurity.key
+ ssl_options = {
"certfile": ssl_cert,
"keyfile": ssl_key,
- }
+ }
- if manifest.bootstrap_phase.rwsecurity.use_ssl:
- self.server = tornado.httpserver.HTTPServer(
- self.app,
- max_body_size=LaunchpadTasklet.UPLOAD_MAX_BODY_SIZE,
- io_loop=io_loop,
- ssl_options=ssl_options,
- )
-
- else:
- self.server = tornado.httpserver.HTTPServer(
- self.app,
- max_body_size=LaunchpadTasklet.UPLOAD_MAX_BODY_SIZE,
- io_loop=io_loop,
- )
-
- self.log.debug("creating NSD catalog handler")
- self.nsd_catalog_handler = NsdCatalogDtsHandler(self, self.app)
- yield from self.nsd_catalog_handler.register()
-
- self.log.debug("creating VNFD catalog handler")
- self.vnfd_catalog_handler = VnfdCatalogDtsHandler(self, self.app)
- yield from self.vnfd_catalog_handler.register()
-
- self.log.debug("creating datacenter handler")
- self.datacenter_handler = datacenters.DataCenterPublisher(self.log, self.dts, self.loop)
- yield from self.datacenter_handler.register()
-
- self.log.debug("creating cloud account handler")
- self.cloud_handler = CloudAccountHandlers(
- self.dts, self.log, self.log_hdl, self.loop, self.app
+ if manifest.bootstrap_phase.rwsecurity.use_ssl:
+ self.server = tornado.httpserver.HTTPServer(
+ self.app,
+ max_body_size=LaunchpadTasklet.UPLOAD_MAX_BODY_SIZE,
+ io_loop=io_loop,
+ ssl_options=ssl_options,
)
- yield from self.cloud_handler.register()
- self.log.debug("creating config agent handler")
- self.config_handler = CfgAgentAccountHandlers(self.dts, self.log, self.log_hdl, self.loop)
- yield from self.config_handler.register()
+ else:
+ self.server = tornado.httpserver.HTTPServer(
+ self.app,
+ max_body_size=LaunchpadTasklet.UPLOAD_MAX_BODY_SIZE,
+ io_loop=io_loop,
+ )
+
+ self.log.debug("Registering project handler")
+ self.project_handler = ProjectHandler(self, LaunchpadProject,
+ app=self.app)
+ self.project_handler.register()
+
+ except Exception as e:
+ self.log.error("Exception : {}".format(e))
+ self.log.exception(e)
@asyncio.coroutine
def run(self):
- self.server.listen(LaunchpadTasklet.UPLOAD_PORT)
+ address = rwlib.getenv("RWVM_INTERNAL_IPADDR")
+ if (address is None):
+ address=""
+ self.server.listen(LaunchpadTasklet.UPLOAD_PORT, address=address)
+ self.server.listen(LaunchpadTasklet.UPLOAD_PORT, address="127.0.0.1")
def on_instance_started(self):
self.log.debug("Got instance started callback")
@@ -456,3 +754,4 @@
next_state = switch.get(state, None)
if next_state is not None:
self.dts.handle.set_state(next_state)
+
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/uploader.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/uploader.py
index e89c50a..7aafcb9 100644
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/uploader.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/rift/tasklets/rwlaunchpad/uploader.py
@@ -22,6 +22,7 @@
import threading
import uuid
import zlib
+import re
import tornado
import tornado.escape
@@ -38,18 +39,16 @@
import gi
gi.require_version('RwLaunchpadYang', '1.0')
-gi.require_version('NsdYang', '1.0')
-gi.require_version('VnfdYang', '1.0')
+gi.require_version('ProjectNsdYang', '1.0')
+gi.require_version('ProjectVnfdYang', '1.0')
from gi.repository import (
- NsdYang,
- VnfdYang,
+ ProjectNsdYang as NsdYang,
+ ProjectVnfdYang as VnfdYang,
)
import rift.mano.cloud
-import rift.package.charm
import rift.package.checksums
-import rift.package.config
import rift.package.convert
import rift.package.handler as pkg_handler
import rift.package.icon
@@ -59,7 +58,8 @@
from gi.repository import (
RwDts as rwdts,
- RwPkgMgmtYang)
+ RwPkgMgmtYang
+ )
import rift.downloader as downloader
import rift.mano.dts as mano_dts
import rift.tasklets
@@ -128,6 +128,8 @@
from .tosca import ExportTosca
+from .onboard import OnboardError as OnboardException
+
MB = 1024 * 1024
GB = 1024 * MB
@@ -137,8 +139,6 @@
RPC_PACKAGE_CREATE_ENDPOINT = RwPkgMgmtYang.YangOutput_RwPkgMgmt_PackageCreate
RPC_PACKAGE_UPDATE_ENDPOINT = RwPkgMgmtYang.YangOutput_RwPkgMgmt_PackageUpdate
-
-
class HttpMessageError(Exception):
def __init__(self, code, msg):
self.code = code
@@ -146,12 +146,12 @@
class UploadRpcHandler(mano_dts.AbstractRpcHandler):
- def __init__(self, log, dts, loop, application):
+ def __init__(self, application):
"""
Args:
application: UploaderApplication
"""
- super().__init__(log, dts, loop)
+ super().__init__(application.log, application.dts, application.loop)
self.application = application
@property
@@ -164,30 +164,41 @@
log = self.application.get_logger(transaction_id)
log.message(OnboardStart())
+ self.log.debug("Package create RPC: {}".format(msg))
auth = None
if msg.username is not None:
auth = (msg.username, msg.password)
+ try:
+ project = msg.project_name
+ except AttributeError as e:
+ self._log.warning("Did not get project name in RPC: {}".
+ format(msg.as_dict()))
+ project = rift.mano.utils.project.DEFAULT_PROJECT
+
self.application.onboard(
msg.external_url,
transaction_id,
- auth=auth
+ auth=auth,
+ project=project,
)
rpc_op = RPC_PACKAGE_CREATE_ENDPOINT.from_dict({
- "transaction_id": transaction_id})
+ "transaction_id": transaction_id,
+ "project_name": project,
+ })
return rpc_op
class UpdateRpcHandler(mano_dts.AbstractRpcHandler):
- def __init__(self, log, dts, loop, application):
+ def __init__(self, application):
"""
Args:
application: UploaderApplication
"""
- super().__init__(log, dts, loop)
+ super().__init__(application.log, application.dts, application.loop)
self.application = application
@property
@@ -208,11 +219,14 @@
self.application.update(
msg.external_url,
transaction_id,
- auth=auth
+ auth=auth,
+ project=msg.project_name,
)
rpc_op = RPC_PACKAGE_UPDATE_ENDPOINT.from_dict({
- "transaction_id": transaction_id})
+ "transaction_id": transaction_id,
+ "project_name": msg.project_name,
+ })
return rpc_op
@@ -231,16 +245,18 @@
class UpdatePackage(downloader.DownloaderProtocol):
- def __init__(self, log, loop, url, auth,
- onboarder, uploader, package_store_map):
+ def __init__(self, log, loop, project, url, auth,
+ onboarder, uploader, package_store_map, transaction_id):
super().__init__()
self.log = log
self.loop = loop
+ self.project = project
self.url = url
self.auth = auth
self.onboarder = onboarder
self.uploader = uploader
self.package_store_map = package_store_map
+ self.transaction_id = transaction_id
def _update_package(self, packages):
@@ -251,14 +267,10 @@
with pkg as temp_package:
package_checksums = self.validate_package(temp_package)
stored_package = self.update_package(temp_package)
- self.validate_vnfd_fields(temp_package)
+ self.validate_descriptor_fields(temp_package)
try:
- self.extract_charms(temp_package)
- self.extract_scripts(temp_package)
- self.extract_configs(temp_package)
self.extract_icons(temp_package)
-
self.update_descriptors(temp_package)
except Exception:
@@ -276,6 +288,7 @@
except MessageException as e:
self.log.message(e.msg)
self.log.message(UpdateFailure())
+ raise UpdateFailure(str(e))
except Exception as e:
self.log.exception(e)
@@ -290,8 +303,20 @@
file_backed_packages = extractor.create_packages_from_upload(
job.filename, job.filepath
)
+ try:
+ self.extract(file_backed_packages)
+ except Exception as e:
+ raise Exception("Error in Package Update")
- self.extract(file_backed_packages)
+ def on_download_finished(self, job):
+ self.log.debug("*** Download completed")
+ if hasattr(self.project, 'update_status_handler'):
+ self.project.update_status_handler.update_status(job, self.transaction_id)
+
+ def on_download_progress(self, job):
+ self.log.debug("*** Download in progress")
+ if hasattr(self.project, 'update_status_handler'):
+ self.project.update_status_handler.update_status(job, self.transaction_id)
def on_download_failed(self, job):
self.log.error(job.detail)
@@ -355,7 +380,7 @@
)
try:
self.uploader.upload_image(image_name, image_checksum, image_hdl)
- self.uploader.upload_image_to_cloud_accounts(image_name, image_checksum)
+ self.uploader.upload_image_to_cloud_accounts(image_name, image_checksum, self.project)
except image.ImageUploadError as e:
self.log.exception("Failed to upload image: %s", image_name)
@@ -364,27 +389,6 @@
finally:
_ = [image_hdl.close() for image_hdl in name_hdl_map.values()]
- def extract_charms(self, package):
- try:
- charm_extractor = rift.package.charm.PackageCharmExtractor(self.log)
- charm_extractor.extract_charms(package)
- except rift.package.charm.CharmExtractionError as e:
- raise MessageException(UpdateExtractionError()) from e
-
- def extract_scripts(self, package):
- try:
- script_extractor = rift.package.script.PackageScriptExtractor(self.log)
- script_extractor.extract_scripts(package)
- except rift.package.script.ScriptExtractionError as e:
- raise MessageException(UpdateExtractionError()) from e
-
- def extract_configs(self, package):
- try:
- config_extractor = rift.package.config.PackageConfigExtractor(self.log)
- config_extractor.extract_configs(package)
- except rift.package.config.ConfigExtractionError as e:
- raise MessageException(UpdateExtractionError()) from e
-
def extract_icons(self, package):
try:
icon_extractor = rift.package.icon.PackageIconExtractor(self.log)
@@ -392,7 +396,7 @@
except rift.package.icon.IconExtractionError as e:
raise MessageException(UpdateExtractionError()) from e
- def validate_vnfd_fields(self, package):
+ def validate_descriptor_fields(self, package):
# We can add more VNFD validations here. Currently we are validating only cloud-init
if package.descriptor_msg is not None:
self.validate_cloud_init_file(package)
@@ -427,22 +431,24 @@
self.log.message(UpdateDescriptorUpdate())
try:
- self.onboarder.update(descriptor_msg)
+ self.onboarder.update(descriptor_msg, project=self.project.name)
except onboard.UpdateError as e:
raise MessageException(UpdateDescriptorError(package.descriptor_file)) from e
class OnboardPackage(downloader.DownloaderProtocol):
- def __init__(self, log, loop, url, auth,
- onboarder, uploader, package_store_map):
+ def __init__(self, log, loop, project, url, auth,
+ onboarder, uploader, package_store_map, transaction_id):
self.log = log
self.loop = loop
+ self.project = project
self.url = url
self.auth = auth
self.onboarder = onboarder
self.uploader = uploader
self.package_store_map = package_store_map
+ self.transaction_id = transaction_id
def _onboard_package(self, packages):
# Extract package could return multiple packages if
@@ -451,20 +457,16 @@
with pkg as temp_package:
package_checksums = self.validate_package(temp_package)
stored_package = self.store_package(temp_package)
- self.validate_vnfd_fields(temp_package)
+ self.validate_descriptor_fields(temp_package)
try:
- self.extract_charms(temp_package)
- self.extract_scripts(temp_package)
- self.extract_configs(temp_package)
self.extract_icons(temp_package)
-
self.onboard_descriptors(temp_package)
- except Exception:
- self.delete_stored_package(stored_package)
+ except Exception as e:
+ if "data-exists" not in e.msg.text:
+ self.delete_stored_package(stored_package)
raise
-
else:
self.upload_images(temp_package, package_checksums)
@@ -476,6 +478,8 @@
except MessageException as e:
self.log.message(e.msg)
self.log.message(OnboardFailure())
+ raise OnboardException(OnboardFailure())
+
except Exception as e:
self.log.exception(e)
@@ -490,8 +494,20 @@
file_backed_packages = extractor.create_packages_from_upload(
job.filename, job.filepath
)
+ try:
+ self.extract(file_backed_packages)
+ except Exception as e:
+ raise Exception("Error in Onboarding Package")
- self.extract(file_backed_packages)
+ def on_download_finished(self, job):
+ self.log.debug("*** Download completed")
+ if hasattr(self.project, 'upload_status_handler'):
+ self.project.upload_status_handler.upload_status(job, self.transaction_id)
+
+ def on_download_progress(self, job):
+ self.log.debug("*** Download in progress")
+ if hasattr(self.project, 'upload_status_handler'):
+ self.project.upload_status_handler.upload_status(job, self.transaction_id)
def on_download_failed(self, job):
self.log.error(job.detail)
@@ -500,6 +516,7 @@
def download_package(self):
+ self.log.debug("Before pkg download, project = {}".format(self.project.name))
_, filename = tempfile.mkstemp()
url_downloader = downloader.UrlDownloader(
self.url,
@@ -551,36 +568,16 @@
package.open(image_file_map[image_name])
)
try:
- self.uploader.upload_image(image_name, image_checksum, image_hdl)
- self.uploader.upload_image_to_cloud_accounts(image_name, image_checksum)
+ set_image_property = {}
+ self.uploader.upload_image(image_name, image_checksum, image_hdl, set_image_property)
+ self.uploader.upload_image_to_cloud_accounts(image_name, image_checksum, self.project.name)
except image.ImageUploadError as e:
- raise MessageException(OnboardImageUploadError()) from e
+ raise MessageException(OnboardImageUploadError(str(e))) from e
finally:
_ = [image_hdl.close() for image_hdl in name_hdl_map.values()]
- def extract_charms(self, package):
- try:
- charm_extractor = rift.package.charm.PackageCharmExtractor(self.log)
- charm_extractor.extract_charms(package)
- except rift.package.charm.CharmExtractionError as e:
- raise MessageException(OnboardExtractionError()) from e
-
- def extract_scripts(self, package):
- try:
- script_extractor = rift.package.script.PackageScriptExtractor(self.log)
- script_extractor.extract_scripts(package)
- except rift.package.script.ScriptExtractionError as e:
- raise MessageException(OnboardExtractionError()) from e
-
- def extract_configs(self, package):
- try:
- config_extractor = rift.package.config.PackageConfigExtractor(self.log)
- config_extractor.extract_configs(package)
- except rift.package.config.ConfigExtractionError as e:
- raise MessageException(OnboardExtractionError()) from e
-
def extract_icons(self, package):
try:
icon_extractor = rift.package.icon.PackageIconExtractor(self.log)
@@ -588,10 +585,23 @@
except rift.package.icon.IconExtractionError as e:
raise MessageException(OnboardExtractionError()) from e
- def validate_vnfd_fields(self, package):
- # We can add more VNFD validations here. Currently we are validating only cloud-init
+ def validate_descriptor_fields(self, package):
+ # We can add more VNFD/NSD validations here.
if package.descriptor_msg is not None:
self.validate_cloud_init_file(package)
+ self.validate_vld_mgmt_network(package)
+
+ def validate_vld_mgmt_network(self, package):
+ """ This is validation at onboarding of NSD for atleast one of the VL's to have mgmt network true
+ and have minimum one connection point"""
+ if package.descriptor_type == 'nsd':
+ for vld in package.descriptor_msg.as_dict().get('vld',[]):
+ if vld.get('mgmt_network', False) is True and \
+ len(vld.get('vnfd_connection_point_ref',[])) > 0 :
+ break
+ else:
+ self.log.error(("AtLeast One of the VL's should have Management Network as True "
+ "and have minimum one connection point"))
def validate_cloud_init_file(self, package):
""" This validation is for VNFDs with associated VDUs. """
@@ -624,14 +634,37 @@
return validators[0].checksums
def onboard_descriptors(self, package):
- descriptor_msg = package.descriptor_msg
+ def process_error_messsage(exception, package):
+ """
+ This method captures error reason. This needs to be enhanced with time.
+ """
+ exception_msg = str(exception)
+ match_duplicate = re.findall('<error-tag>(.*?)</error-tag>', exception_msg, re.DOTALL)
+
+ if len(match_duplicate) > 0:
+ error_message = str(match_duplicate[0])
+ return error_message
+ match = re.findall('<tailf:missing-element>(.*?)</tailf:missing-element>', exception_msg, re.DOTALL)
+ error_message = ""
+ if len(match) > 0:
+ for element in match:
+ element_message = "Missing element : {}".format(element)
+ error_message += element_message
+ else:
+ error_message = package.descriptor_file
+ return error_message
+
+ def process_exception(exception, package):
+ return OnboardDescriptorError(process_error_messsage(exception, package))
+
+ descriptor_msg = package.descriptor_msg
self.log.message(OnboardDescriptorOnboard())
try:
- self.onboarder.onboard(descriptor_msg)
+ self.onboarder.onboard(descriptor_msg, project=self.project.name)
except onboard.OnboardError as e:
- raise MessageException(OnboardDescriptorError(package.descriptor_file)) from e
+ raise MessageException(process_exception(e, package)) from e
class UploaderApplication(tornado.web.Application):
@@ -643,29 +676,22 @@
ssl_cert = manifest.bootstrap_phase.rwsecurity.cert
ssl_key = manifest.bootstrap_phase.rwsecurity.key
return cls(
- tasklet.log,
- tasklet.dts,
- tasklet.loop,
- ssl=(ssl_cert, ssl_key),
- vnfd_store=tasklet.vnfd_package_store,
- nsd_store=tasklet.nsd_package_store,
- vnfd_catalog=tasklet.vnfd_catalog,
- nsd_catalog=tasklet.nsd_catalog)
+ tasklet,
+ ssl=(ssl_cert, ssl_key))
def __init__(
self,
- log,
- dts,
- loop,
+ tasklet,
ssl=None,
vnfd_store=None,
- nsd_store=None,
- vnfd_catalog=None,
- nsd_catalog=None):
+ nsd_store=None):
- self.log = log
- self.loop = loop
- self.dts = dts
+ self.log = tasklet.log
+ self.loop = tasklet.loop
+ self.dts = tasklet.dts
+
+ self.accounts = {}
+ self.ro_accounts = {}
self.use_ssl = False
self.ssl_cert, self.ssl_key = None, None
@@ -673,55 +699,36 @@
self.use_ssl = True
self.ssl_cert, self.ssl_key = ssl
- if not vnfd_store:
- vnfd_store = rift.package.store.VnfdPackageFilesystemStore(self.log)
-
- if not nsd_store:
- nsd_store = rift.package.store.NsdPackageFilesystemStore(self.log)
-
- self.accounts = []
self.messages = collections.defaultdict(list)
- self.export_dir = os.path.join(os.environ['RIFT_ARTIFACTS'], 'launchpad/exports')
+ self.export_dir = os.path.join(os.environ['RIFT_VAR_ROOT'], 'launchpad/exports')
self.uploader = image.ImageUploader(self.log, self.loop, self.dts)
self.onboarder = onboard.DescriptorOnboarder(
self.log, "127.0.0.1", 8008, self.use_ssl, self.ssl_cert, self.ssl_key
)
- self.package_store_map = {
- "vnfd": vnfd_store,
- "nsd": nsd_store
- }
self.exporter = export.DescriptorPackageArchiveExporter(self.log)
self.loop.create_task(export.periodic_export_cleanup(self.log, self.loop, self.export_dir))
- self.vnfd_catalog = vnfd_catalog
- self.nsd_catalog = nsd_catalog
+ self.tasklet = tasklet
+ self.get_vnfd_catalog = tasklet.get_vnfd_catalog
+ self.get_nsd_catalog = tasklet.get_nsd_catalog
catalog_map = {
- "vnfd": self.vnfd_catalog,
- "nsd": self.nsd_catalog
+ "vnfd": self.get_vnfd_catalog,
+ "nsd": self.get_nsd_catalog
}
- self.upload_handler = UploadRpcHandler(self.log, self.dts, self.loop, self)
- self.update_handler = UpdateRpcHandler(self.log, self.dts, self.loop, self)
- self.export_handler = export.ExportRpcHandler(
- self.log,
- self.dts,
- self.loop,
- self,
- store_map=self.package_store_map,
- exporter=self.exporter,
- onboarder=self.onboarder,
- catalog_map=catalog_map
- )
+ self.upload_handler = UploadRpcHandler(self)
+ self.update_handler = UpdateRpcHandler(self)
+ self.export_handler = export.ExportRpcHandler(self, catalog_map)
attrs = dict(log=self.log, loop=self.loop)
super(UploaderApplication, self).__init__([
(r"/api/package/vnfd/(.*)", pkg_handler.FileRestApiHandler, {
- 'path': vnfd_store.root_dir}),
+ 'path': rift.package.store.VnfdPackageFilesystemStore.DEFAULT_ROOT_DIR}),
(r"/api/package/nsd/(.*)", pkg_handler.FileRestApiHandler, {
- 'path': nsd_store.root_dir}),
+ 'path': rift.package.store.NsdPackageFilesystemStore.DEFAULT_ROOT_DIR}),
(r"/api/upload/([^/]+)/state", UploadStateHandler, attrs),
(r"/api/update/([^/]+)/state", UpdateStateHandler, attrs),
@@ -744,33 +751,61 @@
def get_logger(self, transaction_id):
return message.Logger(self.log, self.messages[transaction_id])
- def onboard(self, url, transaction_id, auth=None):
+ def build_store_map(self, project=None):
+ ''' Use project information to build vnfd/nsd filesystem stores with appropriate
+ package directory root.
+ '''
+ vnfd_store = rift.package.store.VnfdPackageFilesystemStore(self.log) if not \
+ project else rift.package.store.VnfdPackageFilesystemStore(self.log, project=project)
+ nsd_store = rift.package.store.NsdPackageFilesystemStore(self.log) if not \
+ project else rift.package.store.NsdPackageFilesystemStore(self.log, project=project)
+
+ return dict(vnfd = vnfd_store, nsd = nsd_store)
+
+ def onboard(self, url, transaction_id, auth=None, project=None):
log = message.Logger(self.log, self.messages[transaction_id])
+ try:
+ self.project = self.tasklet._get_project(project)
+ except Exception as e:
+ self.log.error("Exception raised ...%s" % (str(e)))
+ self.log.exception(e)
+
+ self.package_store_map = self.build_store_map(project)
onboard_package = OnboardPackage(
log,
self.loop,
+ self.project,
url,
auth,
self.onboarder,
self.uploader,
self.package_store_map,
+ transaction_id
)
self.loop.run_in_executor(None, onboard_package.download_package)
- def update(self, url, transaction_id, auth=None):
+ def update(self, url, transaction_id, auth=None, project=None):
log = message.Logger(self.log, self.messages[transaction_id])
+ try:
+ self.project = self.tasklet._get_project(project)
+ except Exception as e:
+ self.log.error("Exception raised ...%s" % (str(e)))
+ self.log.exception(e)
+
+ self.package_store_map = self.build_store_map(project)
update_package = UpdatePackage(
log,
self.loop,
+ self.project,
url,
auth,
self.onboarder,
self.uploader,
self.package_store_map,
+ transaction_id
)
self.loop.run_in_executor(None, update_package.download_package)
-
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/scripts/onboard_pkg b/rwlaunchpad/plugins/rwlaunchpadtasklet/scripts/onboard_pkg
index ba82e7e..b5c805b 100755
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/scripts/onboard_pkg
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/scripts/onboard_pkg
@@ -100,12 +100,14 @@
self._log = log
self._args = args
+ self._project = args.project
+
self._pkgs = None
self._service_name = None
self._nsd_id = None
self._dc = None
- self._account = None
+ self._ro = None
self._ip = args.so_ip
self._api_server_ip = "localhost"
@@ -121,30 +123,36 @@
user=self._user,
passwd=self._password,
api_server_ip=self._api_server_ip)
+
self._upload_url = "curl -k https://{ip}:{port}/api/upload". \
format(ip=self._ip,
port=self._uport)
self._headers = '-H "accept: application/json"' + \
' -H "content-type: application/json"'
- self._conf_url = "curl -k {header} --user \"{user}:{passwd}\" https://{ip}:{port}/api/config". \
+
+ self._conf_url = "curl -k {header} --user \"{user}:{passwd}\" https://{ip}:{port}/api/config/project/{project}". \
format(header=self._headers,
user=self._user,
passwd=self._password,
ip=self._ip,
- port=self._rport)
- self._oper_url = "curl -k {header} --user \"{user}:{passwd}\" https://{ip}:{port}/api/operational". \
+ port=self._rport,
+ project=self._project)
+
+ self._oper_url = "curl -k {header} --user \"{user}:{passwd}\" https://{ip}:{port}/api/operational/project/{project}". \
format(header=self._headers,
user=self._user,
passwd=self._password,
ip=self._ip,
- port=self._rport)
+ port=self._rport,
+ project=self._project)
@property
def log(self):
return self._log
def validate_args(self):
+ args = self._args
if args.upload_pkg is not None:
self._pkgs = args.upload_pkg
self.log.debug("Packages to upload: {}".format(self._pkgs))
@@ -161,28 +169,20 @@
raise OnboardPkgMissingDescId("NS Descriptor ID required for instantiation")
if args.datacenter:
- try:
- uuid.UUID(args.datacenter)
- self._dc = args.datacenter
- except ValueError as e:
- raise OnboardPkgInvalidDescId("Invalid UUID for datacenter: {}".
- format(args.datacenter))
+ self._dc = args.datacenter
- elif args.vim_account:
- self._account = args.vim_account
-
- else:
- raise OnboardPkgMissingAcct("Datacenter or VIM account required for instantiation")
-
+ if args.resource_orchestrator:
+ self._ro = args.resource_orchestrator
+
self._service_name = args.instantiate
self._nsd_id = args.nsd_id
self.log.debug("Instantiate NSD {} as {} on {}".format(self._nsd_id,
self._service_name,
- self._account))
+ self._dc))
- if (self._pkgs is None) and (self._nsd_id is None):
- raise OnboardPkgInputError("Need to specify either upload-pkg or instantiate options")
+ if (self._pkgs is None) and (self._nsd_id is None) and (not args.list_nsds):
+ raise OnboardPkgInputError("Need to specify either upload-pkg or instantiate or list options")
# Validate the port numbers are correct
def valid_port(port):
@@ -224,7 +224,7 @@
self.log.debug("Check connectivity to SO at {}:{}, with credentials {}:{}".
format(self._ip, self._rport, self._user, self._password))
- rest_url = self._conf_url+"/resource-orchestrator"
+ rest_url = self._conf_url+"/ro-account"
try:
output = self._exec_cmd(rest_url)
self.log.debug("Output of restconf validation: {}".
@@ -283,42 +283,6 @@
self.log.debug("No NSD ID provided for instantiation")
return
- # Check to see if datacenter is valid
- if self._dc:
- dc_url = "{url}/datacenters". format(url=self._oper_url)
- output = self._exec_cmd(dc_url)
- if (output is None) or (len(output) == 0):
- # Account not found
- raise OnboardPkgDcError("Datacenter {} provided is not valid".
- format(self._dc))
- found = False
- js = json.loads(output)
- if "ro-accounts" in js["rw-launchpad:datacenters"]:
- for ro in js["rw-launchpad:datacenters"]["ro-accounts"]:
- if "datacenters" in ro:
- for dc in ro["datacenters"]:
- if dc["uuid"] == self._dc:
- self.log.debug("Found datacenter {}".format(dc))
- found = True
- break
- if found:
- break
-
- if found is False:
- raise OnboardPkgDcError("Datacenter {} provided is not valid".
- format(self._dc))
-
-
- # Check cloud account is valid, if provided
- if self._account:
- acct_url = "{url}/cloud/account/{acct}". \
- format(url=self._conf_url, acct=self._account)
- output = self._exec_cmd(acct_url)
- if (output is None) or (len(output) == 0):
- # Account not found
- raise OnboardPkgAcctError("VIM/Cloud account {} provided is not valid".
- format(self._account))
-
# Check id NSD ID is valid
nsd_url = "{url}/nsd-catalog/nsd/{nsd_id}". \
format(url=self._conf_url, nsd_id=self._nsd_id)
@@ -334,7 +298,12 @@
format(self._nsd_id,
js['error']))
- nsd = js['nsd:nsd']
+ try:
+ nsd = js['project-nsd:nsd']
+ except KeyError as e:
+ raise OnboardPkgNsdError("NSD ID {} provided is not valid".
+ format(self._nsd_id))
+
self.log.debug("NSD to instantiate: {}".format(nsd))
# Generate a UUID for NS
@@ -346,9 +315,10 @@
'name': self._service_name,
"nsd": nsd,}
if self._dc:
- nsr['om-datacenter'] = self._dc
- else:
- nsr['cloud-account'] = self._account
+ nsr['datacenter'] = self._dc
+
+ if self._ro:
+ nsr['resource-orchestrator'] = self._ro
data = {'nsr': [nsr]}
@@ -381,6 +351,35 @@
self.log.info("Successfully initiated instantiation of NS as {} ({})".
format(self._service_name, ns_id))
+ def list_nsds(self):
+ if self._args.list_nsds:
+ self.log.debug("Check NSDS at {}:{}, with credentials {}:{}".
+ format(self._ip, self._rport, self._user, self._password))
+
+ rest_url = self._conf_url+"/nsd-catalog/nsd"
+ try:
+ output = self._exec_cmd(rest_url)
+ self.log.debug("Output of NSD list: {}".
+ format(output))
+ if output:
+ js = json.loads(output)
+ if "error" in js:
+ raise OnboardPkgRcConnError("SO Restconf connect error: {}".
+ format(js["error"]))
+ else:
+ print("No NSDs found on SO")
+ return
+
+ self.log.debug("NSD list: {}".format(js))
+ print('List of NSDs on SO:\nName\tID')
+ for nsd in js['project-nsd:nsd']:
+ print('{}\t{}'.format(nsd['name'], nsd['id']))
+
+ except OnboardPkgCmdError as e:
+ self.log.error("SO restconf connect failed: {}".format(e))
+ raise OnboardPkgRcConnError("SO Restconf connect error: {}".
+ format(e))
+
def process(self):
try:
self.validate_args()
@@ -396,6 +395,7 @@
self.validate_connectivity()
self.upload_packages()
self.instantiate()
+ self.list_nsds()
if __name__ == "__main__":
@@ -407,15 +407,20 @@
help="Descriptor packages to upload. " + \
"If multiple descriptors are provided, they are uploaded in the same sequence.")
+ parser.add_argument("-l", "--list-nsds", action='store_true',
+ help="List available network service descriptors")
+
parser.add_argument("-i", "--instantiate",
help="Instantiate a network service with the name")
parser.add_argument("-d", "--nsd-id",
help="Network descriptor ID to instantiate")
parser.add_argument("-D", "--datacenter",
help="OpenMano datacenter to instantiate on")
- parser.add_argument("-c", "--vim-account",
- help="Cloud/VIM account to instantiate on")
+ parser.add_argument("-r", "--resource-orchestrator",
+ help="RO account to instantiate on")
+ parser.add_argument("--project", default='default',
+ help="Project to use, default 'default'")
parser.add_argument("-o", "--onboard-port", default=8443, type=int,
help="Onboarding port number - node port number, default 8443")
parser.add_argument("-p", "--upload-port", default=4567, type=int,
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_export.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_export.py
index 7a787c7..b3abc37 100755
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_export.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_export.py
@@ -29,10 +29,12 @@
import uuid
import xmlrunner
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
import rift.package.archive
-import rift.package.charm
import rift.package.checksums
-import rift.package.config
import rift.package.convert
import rift.package.icon
import rift.package.package
@@ -42,10 +44,11 @@
from rift.tasklets.rwlaunchpad import export
import gi
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('ProjectVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
from gi.repository import (
- RwVnfdYang,
- VnfdYang,
+ RwProjectVnfdYang as RwVnfdYang,
+ ProjectVnfdYang as VnfdYang,
)
import utest_package
@@ -59,7 +62,7 @@
self._vnfd_serializer = rift.package.convert.VnfdSerializer()
def test_create_archive(self):
- rw_vnfd_msg = RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd(
+ rw_vnfd_msg = RwVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd(
id="new_id", name="new_name", description="new_description"
)
json_desc_str = self._rw_vnfd_serializer.to_json_string(rw_vnfd_msg)
@@ -80,11 +83,11 @@
self.assertEqual(package.descriptor_msg, rw_vnfd_msg)
def test_export_package(self):
- rw_vnfd_msg = RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd(
+ rw_vnfd_msg = RwVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd(
id="new_id", name="new_name", description="new_description",
meta="THIS FIELD IS NOT IN REGULAR VNFD"
)
- vnfd_msg = VnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd()
+ vnfd_msg = VnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd()
vnfd_msg.from_dict(rw_vnfd_msg.as_dict(), ignore_missing_keys=True)
self.assertNotEqual(rw_vnfd_msg, vnfd_msg)
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_fileserver.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_fileserver.py
index e56ec04..812f332 100755
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_fileserver.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_fileserver.py
@@ -33,12 +33,12 @@
from rift.package.handler import FileRestApiHandler
import gi
-gi.require_version('NsdYang', '1.0')
-gi.require_version('VnfdYang', '1.0')
+gi.require_version('ProjectNsdYang', '1.0')
+gi.require_version('ProjectVnfdYang', '1.0')
from gi.repository import (
- NsdYang,
- VnfdYang,
+ ProjectNsdYang as NsdYang,
+ ProjectVnfdYang as VnfdYang,
)
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_onboard.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_onboard.py
index 871132f..0b0c931 100755
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_onboard.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_onboard.py
@@ -22,6 +22,7 @@
import base64
import concurrent.futures
import io
+import json
import logging
import os
import sys
@@ -31,26 +32,30 @@
import uuid
import xmlrunner
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
from rift.package import convert
from rift.tasklets.rwlaunchpad import onboard
import rift.test.dts
+import functools
import gi
gi.require_version('NsdYang', '1.0')
gi.require_version('VnfdYang', '1.0')
+gi.require_version('ProjectNsdYang', '1.0')
+gi.require_version('ProjectVnfdYang', '1.0')
from gi.repository import (
NsdYang,
VnfdYang,
+ ProjectNsdYang,
+ ProjectVnfdYang,
)
class RestconfDescriptorHandler(tornado.web.RequestHandler):
- DESC_SERIALIZER_MAP = {
- "nsd": convert.NsdSerializer(),
- "vnfd": convert.VnfdSerializer(),
- }
-
class AuthError(Exception):
pass
@@ -129,16 +134,14 @@
self._verify_content_type_header()
def _verify_request_body(self, descriptor_type):
- if descriptor_type not in RestconfDescriptorHandler.DESC_SERIALIZER_MAP:
+ if descriptor_type not in ['nsd', 'vnfd']:
raise ValueError("Unsupported descriptor type: %s" % descriptor_type)
- body = self.request.body
- bytes_hdl = io.BytesIO(body)
-
- serializer = RestconfDescriptorHandler.DESC_SERIALIZER_MAP[descriptor_type]
+ body = convert.decode(self.request.body)
+ self._logger.debug("Received msg: {}".format(body))
try:
- message = serializer.from_file_hdl(bytes_hdl, ".json")
+ message = json.loads(body)
except convert.SerializationError as e:
self.set_status(400)
self._transforms = []
@@ -150,7 +153,7 @@
self._info.last_request_message = message
- self._logger.debug("Received a valid descriptor request")
+ self._logger.debug("Received a valid descriptor request: {}".format(message))
def put(self, descriptor_type):
self._info.last_descriptor_type = descriptor_type
@@ -195,7 +198,12 @@
class OnboardTestCase(tornado.testing.AsyncHTTPTestCase):
- AUTH = ("admin", "admin")
+ DESC_SERIALIZER_MAP = {
+ "nsd": convert.NsdSerializer(),
+ "vnfd": convert.VnfdSerializer(),
+ }
+
+ AUTH = ("admin","admin")
def setUp(self):
self._log = logging.getLogger(__file__)
self._loop = asyncio.get_event_loop()
@@ -213,28 +221,44 @@
def get_app(self):
attrs = dict(auth=OnboardTestCase.AUTH, log=self._log, info=self._handler_info)
return tornado.web.Application([
- (r"/api/config/.*/(nsd|vnfd)", RestconfDescriptorHandler, attrs),
+ (r"/api/config/project/default/.*/(nsd|vnfd)",
+ RestconfDescriptorHandler, attrs),
])
+
+ def get_msg(self, desc=None):
+ if desc is None:
+ desc = NsdYang.YangData_Nsd_NsdCatalog_Nsd(id=str(uuid.uuid4()), name="nsd_name")
+ serializer = OnboardTestCase.DESC_SERIALIZER_MAP['nsd']
+ jstr = serializer.to_json_string(desc, project_ns=False)
+ self._desc = jstr
+ hdl = io.BytesIO(str.encode(jstr))
+ return serializer.from_file_hdl(hdl, ".json")
+
+ def get_json(self, msg):
+ serializer = OnboardTestCase.DESC_SERIALIZER_MAP['nsd']
+ json_data = serializer.to_json_string(msg, project_ns=True)
+ return json.loads(json_data)
+
@rift.test.dts.async_test
def test_onboard_nsd(self):
- nsd_msg = NsdYang.YangData_Nsd_NsdCatalog_Nsd(id=str(uuid.uuid4()), name="nsd_name")
- yield from self._loop.run_in_executor(None, self._onboarder.onboard, nsd_msg)
- self.assertEqual(self._handler_info.last_request_message, nsd_msg)
+ nsd_msg = self.get_msg()
+ yield from self._loop.run_in_executor(None, functools.partial(self._onboarder.onboard, descriptor_msg=nsd_msg, auth=OnboardTestCase.AUTH))
+ self.assertEqual(self._handler_info.last_request_message, self.get_json(nsd_msg))
self.assertEqual(self._handler_info.last_descriptor_type, "nsd")
self.assertEqual(self._handler_info.last_method, "POST")
@rift.test.dts.async_test
def test_update_nsd(self):
- nsd_msg = NsdYang.YangData_Nsd_NsdCatalog_Nsd(id=str(uuid.uuid4()), name="nsd_name")
- yield from self._loop.run_in_executor(None, self._onboarder.update, nsd_msg)
- self.assertEqual(self._handler_info.last_request_message, nsd_msg)
+ nsd_msg = self.get_msg()
+ yield from self._loop.run_in_executor(None, functools.partial(self._onboarder.update, descriptor_msg=nsd_msg, auth=OnboardTestCase.AUTH))
+ self.assertEqual(self._handler_info.last_request_message, self.get_json(nsd_msg))
self.assertEqual(self._handler_info.last_descriptor_type, "nsd")
self.assertEqual(self._handler_info.last_method, "PUT")
@rift.test.dts.async_test
def test_bad_descriptor_type(self):
- nsd_msg = NsdYang.YangData_Nsd_NsdCatalog()
+ nsd_msg = NsdYang.YangData_Nsd_NsdCatalog_Nsd()
with self.assertRaises(TypeError):
yield from self._loop.run_in_executor(None, self._onboarder.update, nsd_msg)
@@ -246,7 +270,7 @@
# Use a port not used by the instantiated server
new_port = self._port - 1
self._onboarder.port = new_port
- nsd_msg = NsdYang.YangData_Nsd_NsdCatalog_Nsd(id=str(uuid.uuid4()), name="nsd_name")
+ nsd_msg = self.get_msg()
with self.assertRaises(onboard.OnboardError):
yield from self._loop.run_in_executor(None, self._onboarder.onboard, nsd_msg)
@@ -259,7 +283,7 @@
# Set the timeout to something minimal to speed up test
self._onboarder.timeout = .1
- nsd_msg = NsdYang.YangData_Nsd_NsdCatalog_Nsd(id=str(uuid.uuid4()), name="nsd_name")
+ nsd_msg = self.get_msg()
# Force the request to timeout by running the call synchronously so the
with self.assertRaises(onboard.OnboardError):
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_package.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_package.py
index 703c45f..c57c4a0 100755
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_package.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_package.py
@@ -29,27 +29,19 @@
import xmlrunner
import yaml
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
import rift.package.archive
import rift.package.package
-import rift.package.charm
import rift.package.icon
import rift.package.script
-import rift.package.config
import rift.package.store
import rift.package.checksums
import rift.package.cloud_init
-import gi
-gi.require_version('RwpersonDbYang', '1.0')
-gi.require_version('RwYang', '1.0')
-
-from gi.repository import (
- RwpersonDbYang,
- RwYang,
- )
-
-
nsd_yaml = b"""nsd:nsd-catalog:
nsd:nsd:
- nsd:id: gw_corpA
@@ -237,26 +229,6 @@
self.assertEquals(yaml.load(vnfd_data), yaml.load(vnfd_yaml))
-class TestPackageCharmExtractor(PackageTestCase):
- def add_charm_dir(self, charm_name):
- charm_dir = "charms/trusty/{}".format(charm_name)
- charm_file = "{}/actions.yaml".format(charm_dir)
- charm_text = b"THIS IS A FAKE CHARM"
- self.add_tarinfo_dir(charm_dir)
- self.add_tarinfo(charm_file, io.BytesIO(charm_text))
-
- def test_extract_charm(self):
- charm_name = "charm_a"
- self.add_charm_dir(charm_name)
- package = self.create_vnfd_package()
- with tempfile.TemporaryDirectory() as tmp_dir:
- extractor = rift.package.charm.PackageCharmExtractor(self._log, tmp_dir)
- extractor.extract_charms(package)
-
- charm_dir = extractor.get_extracted_charm_dir(package.descriptor_id, charm_name)
- self.assertTrue(os.path.exists(charm_dir))
- self.assertTrue(os.path.isdir(charm_dir))
-
class TestPackageIconExtractor(PackageTestCase):
def add_icon_file(self, icon_name):
@@ -325,35 +297,6 @@
with self.assertRaises(rift.package.cloud_init.CloudInitExtractionError):
extractor.read_script(package, script_name)
-class TestPackageConfigExtractor(PackageTestCase):
- def add_ns_config_file(self, nsd_id):
- config_file = "ns_config/{}.yaml".format(nsd_id)
- config_text = b""" ns_config """
- self.add_tarinfo(config_file, io.BytesIO(config_text), mode=0o666)
-
- return config_file
-
- def add_vnf_config_file(self, vnfd_id, member_vnf_index):
- config_file = "vnf_config/{}_{}.yaml".format(vnfd_id, member_vnf_index)
- config_text = b""" vnf_config """
- self.add_tarinfo(config_file, io.BytesIO(config_text), mode=0o666)
-
- return config_file
-
- def test_extract_config(self):
- ns_config_file = self.add_ns_config_file("nsd_id")
- vnf_config_file = self.add_vnf_config_file("vnfd_id", 1)
- package = self.create_nsd_package()
- with tempfile.TemporaryDirectory() as tmp_dir:
- extractor = rift.package.config.PackageConfigExtractor(self._log, tmp_dir)
- extractor.extract_configs(package)
-
- dest_ns_config_file = extractor.get_extracted_config_path(package.descriptor_id, ns_config_file)
- dest_vnf_config_file = extractor.get_extracted_config_path(package.descriptor_id, vnf_config_file)
- self.assertTrue(os.path.isfile(dest_ns_config_file))
- self.assertTrue(os.path.isfile(dest_vnf_config_file))
-
-
class TestPackageValidator(PackageTestCase):
def setUp(self):
super().setUp()
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_serializer.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_serializer.py
index af8e1f8..432f1e3 100755
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_serializer.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_serializer.py
@@ -34,22 +34,30 @@
import gi
gi.require_version('RwpersonDbYang', '1.0')
+gi.require_version('RwProjectPersonDbYang', '1.0')
gi.require_version('RwYang', '1.0')
from gi.repository import (
RwpersonDbYang,
+ RwProjectPersonDbYang,
RwYang,
)
+from rift.package.convert import SerializationError
+
+
class TestSerializer(unittest.TestCase):
def setUp(self):
self._serializer = ProtoMessageSerializer(
RwpersonDbYang,
- RwpersonDbYang.Person
+ RwpersonDbYang.Person,
+ RwProjectPersonDbYang,
+ RwProjectPersonDbYang.YangData_RwProject_Project_Person,
)
self._sample_person = RwpersonDbYang.Person(name="Fred")
- self._model = RwYang.model_create_libncx()
+ self._project_person = RwProjectPersonDbYang.YangData_RwProject_Project_Person(name="Fred")
+ self._model = RwYang.model_create_libyang()
self._model.load_schema_ypbc(RwpersonDbYang.get_schema())
def test_from_xml_file(self):
@@ -63,14 +71,14 @@
with io.StringIO(sample_person_yaml) as file_hdl:
person = self._serializer.from_file_hdl(file_hdl, ".yml")
- self.assertEqual(person, self._sample_person)
+ self.assertEqual(person, self._project_person)
def test_from_json_file(self):
sample_person_json = self._sample_person.to_json(self._model)
with io.StringIO(sample_person_json) as file_hdl:
person = self._serializer.from_file_hdl(file_hdl, ".json")
- self.assertEqual(person, self._sample_person)
+ self.assertEqual(person, self._project_person)
def test_unknown_file_extension(self):
with io.StringIO("asdf") as file_hdl:
@@ -90,7 +98,7 @@
self.assertEqual(person, self._sample_person)
def test_to_json_string_invalid_type(self):
- with self.assertRaises(TypeError):
+ with self.assertRaises(SerializationError):
self._serializer.to_json_string(RwpersonDbYang.FlatPerson(name="bob"))
diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
index fdc2e22..8252974 100755
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
@@ -33,25 +33,33 @@
import tornado.web
import tornado.httputil
-import gi
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
import requests
from tornado.platform.asyncio import AsyncIOMainLoop
from tornado.ioloop import IOLoop
from concurrent.futures.thread import ThreadPoolExecutor
from concurrent.futures.process import ProcessPoolExecutor
+
+import gi
gi.require_version('RwDts', '1.0')
gi.require_version('RwPkgMgmtYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
from gi.repository import (
RwDts as rwdts,
RwPkgMgmtYang,
- RwVnfdYang
-
+ RwProjectVnfdYang as RwVnfdYang,
)
import rift.tasklets.rwlaunchpad.uploader as uploader
import rift.tasklets.rwlaunchpad.message as message
import rift.tasklets.rwlaunchpad.export as export
+from rift.mano.utils.project import ManoProject, DEFAULT_PROJECT
import rift.test.dts
+import rift.package.store
+
import mock
TEST_STRING = "foobar"
@@ -72,18 +80,36 @@
mock_vnfd_catalog = mock.MagicMock()
- self.uid, path = self.create_mock_package()
+ self.uid, path = self.create_mock_package(DEFAULT_PROJECT)
- mock_vnfd = RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd.from_dict({
+ mock_vnfd = RwVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd.from_dict({
"id": self.uid
})
mock_vnfd_catalog = {self.uid: mock_vnfd}
- self.app = uploader.UploaderApplication(
- self.log,
- self.dts,
- self.loop,
- vnfd_catalog=mock_vnfd_catalog)
+ class MockTasklet:
+ def __init__(cls):
+ def get_vnfd_catalog(project=DEFAULT_PROJECT):
+ return mock_vnfd_catalog
+
+ cls.log = self.log
+ cls.loop = self.loop
+ cls.dts = self.dts
+ cls.get_vnfd_catalog = get_vnfd_catalog
+ cls.get_nsd_catalog = None
+ cls.project = None
+ def _get_project(cls, project_name):
+ if cls.project is None:
+ cls.project = ManoProject(cls.log, project_name)
+ return cls.project
+
+ vnfd_store = rift.package.store.VnfdPackageFilesystemStore(self.log, project=DEFAULT_PROJECT)
+ nsd_store = rift.package.store.NsdPackageFilesystemStore(self.log, project=DEFAULT_PROJECT)
+
+ self.app = uploader.UploaderApplication(MockTasklet(), vnfd_store=vnfd_store, nsd_store=nsd_store)
+ self.app.onboarder.get_updated_descriptor = mock.MagicMock(return_value={'vnfd:vnfd':{'name':'mock', 'version':'mock'}})
+ self.app.onboarder.onboard = mock.MagicMock()
+ self.app.onboarder.update = mock.MagicMock()
AsyncIOMainLoop().install()
self.server = tornado.httpserver.HTTPServer(
@@ -94,11 +120,12 @@
def tearDown(self):
super().tearDown()
- def create_mock_package(self):
+ def create_mock_package(self, project):
uid = str(uuid.uuid4())
path = os.path.join(
- os.getenv('RIFT_ARTIFACTS'),
+ os.getenv('RIFT_VAR_ROOT'),
"launchpad/packages/vnfd",
+ project,
uid)
package_path = os.path.join(path, "pong_vnfd")
@@ -122,7 +149,8 @@
yield from self.app.register()
ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageCreate.from_dict({
"package_type": "VNFD",
- "external_url": "http://repo.riftio.com/releases/open.riftio.com/4.2.1/VNFS/ping_vnfd.tar.gz"
+ "external_url": "http://repo.riftio.com/releases/open.riftio.com/4.4.2/ping_vnfd.tar.gz",
+ "project_name": DEFAULT_PROJECT
})
rpc_out = yield from self.dts.query_rpc(
@@ -147,7 +175,8 @@
# Update
ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageUpdate.from_dict({
"package_type": "VNFD",
- "external_url": "http://repo.riftio.com/releases/open.riftio.com/4.2.1/VNFS/ping_vnfd.tar.gz"
+ "external_url": "http://repo.riftio.com/releases/open.riftio.com/4.4.2/ping_vnfd.tar.gz",
+ "project_name": DEFAULT_PROJECT
})
rpc_out = yield from self.dts.query_rpc(
"I,/rw-pkg-mgmt:package-update",
@@ -167,7 +196,6 @@
data = data[1]
assert type(data) is message.DownloadSuccess
-
@rift.test.dts.async_test
def test_package_export(self):
"""
@@ -200,7 +228,7 @@
data = data[-1]
assert type(data) is export.ExportSuccess
path = os.path.join(
- os.getenv("RIFT_ARTIFACTS"),
+ os.getenv("RIFT_VAR_ROOT"),
"launchpad/exports",
filename)
diff --git a/rwlaunchpad/plugins/rwmonitor/CMakeLists.txt b/rwlaunchpad/plugins/rwmonitor/CMakeLists.txt
index 6bc0195..a3bc2f8 100644
--- a/rwlaunchpad/plugins/rwmonitor/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwmonitor/CMakeLists.txt
@@ -24,7 +24,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
# anything not in a site-packages directory so we have to
@@ -35,5 +35,5 @@
rift/tasklets/${TASKLET_NAME}/__init__.py
rift/tasklets/${TASKLET_NAME}/core.py
rift/tasklets/${TASKLET_NAME}/tasklet.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
diff --git a/rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/core.py b/rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/core.py
index b8abea7..36ea42a 100644
--- a/rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/core.py
+++ b/rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/core.py
@@ -1,5 +1,5 @@
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -94,7 +94,6 @@
except Exception:
return list()
-
class MonascaPluginFactory(PluginFactory):
PLUGIN_NAME = "monasca"
FALLBACKS = ["ceilometer",]
@@ -119,6 +118,21 @@
return impl
+class BrocadeVcpePluginFactory(PluginFactory):
+ PLUGIN_NAME = "brocade_vcpe"
+ FALLBACKS = ["unavailable",]
+
+ def create(self, cloud_account):
+ plugin = rw_peas.PeasPlugin("rwmon_brocade", 'RwMon-1.0')
+ impl = plugin.get_interface("Monitoring")
+
+ # Check that the plugin is available on the platform associated with
+ # the cloud account
+ _, available = impl.nfvi_metrics_available(cloud_account)
+ if not available:
+ raise PluginUnavailableError()
+
+ return impl
class UnavailablePluginFactory(PluginFactory):
PLUGIN_NAME = "unavailable"
@@ -158,6 +172,8 @@
self.register_plugin_factory(CeilometerPluginFactory())
self.register_plugin_factory(MonascaPluginFactory())
self.register_plugin_factory(UnavailablePluginFactory())
+ self.register_plugin_factory(BrocadeVcpePluginFactory())
+
@property
def log(self):
@@ -185,6 +201,7 @@
try:
factory = self._factories[name]
plugin = factory.create(cloud_account)
+
self._plugins[cloud_account.name] = plugin
return
@@ -231,7 +248,7 @@
self._account = account
self._plugin = plugin
self._timestamp = 0
- self._metrics = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
+ self._metrics = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
self._vdur = vdur
self._vim_id = vdur.vim_id
self._updating = None
@@ -288,7 +305,7 @@
None,
self._plugin.nfvi_metrics,
self._account,
- self._vim_id,
+ self._vim_id
),
timeout=NfviMetrics.TIMEOUT,
loop=self.loop,
@@ -305,7 +322,7 @@
try:
# Create uninitialized metric structure
- vdu_metrics = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
+ vdu_metrics = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
# VCPU
vdu_metrics.vcpu.total = self.vdur.vm_flavor.vcpu_count
@@ -347,10 +364,10 @@
vdu_metrics.network.outgoing.byte_rate = metrics.network.outgoing.byte_rate
# External ports
- vdu_metrics.external_ports.total = len(self.vdur.external_interface)
+ vdu_metrics.external_ports.total = len([intf for intf in self.vdur.interface if intf.type_yang == 'EXTERNAL'])
# Internal ports
- vdu_metrics.internal_ports.total = len(self.vdur.internal_interface)
+ vdu_metrics.internal_ports.total = len([intf for intf in self.vdur.interface if intf.type_yang == 'INTERNAL'])
self._metrics = vdu_metrics
@@ -549,17 +566,19 @@
different sub-systems that are used to monitor the NFVI.
"""
- def __init__(self, loop, log, config):
+ def __init__(self, loop, log, config, project):
"""Create a Monitor object
Arguments:
- loop - an event loop
- log - the logger used by this object
- config - an instance of InstanceConfiguration
+ loop - an event loop
+ log - the logger used by this object
+ config - an instance of InstanceConfiguration
+ project - an instance of the project
"""
self._loop = loop
self._log = log
+ self._project = project
self._cloud_accounts = dict()
self._nfvi_plugins = NfviMetricsPluginManager(log)
@@ -581,6 +600,10 @@
return self._log
@property
+ def project(self):
+ return self._project
+
+ @property
def cache(self):
"""The NFVI metrics cache"""
return self._cache
@@ -624,6 +647,8 @@
if account.account_type == "openstack":
self.register_cloud_account(account, "monasca")
+ elif account.account_type == "prop_cloud1":
+ self.register_cloud_account(account, "brocade_vcpe")
else:
self.register_cloud_account(account, "mock")
@@ -643,7 +668,7 @@
# Make sure that there are no VNFRs associated with this account
for vnfr in self._vnfrs.values():
- if vnfr.cloud_account == account_name:
+ if vnfr.datacenter == account_name:
raise AccountInUseError()
del self._cloud_accounts[account_name]
@@ -693,10 +718,10 @@
the monitor.
"""
- if vnfr.cloud_account not in self._cloud_accounts:
+ if vnfr.datacenter not in self._cloud_accounts:
raise UnknownAccountError()
- account = self._cloud_accounts[vnfr.cloud_account]
+ account = self._cloud_accounts[vnfr.datacenter]
for vdur in vnfr.vdur:
try:
@@ -719,10 +744,10 @@
the monitor.
"""
- if vnfr.cloud_account not in self._cloud_accounts:
+ if vnfr.datacenter not in self._cloud_accounts:
raise UnknownAccountError()
- account = self._cloud_accounts[vnfr.cloud_account]
+ account = self._cloud_accounts[vnfr.datacenter]
for vdur in vnfr.vdur:
try:
diff --git a/rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/tasklet.py b/rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/tasklet.py
index 4ab351e..c5caf9f 100644
--- a/rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/tasklet.py
+++ b/rwlaunchpad/plugins/rwmonitor/rift/tasklets/rwmonitor/tasklet.py
@@ -1,5 +1,5 @@
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,18 +66,18 @@
import asyncio
import concurrent.futures
-import time
-
-import tornado.web
-import tornado.httpserver
-
import gi
+import time
+import tornado.httpserver
+import tornado.web
+
gi.require_version('RwDts', '1.0')
gi.require_version('RwLog', '1.0')
gi.require_version('RwMonitorYang', '1.0')
gi.require_version('RwLaunchpadYang', '1.0')
gi.require_version('RwNsrYang', '1.0')
gi.require_version('RwVnfrYang', '1.0')
+gi.require_version('rwlib', '1.0')
gi.require_version('RwLaunchpadYang', '1.0')
from gi.repository import (
RwDts as rwdts,
@@ -87,33 +87,40 @@
RwVnfrYang,
VnfrYang,
)
-
+import gi.repository.rwlib as rwlib
import rift.tasklets
import rift.mano.cloud
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectHandler,
+ )
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
from . import core
class DtsHandler(object):
- def __init__(self, tasklet):
+ def __init__(self, project):
self.reg = None
- self.tasklet = tasklet
+ self.project = project
@property
def log(self):
- return self.tasklet.log
+ return self.project._log
@property
def log_hdl(self):
- return self.tasklet.log_hdl
+ return self.project._log_hdl
@property
def dts(self):
- return self.tasklet.dts
+ return self.project._dts
@property
def loop(self):
- return self.tasklet.loop
+ return self.project._loop
@property
def classname(self):
@@ -151,7 +158,7 @@
with self.dts.group_create() as group:
group.register(
- xpath=VnfrCatalogSubscriber.XPATH,
+ xpath=self.project.add_project(VnfrCatalogSubscriber.XPATH),
flags=rwdts.Flag.SUBSCRIBER,
handler=handler,
)
@@ -173,20 +180,20 @@
with self.dts.appconf_group_create(acg_handler) as acg:
self.reg = acg.register(
- xpath=NsInstanceConfigSubscriber.XPATH,
+ xpath=self.project.add_project(NsInstanceConfigSubscriber.XPATH),
flags=rwdts.Flag.SUBSCRIBER,
)
class CloudAccountDtsHandler(DtsHandler):
- def __init__(self, tasklet):
- super().__init__(tasklet)
+ def __init__(self, project):
+ super().__init__(project)
self._cloud_cfg_subscriber = None
def register(self):
self.log.debug("creating cloud account config handler")
self._cloud_cfg_subscriber = rift.mano.cloud.CloudAccountConfigSubscriber(
- self.dts, self.log, self.log_hdl,
+ self.dts, self.log, self.log_hdl, self.project,
rift.mano.cloud.CloudAccountConfigCallbacks(
on_add_apply=self.tasklet.on_cloud_account_create,
on_delete_apply=self.tasklet.on_cloud_account_delete,
@@ -201,14 +208,14 @@
from a single VDU.
"""
- XPATH = "D,/vnfr:vnfr-catalog/vnfr:vnfr[vnfr:id='{}']/vnfr:vdur[vnfr:id='{}']/rw-vnfr:nfvi-metrics"
+ XPATH = "D,/vnfr:vnfr-catalog/vnfr:vnfr[vnfr:id={}]/vnfr:vdur[vnfr:id={}]/rw-vnfr:nfvi-metrics"
# This timeout defines the length of time the publisher will wait for a
# request to a data source to complete. If the request cannot be completed
# before timing out, the current data will be published instead.
TIMEOUT = 2.0
- def __init__(self, tasklet, vnfr, vdur):
+ def __init__(self, project, vnfr, vdur):
"""Create an instance of VdurNvfiPublisher
Arguments:
@@ -217,12 +224,12 @@
vdur - the VDUR of the VDU whose metrics are published
"""
- super().__init__(tasklet)
+ super().__init__(project)
self._vnfr = vnfr
self._vdur = vdur
self._handle = None
- self._xpath = VdurNfviMetricsPublisher.XPATH.format(vnfr.id, vdur.id)
+ self._xpath = project.add_project(VdurNfviMetricsPublisher.XPATH.format(quoted_key(vnfr.id), quoted_key(vdur.id)))
self._deregistered = asyncio.Event(loop=self.loop)
@@ -321,7 +328,7 @@
with self.dts.appconf_group_create(acg_handler) as acg:
self.reg = acg.register(
- xpath="C,/rw-launchpad:launchpad-config",
+ xpath=self.project.add_project("C,/rw-launchpad:launchpad-config"),
flags=rwdts.Flag.SUBSCRIBER,
)
@@ -335,8 +342,8 @@
them on to the tasklet.
"""
- def __init__(self, tasklet):
- super().__init__(tasklet)
+ def __init__(self, project):
+ super().__init__(project)
self._handle = None
@asyncio.coroutine
@@ -345,6 +352,10 @@
@asyncio.coroutine
def on_prepare(xact_info, action, ks_path, msg):
try:
+
+ if not self.project.rpc_check(msg, xact_info=xact_info):
+ return
+
response = VnfrYang.YangOutput_Vnfr_CreateAlarm()
response.alarm_id = yield from self.tasklet.on_create_alarm(
msg.cloud_account,
@@ -382,8 +393,8 @@
them on to the tasklet.
"""
- def __init__(self, tasklet):
- super().__init__(tasklet)
+ def __init__(self, project):
+ super().__init__(project)
self._handle = None
@asyncio.coroutine
@@ -392,6 +403,9 @@
@asyncio.coroutine
def on_prepare(xact_info, action, ks_path, msg):
try:
+ if not self.project.rpc_check(msg, xact_info=xact_info):
+ return
+
yield from self.tasklet.on_destroy_alarm(
msg.cloud_account,
msg.alarm_id,
@@ -473,70 +487,31 @@
])
-class MonitorTasklet(rift.tasklets.Tasklet):
- """
- The MonitorTasklet provides a interface for DTS to interact with an
- instance of the Monitor class. This allows the Monitor class to remain
- independent of DTS.
- """
+class MonitorProject(ManoProject):
- DEFAULT_POLLING_PERIOD = 1.0
+ def __init__(self, name, tasklet, **kw):
+ super(MonitorProject, self).__init__(log, name)
+ self._tasklet = tasklet
+ self._log_hdl = tasklet.log_hdl
+ self._dts = tasklet.dts
+ self._loop = tasklet.loop
- def __init__(self, *args, **kwargs):
- try:
- super().__init__(*args, **kwargs)
- self.rwlog.set_category("rw-monitor-log")
+ self.vnfr_subscriber = VnfrCatalogSubscriber(self)
+ self.cloud_cfg_subscriber = CloudAccountDtsHandler(self)
+ self.ns_instance_config_subscriber = NsInstanceConfigSubscriber(self)
+ self.launchpad_cfg_subscriber = LaunchpadConfigDtsSubscriber(self)
- self.vnfr_subscriber = VnfrCatalogSubscriber(self)
- self.cloud_cfg_subscriber = CloudAccountDtsHandler(self)
- self.ns_instance_config_subscriber = NsInstanceConfigSubscriber(self)
- self.launchpad_cfg_subscriber = LaunchpadConfigDtsSubscriber(self)
+ self.config = core.InstanceConfiguration()
+ self.config.polling_period = MonitorTasklet.DEFAULT_POLLING_PERIOD
- self.config = core.InstanceConfiguration()
- self.config.polling_period = MonitorTasklet.DEFAULT_POLLING_PERIOD
+ self.monitor = core.Monitor(self.loop, self.log, self.config, self)
+ self.vdur_handlers = dict()
- self.monitor = core.Monitor(self.loop, self.log, self.config)
- self.vdur_handlers = dict()
-
- self.webhooks = None
- self.create_alarm_rpc = CreateAlarmRPC(self)
- self.destroy_alarm_rpc = DestroyAlarmRPC(self)
-
-
- except Exception as e:
- self.log.exception(e)
-
- @property
- def polling_period(self):
- return self.config.polling_period
-
- @property
- def public_ip(self):
- """The public IP of the launchpad"""
- return self.config.public_ip
-
- def start(self):
- super().start()
- self.log.info("Starting MonitoringTasklet")
-
- self.log.debug("Registering with dts")
- self.dts = rift.tasklets.DTS(
- self.tasklet_info,
- RwLaunchpadYang.get_schema(),
- self.loop,
- self.on_dts_state_change
- )
-
- self.log.debug("Created DTS Api GI Object: %s", self.dts)
-
- def stop(self):
- try:
- self.dts.deinit()
- except Exception as e:
- self.log.exception(e)
+ self.create_alarm_rpc = CreateAlarmRPC(self)
+ self.destroy_alarm_rpc = DestroyAlarmRPC(self)
@asyncio.coroutine
- def init(self):
+ def register (self):
self.log.debug("creating cloud account handler")
self.cloud_cfg_subscriber.register()
@@ -555,23 +530,15 @@
self.log.debug("creating destroy-alarm rpc handler")
yield from self.destroy_alarm_rpc.register()
- self.log.debug("creating webhook server")
- loop = rift.tasklets.tornado.TaskletAsyncIOLoop(asyncio_loop=self.loop)
- self.webhooks = WebhookApplication(self)
- self.server = tornado.httpserver.HTTPServer(
- self.webhooks,
- io_loop=loop,
- )
- @asyncio.coroutine
- def on_public_ip(self, ip):
- """Store the public IP of the launchpad
+ @property
+ def polling_period(self):
+ return self.config.polling_period
- Arguments:
- ip - a string containing the public IP address of the launchpad
-
- """
- self.config.public_ip = ip
+ @property
+ def public_ip(self):
+ """The public IP of the launchpad"""
+ return self.config.public_ip
def on_ns_instance_config_update(self, config):
"""Update configuration information
@@ -589,48 +556,16 @@
def on_cloud_account_delete(self, account_name):
self.monitor.remove_cloud_account(account_name)
- @asyncio.coroutine
- def run(self):
- self.webhooks.listen(WebhookApplication.DEFAULT_WEBHOOK_PORT)
-
- def on_instance_started(self):
- self.log.debug("Got instance started callback")
-
- @asyncio.coroutine
- def on_dts_state_change(self, state):
- """Handle DTS state change
-
- Take action according to current DTS state to transition application
- into the corresponding application state
-
- Arguments
- state - current dts state
-
- """
- switch = {
- rwdts.State.INIT: rwdts.State.REGN_COMPLETE,
- rwdts.State.CONFIG: rwdts.State.RUN,
- }
-
- handlers = {
- rwdts.State.INIT: self.init,
- rwdts.State.RUN: self.run,
- }
-
- # Transition application to next state
- handler = handlers.get(state, None)
- if handler is not None:
- yield from handler()
-
- # Transition dts to next state
- next_state = switch.get(state, None)
- if next_state is not None:
- self.dts.handle.set_state(next_state)
-
def on_vnfr_create(self, vnfr):
- if not self.monitor.nfvi_metrics_available(vnfr.cloud_account):
+ try:
+ acc = vnfr.cloud_account
+ except AttributeError as e:
+ self.log.warning("NFVI metrics not supported")
+ return
+
+ if not self.monitor.nfvi_metrics_available(acc):
msg = "NFVI metrics unavailable for {}"
- self.log.warning(msg.format(vnfr.cloud_account))
+ self.log.warning(msg.format(acc))
return
self.monitor.add_vnfr(vnfr)
@@ -642,6 +577,12 @@
self.loop.create_task(coro)
def on_vnfr_update(self, vnfr):
+ try:
+ acc = vnfr.cloud_account
+ except AttributeError as e:
+ self.log.warning("NFVI metrics not supported")
+ return
+
if not self.monitor.nfvi_metrics_available(vnfr.cloud_account):
msg = "NFVI metrics unavailable for {}"
self.log.warning(msg.format(vnfr.cloud_account))
@@ -712,3 +653,115 @@
"""
yield from self.monitor.destroy_alarm(account, alarm_id)
+
+ @asyncio.coroutine
+ def delete_prepare(self):
+ # Check if any cloud accounts present
+ if self.cloud_cfg_subscriber and self.cloud_cfg_subscriber._cloud_cfg_subscriber.accounts:
+ return False
+ return True
+
+
+class MonitorTasklet(rift.tasklets.Tasklet):
+ """
+ The MonitorTasklet provides a interface for DTS to interact with an
+ instance of the Monitor class. This allows the Monitor class to remain
+ independent of DTS.
+ """
+
+ DEFAULT_POLLING_PERIOD = 1.0
+
+ def __init__(self, *args, **kwargs):
+ try:
+ super().__init__(*args, **kwargs)
+ self.rwlog.set_category("rw-monitor-log")
+
+ self._project_handler = None
+ self.projects = {}
+
+ self.webhooks = None
+
+ except Exception as e:
+ self.log.exception(e)
+
+ def start(self):
+ super().start()
+ self.log.info("Starting MonitoringTasklet")
+
+ self.log.debug("Registering with dts")
+ self.dts = rift.tasklets.DTS(
+ self.tasklet_info,
+ RwLaunchpadYang.get_schema(),
+ self.loop,
+ self.on_dts_state_change
+ )
+
+ self.log.debug("Created DTS Api GI Object: %s", self.dts)
+
+ def stop(self):
+ try:
+ self.dts.deinit()
+ except Exception as e:
+ self.log.exception(e)
+
+ @asyncio.coroutine
+ def init(self):
+ self.log.debug("creating webhook server")
+ loop = rift.tasklets.tornado.TaskletAsyncIOLoop(asyncio_loop=self.loop)
+ self.webhooks = WebhookApplication(self)
+ self.server = tornado.httpserver.HTTPServer(
+ self.webhooks,
+ io_loop=loop,
+ )
+
+ @asyncio.coroutine
+ def on_public_ip(self, ip):
+ """Store the public IP of the launchpad
+
+ Arguments:
+ ip - a string containing the public IP address of the launchpad
+
+ """
+ self.config.public_ip = ip
+
+ @asyncio.coroutine
+ def run(self):
+ address = rwlib.getenv("RWVM_INTERNAL_IPADDR")
+ if (address is None):
+ address=""
+ self.webhooks.listen(WebhookApplication.DEFAULT_WEBHOOK_PORT, address=address)
+
+ def on_instance_started(self):
+ self.log.debug("Got instance started callback")
+
+ @asyncio.coroutine
+ def on_dts_state_change(self, state):
+ """Handle DTS state change
+
+ Take action according to current DTS state to transition application
+ into the corresponding application state
+
+ Arguments
+ state - current dts state
+
+ """
+ switch = {
+ rwdts.State.INIT: rwdts.State.REGN_COMPLETE,
+ rwdts.State.CONFIG: rwdts.State.RUN,
+ }
+
+ handlers = {
+ rwdts.State.INIT: self.init,
+ rwdts.State.RUN: self.run,
+ }
+
+ # Transition application to next state
+ handler = handlers.get(state, None)
+ if handler is not None:
+ yield from handler()
+
+ # Transition dts to next state
+ next_state = switch.get(state, None)
+ if next_state is not None:
+ self.dts.handle.set_state(next_state)
+
diff --git a/rwlaunchpad/plugins/rwmonitor/test/repro.py b/rwlaunchpad/plugins/rwmonitor/test/repro.py
new file mode 100644
index 0000000..ec85810
--- /dev/null
+++ b/rwlaunchpad/plugins/rwmonitor/test/repro.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+
+import argparse
+import asyncio
+import concurrent.futures
+import logging
+import os
+import sys
+import unittest
+import xmlrunner
+import time
+
+import gi
+gi.require_version('RwLog', '1.0')
+
+import rift.tasklets.rwmonitor.core as core
+import rift.mano.cloud as cloud
+
+from gi.repository import RwCloudYang, RwLog, RwVnfrYang
+import rw_peas
+
+@asyncio.coroutine
+def update(loop, log, executor, account, plugin, vim_id):
+ """Update the NFVI metrics for the associated VDUR
+
+ This coroutine will request new metrics from the data-source and update
+ the current metrics.
+
+ """
+ try:
+ # Make the request to the plugin in a separate thread and do
+ # not exceed the timeout
+ _, metrics = yield from asyncio.wait_for(
+ loop.run_in_executor(
+ executor,
+ plugin.nfvi_metrics,
+ account,
+ vim_id
+ ),
+ timeout=10,
+ loop=loop,
+ )
+
+ except asyncio.TimeoutError:
+ msg = "timeout on request for nfvi metrics (vim-id = {})"
+ log.warning(msg.format(vim_id))
+ return
+
+ except Exception as e:
+ log.exception(e)
+ return
+
+ try:
+ # Create uninitialized metric structure
+ vdu_metrics = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
+
+ # VCPU
+ vdu_metrics.vcpu.total = 5
+ vdu_metrics.vcpu.utilization = metrics.vcpu.utilization
+
+ # Memory (in bytes)
+ vdu_metrics.memory.used = metrics.memory.used
+ vdu_metrics.memory.total = 5000
+ vdu_metrics.memory.utilization = 100 * vdu_metrics.memory.used / vdu_metrics.memory.total
+
+ # Storage
+ try:
+ vdu_metrics.storage.used = metrics.storage.used
+ utilization = 100 * vdu_metrics.storage.used / vdu_metrics.storage.total
+ if utilization > 100:
+ utilization = 100
+
+ vdu_metrics.storage.utilization = utilization
+
+ except ZeroDivisionError:
+ vdu_metrics.storage.utilization = 0
+
+ # Network (incoming)
+ vdu_metrics.network.incoming.packets = metrics.network.incoming.packets
+ vdu_metrics.network.incoming.packet_rate = metrics.network.incoming.packet_rate
+ vdu_metrics.network.incoming.bytes = metrics.network.incoming.bytes
+ vdu_metrics.network.incoming.byte_rate = metrics.network.incoming.byte_rate
+
+ # Network (outgoing)
+ vdu_metrics.network.outgoing.packets = metrics.network.outgoing.packets
+ vdu_metrics.network.outgoing.packet_rate = metrics.network.outgoing.packet_rate
+ vdu_metrics.network.outgoing.bytes = metrics.network.outgoing.bytes
+ vdu_metrics.network.outgoing.byte_rate = metrics.network.outgoing.byte_rate
+
+ # External ports
+ vdu_metrics.external_ports.total = 5
+
+ # Internal ports
+ vdu_metrics.internal_ports.total = 5
+
+ return vdu_metrics
+
+ except Exception as e:
+ log.exception(e)
+
+
+class TestUploadProgress(unittest.TestCase):
+ ACCOUNT_MSG = RwCloudYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList.from_dict({
+ "account_type": "openstack",
+ "openstack": {
+ "key": "admin",
+ "secret": "mypasswd",
+ "auth_url": 'http://10.66.4.18:5000/v3/',
+ "tenant": "demo",
+ "mgmt_network": "private"
+ }
+ })
+
+ def setUp(self):
+ self._loop = asyncio.get_event_loop()
+ self._log = logging.getLogger(__file__)
+ self._account = cloud.CloudAccount(
+ self._log,
+ RwLog.Ctx.new(__file__), TestUploadProgress.ACCOUNT_MSG
+ )
+
+ def test_many_updates(self):
+ vim_id = "a7f30def-0942-4425-8454-1ffe02b7db1e"
+ instances = 20
+
+ executor = concurrent.futures.ThreadPoolExecutor(10)
+ while True:
+ tasks = []
+ for _ in range(instances):
+ plugin = rw_peas.PeasPlugin("rwmon_ceilometer", 'RwMon-1.0')
+ impl = plugin.get_interface("Monitoring")
+ task = update(self._loop, self._log, executor, self._account.cal_account_msg, impl, vim_id)
+ tasks.append(task)
+ task = update(self._loop, self._log, executor, self._account.cal_account_msg, impl, vim_id)
+ tasks.append(task)
+ task = update(self._loop, self._log, executor, self._account.cal_account_msg, impl, vim_id)
+ tasks.append(task)
+ self._log.debug("Running %s update tasks", instances)
+ self._loop.run_until_complete(asyncio.wait(tasks, loop=self._loop, timeout=20))
+
+
+def main(argv=sys.argv[1:]):
+ logging.basicConfig(format='TEST %(message)s')
+
+ runner = xmlrunner.XMLTestRunner(output=os.environ["RIFT_MODULE_TEST"])
+ parser = argparse.ArgumentParser()
+ parser.add_argument('-v', '--verbose', action='store_true')
+ parser.add_argument('-n', '--no-runner', action='store_true')
+
+ args, unknown = parser.parse_known_args(argv)
+ if args.no_runner:
+ runner = None
+
+ # Set the global logging level
+ logging.getLogger().setLevel(logging.DEBUG if args.verbose else logging.ERROR)
+
+ # The unittest framework requires a program name, so use the name of this
+ # file instead (we do not want to have to pass a fake program name to main
+ # when this is called from the interpreter).
+ unittest.main(argv=[__file__] + unknown + ["-v"], testRunner=runner)
+
+if __name__ == '__main__':
+ main()
diff --git a/rwlaunchpad/plugins/rwmonitor/test/repro_tasklet_test.py b/rwlaunchpad/plugins/rwmonitor/test/repro_tasklet_test.py
new file mode 100755
index 0000000..df75e35
--- /dev/null
+++ b/rwlaunchpad/plugins/rwmonitor/test/repro_tasklet_test.py
@@ -0,0 +1,95 @@
+#!/usr/bin/env python3
+import argparse
+import asyncio
+import gi
+import logging
+import os
+import tempfile
+import unittest
+import xmlrunner
+
+# Add the current directory to the PLUGINDIR so we can use the plugin
+# file added here.
+os.environ["PLUGINDIR"] += (":" + os.path.dirname(os.path.realpath(__file__)))
+gi.require_version("RwDts", "1.0")
+gi.require_version("RwVnfrYang", "1.0")
+from gi.repository import (
+ RwDts,
+ RwVnfrYang,
+)
+
+import rift.tasklets
+import rift.test.dts
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+class RwLogTestCase(rift.test.dts.AbstractDTSTest):
+ # Disable the log_utest_mode so that log messages actually get logged
+ # using the rwlog handler since that is what we are testing here.
+ log_utest_mode = False
+
+ @classmethod
+ def configure_suite(cls, rwmain):
+ pass
+
+ @classmethod
+ def start_test_tasklet(cls):
+ cls.rwmain.add_tasklet(
+ os.path.join(
+ os.path.dirname(os.path.realpath(__file__)),
+ 'reprotesttasklet-python'
+ ),
+ 'reprotesttasklet-python'
+ )
+
+ @classmethod
+ def configure_schema(cls):
+ return RwVnfrYang.get_schema()
+
+ @classmethod
+ def configure_timeout(cls):
+ return 1000000
+
+ def configure_test(self, loop, test_id):
+ self.log.debug("STARTING - %s", self.id())
+ self.tinfo = self.new_tinfo(self.id())
+ self.dts = rift.tasklets.DTS(self.tinfo, self.schema, self.loop)
+
+ @rift.test.dts.async_test
+ def test_tasklet_logging(self):
+ self.start_test_tasklet()
+
+ # The logtesttasklet signals being done, by moving into DTS Running state
+ yield from self.wait_for_tasklet_running("reprotesttasklet-python")
+ @asyncio.coroutine
+ def reader():
+ while True:
+ res_iter = yield from self.dts.query_read("D,/vnfr:vnfr-catalog/vnfr:vnfr[vnfr:id={}]/vnfr:vdur[vnfr:id={}]/rw-vnfr:nfvi-metrics".format(
+ quoted_key("a7f30def-0942-4425-8454-1ffe02b7db1e"), quoted_key("a7f30def-0942-4425-8454-1ffe02b7db1e"),
+ ))
+ for ent in res_iter:
+ res = yield from ent
+ metrics = res.result
+ self.log.debug("got metrics result: %s", metrics)
+
+ for _ in range(20):
+ self.loop.create_task(reader())
+
+ while True:
+ yield from asyncio.sleep(.001, loop=self.loop)
+
+
+def main():
+ runner = xmlrunner.XMLTestRunner(output=os.environ["RIFT_MODULE_TEST"])
+
+ parser = argparse.ArgumentParser()
+ parser.add_argument('-v', '--verbose', action='store_true')
+ args, _ = parser.parse_known_args()
+
+ RwLogTestCase.log_level = logging.DEBUG if args.verbose else logging.WARN
+
+ unittest.main(testRunner=runner)
+
+if __name__ == '__main__':
+ main()
diff --git a/rwlaunchpad/plugins/rwmonitor/test/reprotesttasket-python.plugin b/rwlaunchpad/plugins/rwmonitor/test/reprotesttasket-python.plugin
new file mode 100644
index 0000000..2f9108c
--- /dev/null
+++ b/rwlaunchpad/plugins/rwmonitor/test/reprotesttasket-python.plugin
@@ -0,0 +1,4 @@
+[Plugin]
+Module=reprotesttasklet-python
+Loader=python3
+Name=reprotesttasklet-python
diff --git a/rwlaunchpad/plugins/rwmonitor/test/reprotesttasklet-python.py b/rwlaunchpad/plugins/rwmonitor/test/reprotesttasklet-python.py
new file mode 100755
index 0000000..ac7f6b4
--- /dev/null
+++ b/rwlaunchpad/plugins/rwmonitor/test/reprotesttasklet-python.py
@@ -0,0 +1,229 @@
+#!/usr/bin/env python3
+
+import argparse
+import asyncio
+import concurrent.futures
+import gi
+import logging
+import os
+import rwlogger
+import sys
+import time
+import unittest
+import xmlrunner
+
+gi.require_version("RwDts", "1.0")
+from gi.repository import (
+ RwDts as rwdts,
+ RwDtsYang,
+)
+import rift.tasklets
+import rift.test.dts
+
+gi.require_version('RwLog', '1.0')
+
+import rift.tasklets.rwmonitor.core as core
+import rift.mano.cloud as cloud
+
+from gi.repository import RwCloudYang, RwLog, RwVnfrYang
+import rw_peas
+
+from repro import update
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+
+class DtsHandler(object):
+ def __init__(self, tasklet):
+ self.reg = None
+ self.tasklet = tasklet
+
+ @property
+ def log(self):
+ return self.tasklet.log
+
+ @property
+ def log_hdl(self):
+ return self.tasklet.log_hdl
+
+ @property
+ def dts(self):
+ return self.tasklet.dts
+
+ @property
+ def loop(self):
+ return self.tasklet.loop
+
+ @property
+ def classname(self):
+ return self.__class__.__name__
+
+
+class VdurNfviMetricsPublisher(DtsHandler):
+ """
+ A VdurNfviMetricsPublisher is responsible for publishing the NFVI metrics
+ from a single VDU.
+ """
+
+ XPATH = "D,/vnfr:vnfr-catalog/vnfr:vnfr[vnfr:id={}]/vnfr:vdur[vnfr:id={}]/rw-vnfr:nfvi-metrics"
+
+ # This timeout defines the length of time the publisher will wait for a
+ # request to a data source to complete. If the request cannot be completed
+ # before timing out, the current data will be published instead.
+ TIMEOUT = 2.0
+
+ def __init__(self, tasklet, vnfr_id, vdur_id):
+ """Create an instance of VdurNvfiPublisher
+
+ Arguments:
+ tasklet - the tasklet
+ vdur - the VDUR of the VDU whose metrics are published
+
+ """
+ super().__init__(tasklet)
+ self._vnfr_id = vnfr_id
+ self._vdur_id = vdur_id
+
+ self._handle = None
+ self._xpath = VdurNfviMetricsPublisher.XPATH.format(quoted_key(vnfr_id), quoted_key(vdur_id))
+
+ self._deregistered = asyncio.Event(loop=self.loop)
+
+ @property
+ def xpath(self):
+ """The XPATH that the metrics are published on"""
+ return self._xpath
+
+ @asyncio.coroutine
+ def dts_on_prepare(self, xact_info, action, ks_path, msg):
+ """Handles the DTS on_prepare callback"""
+ self.log.debug("{}:dts_on_prepare".format(self.classname))
+
+ if action == rwdts.QueryAction.READ:
+ # If the publisher has been deregistered, the xpath element has
+ # been deleted. So we do not want to publish the metrics and
+ # re-created the element.
+ if not self._deregistered.is_set():
+ metrics = self.tasklet.on_retrieve_nfvi_metrics(self._vdur_id)
+ xact_info.respond_xpath(
+ rwdts.XactRspCode.MORE,
+ self.xpath,
+ metrics,
+ )
+
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK, self.xpath)
+
+ @asyncio.coroutine
+ def register(self):
+ """Register the publisher with DTS"""
+ self._handle = yield from self.dts.register(
+ xpath=self.xpath,
+ handler=rift.tasklets.DTS.RegistrationHandler(
+ on_prepare=self.dts_on_prepare,
+ ),
+ flags=rwdts.Flag.PUBLISHER,
+ )
+
+ def deregister(self):
+ """Deregister the publisher from DTS"""
+ # Mark the publisher for deregistration. This prevents the publisher
+ # from creating an element after it has been deleted.
+ self._deregistered.set()
+
+ # Now that we are done with the registration handle, delete the element
+ # and tell DTS to deregister it
+ self._handle.delete_element(self.xpath)
+ self._handle.deregister()
+ self._handle = None
+
+
+class RwLogTestTasklet(rift.tasklets.Tasklet):
+ """ A tasklet to test Python rwlog interactions """
+ def __init__(self, *args, **kwargs):
+ super(RwLogTestTasklet, self).__init__(*args, **kwargs)
+ self._dts = None
+ self.rwlog.set_category("rw-logtest-log")
+ self._metrics = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
+
+ def start(self):
+ """ The task start callback """
+ super(RwLogTestTasklet, self).start()
+
+ self._dts = rift.tasklets.DTS(self.tasklet_info,
+ RwVnfrYang.get_schema(),
+ self.loop,
+ self.on_dts_state_change)
+ @property
+ def dts(self):
+ return self._dts
+
+ @asyncio.coroutine
+ def init(self):
+ pass
+
+ def on_retrieve_nfvi_metrics(self, vdur_id):
+ return self._metrics
+
+ @asyncio.coroutine
+ def run(self):
+ def go():
+ account_msg = RwCloudYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList.from_dict({
+ "account_type": "openstack",
+ "openstack": {
+ "key": "admin",
+ "secret": "mypasswd",
+ "auth_url": 'http://10.66.4.18:5000/v3/',
+ "tenant": "demo",
+ "mgmt_network": "private"
+ }
+ })
+
+ account = cloud.CloudAccount(
+ self.log,
+ RwLog.Ctx.new(__file__), account_msg
+ )
+
+ vim_id = "a7f30def-0942-4425-8454-1ffe02b7db1e"
+ instances = 20
+
+ executor = concurrent.futures.ThreadPoolExecutor(10)
+ plugin = rw_peas.PeasPlugin("rwmon_ceilometer", 'RwMon-1.0')
+ impl = plugin.get_interface("Monitoring")
+ while True:
+ tasks = []
+ for _ in range(instances):
+ task = update(self.loop, self.log, executor, account.cal_account_msg, impl, vim_id)
+ tasks.append(task)
+
+ self.log.debug("Running %s update tasks", instances)
+ #self.loop.run_until_complete(asyncio.wait(tasks, loop=self.loop, timeout=20))
+ done, pending = yield from asyncio.wait(tasks, loop=self.loop, timeout=20)
+ self._metrics = done.pop().result()
+
+ self._publisher = VdurNfviMetricsPublisher(self, "a7f30def-0942-4425-8454-1ffe02b7db1e", "a7f30def-0942-4425-8454-1ffe02b7db1e")
+ yield from self._publisher.register()
+ self.loop.create_task(go())
+
+ @asyncio.coroutine
+ def on_dts_state_change(self, state):
+ switch = {
+ rwdts.State.INIT: rwdts.State.REGN_COMPLETE,
+ rwdts.State.CONFIG: rwdts.State.RUN,
+ }
+
+ handlers = {
+ rwdts.State.INIT: self.init,
+ rwdts.State.RUN: self.run,
+ }
+
+ # Transition application to next state
+ handler = handlers.get(state, None)
+ if handler is not None:
+ yield from handler()
+
+ # Transition dts to next state
+ next_state = switch.get(state, None)
+ if next_state is not None:
+ self.log.debug("Changing state to %s", next_state)
+ self._dts.handle.set_state(next_state)
diff --git a/rwlaunchpad/plugins/rwmonparam/CMakeLists.txt b/rwlaunchpad/plugins/rwmonparam/CMakeLists.txt
index ad63593..a79bedd 100644
--- a/rwlaunchpad/plugins/rwmonparam/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwmonparam/CMakeLists.txt
@@ -24,7 +24,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
# anything not in a site-packages directory so we have to
@@ -37,5 +37,5 @@
rift/tasklets/${TASKLET_NAME}/nsr_core.py
rift/tasklets/${TASKLET_NAME}/vnfr_core.py
rift/tasklets/${TASKLET_NAME}/${TASKLET_NAME}.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
diff --git a/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/nsr_core.py b/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/nsr_core.py
index 78a3c8f..d94eb8d 100644
--- a/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/nsr_core.py
+++ b/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/nsr_core.py
@@ -20,13 +20,18 @@
@date 09-Jul-2016
"""
-
import asyncio
+import collections
import functools
+import gi
import uuid
+import rift.tasklets
+
from gi.repository import (RwDts as rwdts, NsrYang)
import rift.mano.dts as mano_dts
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
from . import aggregator as aggregator
@@ -37,68 +42,68 @@
class VnfrMonitoringParamSubscriber(mano_dts.AbstractOpdataSubscriber):
"""Registers for VNFR monitoring parameter changes.
-
+
Attributes:
monp_id (str): Monitoring Param ID
vnfr_id (str): VNFR ID
"""
- def __init__(self, log, dts, loop, vnfr_id, monp_id, callback=None):
- super().__init__(log, dts, loop, callback)
+ def __init__(self, log, dts, loop, project, vnfr_id, monp_id, callback=None):
+ super().__init__(log, dts, loop, project, callback)
self.vnfr_id = vnfr_id
self.monp_id = monp_id
def get_xpath(self):
- return("D,/vnfr:vnfr-catalog" +
- "/vnfr:vnfr[vnfr:id='{}']".format(self.vnfr_id) +
+ return self.project.add_project(("D,/vnfr:vnfr-catalog" +
+ "/vnfr:vnfr[vnfr:id={}]".format(quoted_key(self.vnfr_id)) +
"/vnfr:monitoring-param" +
- "[vnfr:id='{}']".format(self.monp_id))
+ "[vnfr:id={}]".format(quoted_key(self.monp_id))))
class NsrMonitoringParam():
"""Class that handles NS Mon-param data.
"""
- MonParamMsg = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_MonitoringParam
+ MonParamMsg = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_MonitoringParam
MISSING = None
DEFAULT_AGGREGATION_TYPE = "AVERAGE"
@classmethod
- def create_nsr_mon_params(cls, nsd, constituent_vnfrs, store):
+ def create_nsr_mon_params(cls, nsd, constituent_vnfrs, mon_param_project):
"""Convenience class that constructs NSMonitoringParam objects
-
+
Args:
- nsd (RwNsdYang.YangData_Nsd_NsdCatalog_Nsd): Nsd object
+ nsd (RwNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd): Nsd object
constituent_vnfrs (list): List of constituent vnfr objects of NSR
- store (SubscriberStore): Store object instance
-
+ mon_param_project (MonParamProject): Store object instance
+
Returns:
list NsrMonitoringParam object.
Also handles legacy NSD descriptor which has no mon-param defines. In
such cases the mon-params are created from VNFD's mon-param config.
"""
- MonParamMsg = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_MonitoringParam
-
mon_params = []
for mon_param_msg in nsd.monitoring_param:
mon_params.append(NsrMonitoringParam(
mon_param_msg,
- constituent_vnfrs
+ constituent_vnfrs,
+ mon_param_name=mon_param_msg.name
))
# Legacy Handling.
# This indicates that the NSD had no mon-param config.
if not nsd.monitoring_param:
for vnfr in constituent_vnfrs:
- vnfd = store.get_vnfd(vnfr.vnfd.id)
+ vnfd = mon_param_project.get_vnfd(vnfr.vnfd.id)
for monp in vnfd.monitoring_param:
mon_params.append(NsrMonitoringParam(
monp,
[vnfr],
- is_legacy=True))
+ is_legacy=True,
+ mon_param_name=monp.name))
return mon_params
- def __init__(self, monp_config, constituent_vnfrs, is_legacy=False):
+ def __init__(self, monp_config, constituent_vnfrs, is_legacy=False, mon_param_name=None):
"""
Args:
monp_config (GiObject): Config data to create the NSR mon-param msg
@@ -106,6 +111,7 @@
is_legacy (bool, optional): If set then the mon-param are created from
vnfd's config and not NSD's config.
"""
+ self._nsd_mon_param_msg = monp_config
self._constituent_vnfr_map = {vnfr.id:vnfr for vnfr in constituent_vnfrs}
# An internal store to hold the data
@@ -116,12 +122,42 @@
# create_nsr_mon_params() is already validating for 'is_legacy' by checking if
# nsd is having 'monitoring_param'. So removing 'self.aggregation_type is None' check for is_legacy.
self.is_legacy = is_legacy
+ self.mon_param_name = mon_param_name
if not is_legacy:
- self._msg = self._convert_nsd_msg(monp_config)
+ self._msg = self._convert_nsd_msg()
else:
+ # TODO remove arg for consistency
self._msg = self._convert_vnfd_msg(monp_config)
+ def add_vnfr(self, vnfr):
+ # If already added ignore
+ if vnfr.id in self._constituent_vnfr_map:
+ return
+
+ # Update the map
+ self._constituent_vnfr_map[vnfr.id] = vnfr
+
+ if not self.is_legacy:
+ self._msg = self._convert_nsd_msg()
+
+ def delete_vnfr(self, vnfr):
+ # Update the map
+ if vnfr.id in self._constituent_vnfr_map:
+ del self._constituent_vnfr_map[vnfr.id]
+
+ # Delete the value stores.
+ for vnfr_id, monp_id in list(self.vnfr_monparams.keys()):
+ if vnfr_id == vnfr.id:
+ del self.vnfr_monparams[(vnfr_id, monp_id)]
+
+ if not self.is_legacy:
+ self._msg = self._convert_nsd_msg()
+
+ @property
+ def nsd_mon_param_msg(self):
+ return self._nsd_mon_param_msg
+
@property
def nsr_mon_param_msg(self):
"""Gi object msg"""
@@ -175,14 +211,6 @@
return None
- def _constituent_vnfrs(self, constituent_vnfr_ids):
- # Fetch the VNFRs
- vnfr_map = {}
- for constituent_vnfr in constituent_vnfr_ids:
- vnfr_id = constituent_vnfr.vnfr_id
- vnfr_map[vnfr_id] = self._store.get_vnfr(vnfr_id)
-
- return vnfr_map
def _extract_ui_elements(self, monp):
ui_fields = ["group_tag", "description", "widget_type", "units", "value_type"]
@@ -191,34 +219,40 @@
return dict(zip(ui_fields, ui_data))
- def _convert_nsd_msg(self, nsd_monp):
- """Create initial msg without values"""
- vnfd_to_vnfr = {vnfr.vnfd.id: vnfr_id
- for vnfr_id, vnfr in self._constituent_vnfr_map.items()}
+ def _convert_nsd_msg(self):
+ """Create/update msg. This is also called when a new VNFR is added."""
+
+ # For a single VNFD there might be multiple vnfrs
+ vnfd_to_vnfr = collections.defaultdict(list)
+ for vnfr_id, vnfr in self._constituent_vnfr_map.items():
+ vnfd_to_vnfr[vnfr.vnfd.id].append(vnfr_id)
# First, convert the monp param ref from vnfd to vnfr terms.
vnfr_mon_param_ref = []
- for vnfd_mon in nsd_monp.vnfd_monitoring_param:
- vnfr_id = vnfd_to_vnfr[vnfd_mon.vnfd_id_ref]
+ for vnfd_mon in self.nsd_mon_param_msg.vnfd_monitoring_param:
+ vnfr_ids = vnfd_to_vnfr[vnfd_mon.vnfd_id_ref]
monp_id = vnfd_mon.vnfd_monitoring_param_ref
- self.vnfr_monparams[(vnfr_id, monp_id)] = self.MISSING
+ for vnfr_id in vnfr_ids:
+ key = (vnfr_id, monp_id)
+ if key not in self.vnfr_monparams:
+ self.vnfr_monparams[key] = self.MISSING
- vnfr_mon_param_ref.append({
- 'vnfr_id_ref': vnfr_id,
- 'vnfr_mon_param_ref': monp_id
- })
+ vnfr_mon_param_ref.append({
+ 'vnfr_id_ref': vnfr_id,
+ 'vnfr_mon_param_ref': monp_id
+ })
monp_fields = {
# For now both the NSD and NSR's monp ID are same.
- 'id': nsd_monp.id,
- 'name': nsd_monp.name,
- 'nsd_mon_param_ref': nsd_monp.id,
+ 'id': self.nsd_mon_param_msg.id,
+ 'name': self.nsd_mon_param_msg.name,
+ 'nsd_mon_param_ref': self.nsd_mon_param_msg.id,
'vnfr_mon_param_ref': vnfr_mon_param_ref,
- 'aggregation_type': nsd_monp.aggregation_type
+ 'aggregation_type': self.nsd_mon_param_msg.aggregation_type
}
- ui_fields = self._extract_ui_elements(nsd_monp)
+ ui_fields = self._extract_ui_elements(self.nsd_mon_param_msg)
monp_fields.update(ui_fields)
monp = self.MonParamMsg.from_dict(monp_fields)
@@ -252,6 +286,7 @@
value (Tuple): (value_type, value)
"""
self.vnfr_monparams[key] = value
+
def update_ns_value(self, value_field, value):
"""Updates the NS mon-param data with the aggregated value.
@@ -278,19 +313,20 @@
def from_handler(cls, handler, monp, callback):
"""Convenience class to build NsrMonitoringParamPoller object.
"""
- return cls(handler.log, handler.dts, handler.loop, monp, callback)
+ return cls(handler.log, handler.dts, handler.loop, handler.project,
+ monp, callback)
- def __init__(self, log, dts, loop, monp, callback=None):
+ def __init__(self, log, dts, loop, project, monp, callback=None):
"""
Args:
monp (NsrMonitoringParam): Param object
callback (None, optional): Callback to be triggered after value has
been aggregated.
"""
- super().__init__(log, dts, loop)
+ super().__init__(log, dts, loop, project)
self.monp = monp
- self.subscribers = []
+ self.subscribers = {}
self.callback = callback
self._agg = None
@@ -310,7 +346,6 @@
"""
key = (vnfr_id, monp.id)
value = NsrMonitoringParam.extract_value(monp)
-
if not value:
return
@@ -337,66 +372,175 @@
self.callback(self.monp.nsr_mon_param_msg)
@asyncio.coroutine
+ def create_pollers(self, create=False, register=False):
+ if (create):
+ for vnfr_id, monp_id in self.monp.vnfr_ids:
+ key = (vnfr_id, monp_id)
+ callback = functools.partial(self.update_value, vnfr_id=vnfr_id)
+
+ # if the poller is already created, ignore
+ if key in self.subscribers:
+ continue
+
+ self.subscribers[key] = VnfrMonitoringParamSubscriber(
+ self.loop,
+ self.dts,
+ self.loop,
+ self.project,
+ vnfr_id,
+ monp_id,
+ callback=callback)
+
+ if register:
+ yield from self.subscribers[key].register()
+
+ @asyncio.coroutine
+ def update(self, vnfr):
+ self.monp.add_vnfr(vnfr)
+ yield from self.create_pollers(create=False, register=True)
+
+ @asyncio.coroutine
+ def delete(self, vnfr):
+ self.monp.delete_vnfr(vnfr)
+ for vnfr_id, monp_id in list(self.subscribers.keys()):
+ if vnfr_id != vnfr.id:
+ continue
+
+ key = (vnfr_id, monp_id)
+ sub = self.subscribers.pop(key)
+ sub.deregister()
+
+
+ @asyncio.coroutine
def register(self):
- for vnfr_id, monp_id in self.monp.vnfr_ids:
- callback = functools.partial(self.update_value, vnfr_id=vnfr_id)
- self.subscribers.append(VnfrMonitoringParamSubscriber(
- self.loop, self.dts, self.loop, vnfr_id, monp_id, callback=callback))
+ yield from self.create_pollers()
@asyncio.coroutine
def start(self):
- for sub in self.subscribers:
+ for sub in self.subscribers.values():
yield from sub.register()
def stop(self):
- for sub in self.subscribers:
+ for sub in self.subscribers.values():
sub.deregister()
-
+
+ def retrieve_data(self):
+ return self.monp.nsr_mon_param_msg
class NsrMonitorDtsHandler(mano_dts.DtsHandler):
""" NSR monitoring class """
- def __init__(self, log, dts, loop, nsr, constituent_vnfrs, store):
+ def __init__(self, log, dts, loop, project, nsr, constituent_vnfrs):
"""
Args:
- nsr (RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr): NSR object
+ nsr (RwNsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr): NSR object
constituent_vnfrs (list): list of VNFRs in NSR
- store (SubscriberStore): Store instance
"""
- super().__init__(log, dts, loop)
+ super().__init__(log, dts, loop, project)
self.nsr = nsr
- self.store = store
self.constituent_vnfrs = constituent_vnfrs
+ self.dts_updates = dict()
+ self.dts_update_task = None
self.mon_params_pollers = []
-
+
+ def nsr_xpath(self):
+ return self.project.add_project("D,/nsr:ns-instance-opdata/nsr:nsr" +
+ "[nsr:ns-instance-config-ref={}]".format(quoted_key(self.nsr.ns_instance_config_ref)))
+
def xpath(self, param_id=None):
- return ("D,/nsr:ns-instance-opdata/nsr:nsr" +
- "[nsr:ns-instance-config-ref='{}']".format(self.nsr.ns_instance_config_ref) +
+ return self.project.add_project("D,/nsr:ns-instance-opdata/nsr:nsr" +
+ "[nsr:ns-instance-config-ref={}]".format(quoted_key(self.nsr.ns_instance_config_ref)) +
"/nsr:monitoring-param" +
- ("[nsr:id='{}']".format(param_id) if param_id else ""))
-
+ ("[nsr:id={}]".format(quoted_key(param_id)) if param_id else ""))
+
@asyncio.coroutine
def register(self):
+ @asyncio.coroutine
+ def on_prepare(xact_info, query_action, ks_path, msg):
+ nsrmsg =None
+ xpath=None
+ if (self.reg_ready):
+ if (query_action == rwdts.QueryAction.READ):
+ if (len(self.mon_params_pollers)):
+ nsr_dict = {"ns_instance_config_ref": self.nsr.ns_instance_config_ref}
+ nsrmsg = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr. \
+ from_dict(nsr_dict)
+ xpath = self.nsr_xpath()
+
+ for poller in self.mon_params_pollers:
+ mp_dict = \
+ NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_MonitoringParam. \
+ from_dict(poller.retrieve_data().as_dict())
+ nsrmsg.monitoring_param.append(mp_dict)
+
+ try:
+ xact_info.respond_xpath(rsp_code=rwdts.XactRspCode.ACK,
+ xpath=self.nsr_xpath(),
+ msg=nsrmsg)
+ except rift.tasklets.dts.ResponseError:
+ pass
+
+ @asyncio.coroutine
+ def on_ready(regh, status):
+ self.reg_ready = 1
+
+ handler = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare, on_ready=on_ready)
+ self.reg_ready = 0
+
self.reg = yield from self.dts.register(xpath=self.xpath(),
- flags=rwdts.Flag.PUBLISHER|rwdts.Flag.CACHE|rwdts.Flag.NO_PREP_READ)
+ flags=rwdts.Flag.PUBLISHER,
+ handler=handler)
assert self.reg is not None
+ @asyncio.coroutine
+ def nsr_monparam_update(self):
+ #check if the earlier xact is done or there is an xact
+ try:
+ if (len(self.dts_updates) == 0):
+ self.dts_update_task = None
+ return
+ nsr_dict = {"ns_instance_config_ref": self.nsr.ns_instance_config_ref}
+ nsrmsg = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr.from_dict(nsr_dict)
+
+ for k,v in self.dts_updates.items():
+ mp_dict = NsrYang. \
+ YangData_RwProject_Project_NsInstanceOpdata_Nsr_MonitoringParam. \
+ from_dict(v.as_dict())
+ nsrmsg.monitoring_param.append(mp_dict)
+ self.dts_updates.clear()
+
+ yield from self.dts.query_update(self.nsr_xpath(), rwdts.XactFlag.ADVISE,
+ nsrmsg)
+
+ self.dts_update_task = None
+ if (len(self.dts_updates) == 0):
+ #schedule a DTS task to update the NSR again
+ self.add_dtsupdate_task()
+
+ except Exception as e:
+ self.log.exception("Exception updating NSR mon-param: %s", str(e))
+
+ def add_dtsupdate_task(self):
+ if (self.dts_update_task is None):
+ self.dts_update_task = asyncio.ensure_future(self.nsr_monparam_update(), loop=self.loop)
+
def callback(self, nsr_mon_param_msg):
"""Callback that triggers update.
"""
- self.reg.update_element(
- self.xpath(param_id=nsr_mon_param_msg.id),
- nsr_mon_param_msg)
-
+ self.dts_updates[nsr_mon_param_msg.id] = nsr_mon_param_msg
+ #schedule a DTS task to update the NSR if one does not exist
+ self.add_dtsupdate_task()
+
@asyncio.coroutine
def start(self):
- nsd = self.store.get_nsd(self.nsr.nsd_ref)
+ nsd = self.project.get_nsd(self.nsr.nsd_ref)
+
mon_params = NsrMonitoringParam.create_nsr_mon_params(
nsd,
self.constituent_vnfrs,
- self.store)
+ self.project)
for monp in mon_params:
poller = NsrMonitoringParamPoller.from_handler(
@@ -408,6 +552,18 @@
yield from poller.register()
yield from poller.start()
+ @asyncio.coroutine
+ def update(self, additional_vnfrs):
+ for vnfr in additional_vnfrs:
+ for poller in self.mon_params_pollers:
+ yield from poller.update(vnfr)
+
+ @asyncio.coroutine
+ def delete(self, deleted_vnfrs):
+ for vnfr in deleted_vnfrs:
+ for poller in self.mon_params_pollers:
+ yield from poller.delete(vnfr)
+
def stop(self):
self.deregister()
for poller in self.mon_params_pollers:
@@ -419,3 +575,9 @@
if self.reg is not None:
self.reg.deregister()
self.reg = None
+
+ def apply_vnfr_mon(self, msg, vnfr_id):
+ """ Change in vnfr mon to ne applied"""
+ for poller in self.mon_params_pollers:
+ if (poller.monp.mon_param_name == msg.name):
+ poller.update_value(msg, rwdts.QueryAction.UPDATE, vnfr_id)
diff --git a/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/rwmonparam.py b/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/rwmonparam.py
index 04e0306..0cb3e94 100644
--- a/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/rwmonparam.py
+++ b/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/rwmonparam.py
@@ -1,5 +1,5 @@
"""
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,15 +30,218 @@
from gi.repository import (
RwDts as rwdts,
RwLaunchpadYang,
+ NsrYang,
ProtobufC)
import rift.mano.cloud
import rift.mano.dts as subscriber
import rift.tasklets
-
+import concurrent.futures
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectHandler,
+ )
from . import vnfr_core
from . import nsr_core
+class MonParamProject(ManoProject):
+
+ def __init__(self, name, tasklet, **kw):
+ super(MonParamProject, self).__init__(tasklet.log, name)
+ self.update(tasklet)
+
+ self.vnfr_subscriber = None
+
+ self.vnfr_monitors = {}
+ self.nsr_monitors = {}
+ self.executor = concurrent.futures.ThreadPoolExecutor(max_workers=1)
+
+ # Needs to be moved to store once the DTS bug is resolved
+ # Gather all VNFRs
+ self.vnfrs = {}
+
+ self.vnfr_subscriber = subscriber.VnfrCatalogSubscriber.from_project(
+ self,
+ callback=self.handle_vnfr)
+ self.nsr_subsriber = subscriber.NsrCatalogSubscriber.from_project(
+ self,
+ callback=self.handle_nsr)
+
+ self._nsd_subscriber = subscriber.NsdCatalogSubscriber.from_project(self)
+ self._vnfd_subscriber = subscriber.VnfdCatalogSubscriber.from_project(self)
+
+ self.log.debug("Created DTS Api GI Object: %s", self.dts)
+
+ @asyncio.coroutine
+ def register (self):
+ self.log.debug("creating vnfr subscriber")
+ yield from self._nsd_subscriber.register()
+ yield from self._vnfd_subscriber.register()
+ yield from self.vnfr_subscriber.register()
+ yield from self.nsr_subsriber.register()
+
+
+ def deregister(self):
+ self.log.debug("De-register vnfr project {}".format(self.name))
+ self._nsd_subscriber.deregister()
+ self._vnfd_subscriber.deregister()
+ self.vnfr_subscriber.deregister()
+ self.nsr_subsriber.deregister()
+
+ def _unwrap(self, values, id_name):
+ try:
+ return values[0]
+ except KeyError:
+ self.log.exception("Unable to find the object with the given "
+ "ID {}".format(id_name))
+
+ def get_vnfd(self, vnfd_id):
+ values = [vnfd for vnfd in list(self._vnfd_subscriber.reg.get_xact_elements()) if vnfd.id == vnfd_id]
+ return self._unwrap(values, vnfd_id)
+
+ def get_nsd(self, nsd_id):
+ values = [nsd for nsd in list(self._nsd_subscriber.reg.get_xact_elements()) if nsd.id == nsd_id]
+ return self._unwrap(values, nsd_id)
+
+
+ def handle_vnfr(self, vnfr, action):
+ """Starts a monitoring parameter job for every VNFR that reaches
+ running state
+
+ Args:
+ vnfr (GiOBject): VNFR Gi object message from DTS
+ delete_mode (bool, optional): if set, stops and removes the monitor.
+ """
+
+ def vnfr_create():
+ # if vnfr.operational_status == "running" and vnfr.id not in self.vnfr_monitors:
+ vnfr_status = (vnfr.operational_status == "running" and
+ vnfr.config_status in ["configured", "config_not_needed"])
+
+ if vnfr_status and vnfr.id not in self.vnfr_monitors:
+
+ vnf_mon = vnfr_core.VnfMonitorDtsHandler.from_vnf_data(
+ self,
+ vnfr,
+ self.get_vnfd(vnfr.vnfd.id))
+
+ self.vnfr_monitors[vnfr.id] = vnf_mon
+ self.vnfrs[vnfr.id] = vnfr
+
+ @asyncio.coroutine
+ def task():
+ yield from vnf_mon.register()
+ if vnfr.nsr_id_ref in self.nsr_monitors:
+ vnf_mon.update_nsr_mon(self.nsr_monitors[vnfr.nsr_id_ref])
+ vnf_mon.start()
+ #self.update_nsrs(vnfr, action)
+
+ self.loop.create_task(task())
+
+
+ def vnfr_delete():
+ if vnfr.id in self.vnfr_monitors:
+ self.log.debug("VNFR %s deleted: Stopping vnfr monitoring", vnfr.id)
+ vnf_mon = self.vnfr_monitors.pop(vnfr.id)
+ vnf_mon.stop()
+ self.vnfrs.pop(vnfr.id)
+ #self.update_nsrs(vnfr, action)
+
+ if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE]:
+ vnfr_create()
+ elif action == rwdts.QueryAction.DELETE:
+ vnfr_delete()
+
+ def update_nsrs(self, vnfr, action):
+ if vnfr.nsr_id_ref not in self.nsr_monitors:
+ return
+
+ monitor = self.nsr_monitors[vnfr.nsr_id_ref]
+
+ if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE]:
+ @asyncio.coroutine
+ def update_vnfr():
+ yield from monitor.update([vnfr])
+
+ self.loop.create_task(update_vnfr())
+ elif action == rwdts.QueryAction.DELETE:
+ @asyncio.coroutine
+ def delete_vnfr():
+ try:
+ yield from monitor.delete([vnfr])
+ except Exception as e:
+ self.log.exception(str(e))
+
+ self.loop.create_task(delete_vnfr())
+
+
+
+ def handle_nsr(self, nsr, action):
+ """Callback for NSR opdata changes. Creates a publisher for every
+ NS that moves to config state.
+
+ Args:
+ nsr (RwNsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr): Ns Opdata
+ action (rwdts.QueryAction): Action type of the change.
+ """
+
+ def nsr_create():
+ # TODO clean up the if-else mess, exception
+
+ success_state = (nsr.operational_status == "running" and
+ nsr.config_status == "configured")
+
+ if not success_state:
+ return
+
+ if nsr.ns_instance_config_ref in self.nsr_monitors:
+ return
+
+ constituent_vnfrs = []
+
+ for vnfr_id in nsr.constituent_vnfr_ref:
+ if (vnfr_id.vnfr_id in self.vnfrs):
+ vnfr_obj = self.vnfrs[vnfr_id.vnfr_id]
+ constituent_vnfrs.append(vnfr_obj)
+ else:
+ pass
+
+ nsr_mon = nsr_core.NsrMonitorDtsHandler(
+ self.log,
+ self.dts,
+ self.loop,
+ self,
+ nsr,
+ constituent_vnfrs
+ )
+ for vnfr_id in nsr.constituent_vnfr_ref:
+ if vnfr_id.vnfr_id in self.vnfr_monitors:
+ self.vnfr_monitors[vnfr_id.vnfr_id].update_nsr_mon(nsr_mon)
+
+ self.nsr_monitors[nsr.ns_instance_config_ref] = nsr_mon
+
+
+ @asyncio.coroutine
+ def task():
+ try:
+ yield from nsr_mon.register()
+ yield from nsr_mon.start()
+ except Exception as e:
+ self.log.exception(e)
+
+ self.loop.create_task(task())
+
+ def nsr_delete():
+ if nsr.ns_instance_config_ref in self.nsr_monitors:
+ nsr_mon = self.nsr_monitors.pop(nsr.ns_instance_config_ref)
+ nsr_mon.stop()
+
+ if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE]:
+ nsr_create()
+ elif action == rwdts.QueryAction.DELETE:
+ nsr_delete()
+
+
class MonitoringParameterTasklet(rift.tasklets.Tasklet):
"""The main task of this Tasklet is to listen for VNFR changes and once the
VNFR hits the running state, triggers the monitor.
@@ -50,14 +253,8 @@
except Exception as e:
self.log.exception(e)
- self.vnfr_subscriber = None
- self.store = None
-
- self.vnfr_monitors = {}
- self.nsr_monitors = {}
-
- # Needs to be moved to store once the DTS bug is resolved
- self.vnfrs = {}
+ self._project_handler = None
+ self.projects = {}
def start(self):
super().start()
@@ -67,22 +264,11 @@
self.dts = rift.tasklets.DTS(
self.tasklet_info,
- RwLaunchpadYang.get_schema(),
+ NsrYang.get_schema(),
self.loop,
self.on_dts_state_change
)
- self.vnfr_subscriber = subscriber.VnfrCatalogSubscriber.from_tasklet(
- self,
- callback=self.handle_vnfr)
- self.nsr_subsriber = subscriber.NsrCatalogSubscriber.from_tasklet(
- self,
- callback=self.handle_nsr)
-
- self.store = subscriber.SubscriberStore.from_tasklet(self)
-
- self.log.debug("Created DTS Api GI Object: %s", self.dts)
-
def stop(self):
try:
self.dts.deinit()
@@ -91,10 +277,9 @@
@asyncio.coroutine
def init(self):
- self.log.debug("creating vnfr subscriber")
- yield from self.store.register()
- yield from self.vnfr_subscriber.register()
- yield from self.nsr_subsriber.register()
+ self.log.debug("creating project handler")
+ self.project_handler = ProjectHandler(self, MonParamProject)
+ self.project_handler.register()
@asyncio.coroutine
def run(self):
@@ -130,87 +315,3 @@
next_state = switch.get(state, None)
if next_state is not None:
self.dts.handle.set_state(next_state)
-
- def handle_vnfr(self, vnfr, action):
- """Starts a monitoring parameter job for every VNFR that reaches
- running state
-
- Args:
- vnfr (GiOBject): VNFR Gi object message from DTS
- delete_mode (bool, optional): if set, stops and removes the monitor.
- """
-
- def vnfr_create():
- # if vnfr.operational_status == "running" and vnfr.id not in self.vnfr_monitors:
- if vnfr.config_status == "configured" and vnfr.id not in self.vnfr_monitors:
-
- vnf_mon = vnfr_core.VnfMonitorDtsHandler.from_vnf_data(
- self,
- vnfr,
- self.store.get_vnfd(vnfr.vnfd.id))
-
- self.vnfr_monitors[vnfr.id] = vnf_mon
- self.vnfrs[vnfr.id] = vnfr
-
- @asyncio.coroutine
- def task():
- yield from vnf_mon.register()
- vnf_mon.start()
-
- self.loop.create_task(task())
-
-
- def vnfr_delete():
- if vnfr.id in self.vnfr_monitors:
- self.log.debug("VNFR %s deleted: Stopping vnfr monitoring", vnfr.id)
- vnf_mon = self.vnfr_monitors.pop(vnfr.id)
- vnf_mon.stop()
- self.vnfrs.pop(vnfr.id)
-
- if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE]:
- vnfr_create()
- elif action == rwdts.QueryAction.DELETE:
- vnfr_delete()
-
-
- def handle_nsr(self, nsr, action):
- """Callback for NSR opdata changes. Creates a publisher for every
- NS that moves to config state.
-
- Args:
- nsr (RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr): Ns Opdata
- action (rwdts.QueryAction): Action type of the change.
- """
- def nsr_create():
- # if nsr.operational_status == "running" and nsr.ns_instance_config_ref not in self.nsr_monitors:
- if nsr.config_status == "configured" and nsr.ns_instance_config_ref not in self.nsr_monitors:
- nsr_mon = nsr_core.NsrMonitorDtsHandler(
- self.log,
- self.dts,
- self.loop,
- nsr,
- list(self.vnfrs.values()),
- self.store
- )
-
- self.nsr_monitors[nsr.ns_instance_config_ref] = nsr_mon
-
- @asyncio.coroutine
- def task():
- yield from nsr_mon.register()
- yield from nsr_mon.start()
-
- self.loop.create_task(task())
-
-
-
- def nsr_delete():
- if nsr.ns_instance_config_ref in self.nsr_monitors:
- # if vnfr.operational_status == "running" and vnfr.id in self.vnfr_monitors:
- nsr_mon = self.nsr_monitors.pop(nsr.ns_instance_config_ref)
- nsr_mon.stop()
-
- if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE]:
- nsr_create()
- elif action == rwdts.QueryAction.DELETE:
- nsr_delete()
diff --git a/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/vnfr_core.py b/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/vnfr_core.py
index 6dc3a25..78bfd2d 100644
--- a/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/vnfr_core.py
+++ b/rwlaunchpad/plugins/rwmonparam/rift/tasklets/rwmonparam/vnfr_core.py
@@ -16,18 +16,17 @@
#
import asyncio
-import logging
import collections
import concurrent
-import types
-
+import gi
+import logging
import requests
import requests.auth
import tornado.escape
+import types
from requests.packages.urllib3.exceptions import InsecureRequestWarning
-import gi
gi.require_version('RwDts', '1.0')
import rift.tasklets
from gi.repository import (
@@ -37,6 +36,9 @@
import rift.mano.dts as mano_dts
import rwlogger
import xmltodict, json
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
class MonitoringParamError(Exception):
"""Monitoring Parameter error"""
@@ -226,12 +228,13 @@
class HTTPEndpoint(object):
- def __init__(self, log, loop, ip_address, ep_msg):
+ def __init__(self, log, loop, ip_address, ep_msg, executor=None):
self._log = log
self._loop = loop
self._ip_address = ip_address
self._ep_msg = ep_msg
-
+ self._executor = executor
+
# This is to suppress HTTPS related warning as we do not support
# certificate verification yet
requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
@@ -270,6 +273,12 @@
return "GET"
@property
+ def query_data(self):
+ if self._ep_msg.has_field("data"):
+ return self._ep_msg.data
+ return None
+
+ @property
def username(self):
if self._ep_msg.has_field("username"):
return self._ep_msg.username
@@ -320,9 +329,10 @@
def _poll(self):
try:
resp = self._session.request(
- self.method, self.url, timeout=10, auth=self.auth,
- headers=self.headers, verify=False
- )
+ self.method, self.url, timeout=10, auth=self.auth,
+ headers=self.headers, verify=False, data=self.query_data
+ )
+
resp.raise_for_status()
except requests.exceptions.RequestException as e:
msg = "Got HTTP error when request monitoring method {} from url {}: {}".format(
@@ -338,11 +348,17 @@
@asyncio.coroutine
def poll(self):
try:
- with concurrent.futures.ThreadPoolExecutor(1) as executor:
- resp = yield from self._loop.run_in_executor(
+ if (self._executor is None):
+ with concurrent.futures.ThreadPoolExecutor(1) as executor:
+ resp = yield from self._loop.run_in_executor(
executor,
self._poll,
- )
+ )
+ else:
+ resp = yield from self._loop.run_in_executor(
+ self._executor,
+ self._poll,
+ )
except MonitoringParamError as e:
msg = "Caught exception when polling http endpoint: %s" % str(e)
@@ -464,7 +480,7 @@
self._on_update_cb = on_update_cb
self._poll_task = None
-
+
@property
def poll_interval(self):
return self._endpoint.poll_interval
@@ -481,9 +497,9 @@
def _apply_response_to_mon_params(self, response_msg):
for mon_param in self._mon_params:
mon_param.extract_value_from_response(response_msg)
-
+
self._notify_subscriber()
-
+
@asyncio.coroutine
def _poll_loop(self):
self._log.debug("Starting http endpoint %s poll loop", self._endpoint.url)
@@ -491,6 +507,8 @@
try:
response = yield from self._endpoint.poll()
self._apply_response_to_mon_params(response)
+ except MonitoringParamError as e:
+ pass
except concurrent.futures.CancelledError as e:
return
@@ -513,14 +531,18 @@
self._poll_task = None
+ def retrieve(self, xact_info, ks_path, send_handler):
+ send_handler(xact_info, self._get_mon_param_msgs())
+
class VnfMonitoringParamsController(object):
def __init__(self, log, loop, vnfr_id, management_ip,
http_endpoint_msgs, monitoring_param_msgs,
- on_update_cb=None):
+ on_update_cb=None, executor=None):
self._log = log
self._loop = loop
self._vnfr_id = vnfr_id
+ self._executor = executor
self._management_ip = management_ip
self._http_endpoint_msgs = http_endpoint_msgs
self._monitoring_param_msgs = monitoring_param_msgs
@@ -533,16 +555,15 @@
self._endpoints, self._mon_params
)
self._endpoint_pollers = self._create_endpoint_pollers(self._endpoint_mon_param_map)
-
+
def _create_endpoints(self):
path_endpoint_map = {}
for ep_msg in self._http_endpoint_msgs:
- endpoint = HTTPEndpoint(
- self._log,
- self._loop,
- self._management_ip,
- ep_msg,
- )
+ endpoint = HTTPEndpoint(self._log,
+ self._loop,
+ self._management_ip,
+ ep_msg,self._executor)
+
path_endpoint_map[endpoint.path] = endpoint
return path_endpoint_map
@@ -576,9 +597,8 @@
mon_params,
self._on_update_cb
)
-
pollers.append(poller)
-
+
return pollers
@property
@@ -609,36 +629,41 @@
for poller in self._endpoint_pollers:
poller.stop()
-
+ def retrieve(self, xact_info, ks_path, send_handler):
+ """Retrieve Monitoring params information """
+ for poller in self._endpoint_pollers:
+ poller.retrieve(xact_info, ks_path, send_handler)
+
class VnfMonitorDtsHandler(mano_dts.DtsHandler):
""" VNF monitoring class """
# List of list: So we need to register for the list in the deepest level
XPATH = "D,/vnfr:vnfr-catalog/vnfr:vnfr/vnfr:monitoring-param"
@classmethod
- def from_vnf_data(cls, tasklet, vnfr_msg, vnfd_msg):
- handler = cls(tasklet.log, tasklet.dts, tasklet.loop,
+ def from_vnf_data(cls, project, vnfr_msg, vnfd_msg):
+ handler = cls(project.log, project.dts, project.loop, project,
vnfr_msg.id, vnfr_msg.mgmt_interface.ip_address,
- vnfd_msg.monitoring_param, vnfd_msg.http_endpoint)
+ vnfd_msg.monitoring_param, vnfd_msg.http_endpoint)
return handler
- def __init__(self, log, dts, loop, vnfr_id, mgmt_ip, params, endpoints):
- super().__init__(log, dts, loop)
+ def __init__(self, log, dts, loop, project, vnfr_id, mgmt_ip, params, endpoints, executor=None):
+ super().__init__(log, dts, loop, project)
self._mgmt_ip = mgmt_ip
self._vnfr_id = vnfr_id
-
+ self._executor = executor
+
mon_params = []
for mon_param in params:
- param = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_MonitoringParam.from_dict(
+ param = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_MonitoringParam.from_dict(
mon_param.as_dict()
)
mon_params.append(param)
http_endpoints = []
for endpoint in endpoints:
- endpoint = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_HttpEndpoint.from_dict(
+ endpoint = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_HttpEndpoint.from_dict(
endpoint.as_dict()
)
http_endpoints.append(endpoint)
@@ -648,23 +673,33 @@
self.log.debug(" - Monitoring Params: %s", mon_params)
self._mon_param_controller = VnfMonitoringParamsController(
- self.log,
- self.loop,
- self._vnfr_id,
- self._mgmt_ip,
- http_endpoints,
- mon_params,
- self.on_update_mon_params
- )
+ self.log,
+ self.loop,
+ self._vnfr_id,
+ self._mgmt_ip,
+ http_endpoints,
+ mon_params,
+ on_update_cb = self.on_update_mon_params,
+ executor=self._executor,
+ )
+ self._nsr_mon = None
def on_update_mon_params(self, mon_param_msgs):
for param_msg in mon_param_msgs:
- self.reg.update_element(
- self.xpath(param_msg.id),
- param_msg,
- rwdts.XactFlag.ADVISE
- )
-
+ #self.reg.update_element(
+ # self.xpath(param_msg.id),
+ # param_msg,
+ # rwdts.XactFlag.ADVISE
+ # )
+ if (self._nsr_mon is not None):
+ self._nsr_mon.apply_vnfr_mon(param_msg, self._vnfr_id)
+
+ def update_dts_read(self, xact_info, mon_param_msgs):
+ for param_msg in mon_param_msgs:
+ xact_info.respond_xpath(rsp_code=rwdts.XactRspCode.MORE,
+ xpath=self.xpath(param_msg.id),
+ msg=param_msg)
+
def start(self):
self._mon_param_controller.start()
@@ -674,10 +709,10 @@
def xpath(self, param_id=None):
""" Monitoring params xpath """
- return("D,/vnfr:vnfr-catalog" +
- "/vnfr:vnfr[vnfr:id='{}']".format(self._vnfr_id) +
+ return self.project.add_project(("D,/vnfr:vnfr-catalog" +
+ "/vnfr:vnfr[vnfr:id={}]".format(quoted_key(self._vnfr_id)) +
"/vnfr:monitoring-param" +
- ("[vnfr:id='{}']".format(param_id) if param_id else ""))
+ ("[vnfr:id={}]".format(quoted_key(param_id)) if param_id else "")))
@property
def msg(self):
@@ -686,13 +721,26 @@
def __del__(self):
self.stop()
-
+
@asyncio.coroutine
def register(self):
""" Register with dts """
-
+ @asyncio.coroutine
+ def on_prepare(xact_info, query_action, ks_path, msg):
+ if (self.reg_ready):
+ if (query_action == rwdts.QueryAction.READ):
+ self._mon_param_controller.retrieve(xact_info, ks_path, self.update_dts_read)
+
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+ @asyncio.coroutine
+ def on_ready(regh, status):
+ self.reg_ready = 1
+
+ handler = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare, on_ready=on_ready)
+ self.reg_ready = 0
self.reg = yield from self.dts.register(xpath=self.xpath(),
- flags=rwdts.Flag.PUBLISHER|rwdts.Flag.CACHE|rwdts.Flag.NO_PREP_READ)
+ flags=rwdts.Flag.PUBLISHER,
+ handler=handler)
assert self.reg is not None
@@ -705,3 +753,8 @@
self.reg.deregister()
self.reg = None
self._vnfr = None
+
+ def update_nsr_mon(self, nsr_mon):
+ """ update nsr mon """
+ self._nsr_mon = nsr_mon
+
diff --git a/rwlaunchpad/plugins/rwmonparam/test/utest_mon_params.py b/rwlaunchpad/plugins/rwmonparam/test/utest_mon_params.py
index fd48952..4836bf4 100755
--- a/rwlaunchpad/plugins/rwmonparam/test/utest_mon_params.py
+++ b/rwlaunchpad/plugins/rwmonparam/test/utest_mon_params.py
@@ -54,7 +54,7 @@
'ping-response-rx-count': 10
}
- mon_param_msg = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_MonitoringParam()
+ mon_param_msg = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_MonitoringParam()
mon_param_msg.from_dict({
'id': '1',
'name': 'ping-request-tx-count',
@@ -67,7 +67,7 @@
'units': 'packets'
})
- endpoint_msg = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_HttpEndpoint()
+ endpoint_msg = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_HttpEndpoint()
endpoint_msg.from_dict({
'path': ping_path,
'polling_interval_secs': 1,
@@ -231,7 +231,7 @@
'ping-response-rx-count': 10
}
- mon_param_msg = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_MonitoringParam()
+ mon_param_msg = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_MonitoringParam()
mon_param_msg.from_dict({
'id': '1',
'name': 'ping-request-tx-count',
@@ -244,7 +244,7 @@
'units': 'packets'
})
- endpoint_msg = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_HttpEndpoint()
+ endpoint_msg = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_HttpEndpoint()
endpoint_msg.from_dict({
'path': ping_path,
'https': 'true',
@@ -919,6 +919,34 @@
self.assertEqual(value, 12112)
+class vCPEStatTest(unittest.TestCase):
+ system_response = {"timestamp":1473455051,
+ "applicationLoad":[
+{ "service":"RIF", "instance":1, "gtpMessagesPerSec":0},
+{"service":"CPE", "instance":1, "tps":0},
+{"service":"DPE", "instance":1, "uplinkThroughput4G":0, "downlinkThroughput4G":0, "numDefaultBearers":0, "numDedicatedBearers":0 },
+{"service":"VEM", "instance":1 },
+{"service":"CDF", "instance":1, "tps":0},
+{"service":"S6A", "instance":1, "tps":0},
+{"service":"SDB", "instance":1, "queriesPerSec":0 }],
+ "resourceLoad":[
+{ "service":"RIF", "instance":1, "cpu":0, "mem":18, "compCpu":0 },
+{ "service":"CPE", "instance":1, "cpu":0, "mem":26, "compCpu":0 },
+{ "service":"DPE", "instance":1, "cpu":0, "mem":31, "compCpu":0 },
+{ "service":"VEM", "instance":1, "cpu":1, "mem":34, "compCpu":0 },
+{ "service":"CDF", "instance":1, "cpu":0, "mem":18, "compCpu":0 },
+{ "service":"S6A", "instance":1, "cpu":1, "mem":21, "compCpu":0 },
+{ "service":"SDB", "instance":1, "memUsedByData":255543560, "swapUtil":0, "swapTotal":3689934848, "swapUsed":0,"memUtil":0, "memTotal":12490944512, "memFree":10986942464, "cpu":2}] }
+
+
+ def test_object_path_value_querier(self):
+ kv_querier = mon_params.ObjectPathValueQuerier(logger, "$.applicationLoad[@.service is 'DPE'].uplinkThroughput4G")
+ value = kv_querier.query(tornado.escape.json_encode(self.system_response))
+ self.assertEqual(value, 0)
+ kv_querier = mon_params.ObjectPathValueQuerier(logger, "$.resourceLoad[@.service is 'DPE'].mem")
+ value = kv_querier.query(tornado.escape.json_encode(self.system_response))
+ self.assertEqual(value, 31)
+
class XMLReponseTest(unittest.TestCase):
xml_response = "<response status='success'><result> <entry> <current>2</current> <vsys>1</vsys> <maximum>0</maximum> <throttled>0</throttled> </entry> </result></response>"
diff --git a/rwlaunchpad/plugins/rwmonparam/test/utest_mon_params_dts.py b/rwlaunchpad/plugins/rwmonparam/test/utest_mon_params_dts.py
index fb0b039..76f2dfc 100644
--- a/rwlaunchpad/plugins/rwmonparam/test/utest_mon_params_dts.py
+++ b/rwlaunchpad/plugins/rwmonparam/test/utest_mon_params_dts.py
@@ -40,8 +40,8 @@
RwLaunchpadYang as launchpadyang,
RwDts as rwdts,
RwVnfrYang,
- RwVnfdYang,
- RwNsdYang
+ RwProjectVnfdYang as RwVnfdYang,
+ RwProjectNsdYang as RwNsdYang,
)
import utest_mon_params
@@ -50,7 +50,7 @@
class MonParamMsgGenerator(object):
def __init__(self, num_messages=1):
ping_path = r"/api/v1/ping/stats"
- self._endpoint_msg = vnfryang.YangData_Vnfr_VnfrCatalog_Vnfr_HttpEndpoint.from_dict({
+ self._endpoint_msg = vnfryang.YangData_RwProject_Project_VnfrCatalog_Vnfr_HttpEndpoint.from_dict({
'path': ping_path,
'https': 'true',
'polling_interval_secs': 1,
@@ -61,7 +61,7 @@
self._mon_param_msgs = []
for i in range(1, num_messages):
- self._mon_param_msgs.append(vnfryang.YangData_Vnfr_VnfrCatalog_Vnfr_MonitoringParam.from_dict({
+ self._mon_param_msgs.append(vnfryang.YangData_RwProject_Project_VnfrCatalog_Vnfr_MonitoringParam.from_dict({
'id': '%s' % i,
'name': 'param_num_%s' % i,
'json_query_method': "NAMEKEY",
@@ -97,7 +97,7 @@
@classmethod
def configure_timeout(cls):
- return 240
+ return 480
def configure_test(self, loop, test_id):
self.log.debug("STARTING - %s", test_id)
@@ -127,7 +127,7 @@
def setup_mock_store(self, aggregation_type, monps, legacy=False):
store = mock.MagicMock()
- mock_vnfd = RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd.from_dict({
+ mock_vnfd = RwVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd.from_dict({
'id': "1",
'monitoring_param': [
{'description': 'no of ping requests',
@@ -151,14 +151,14 @@
})
store.get_vnfd = mock.MagicMock(return_value=mock_vnfd)
- mock_vnfr = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr.from_dict({
+ mock_vnfr = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr.from_dict({
'id': '1',
'monitoring_param': ([monp.as_dict() for monp in monps] if not legacy else [])
})
- mock_vnfr.vnfd = vnfryang.YangData_Vnfr_VnfrCatalog_Vnfr_Vnfd.from_dict({'id': '1'})
+ mock_vnfr.vnfd = vnfryang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vnfd.from_dict({'id': '1'})
store.get_vnfr = mock.MagicMock(return_value=mock_vnfr)
- mock_nsr = RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr.from_dict({
+ mock_nsr = RwNsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr.from_dict({
'ns_instance_config_ref': "1",
'name_ref': "Foo",
'constituent_vnfr_ref': [{'vnfr_id': mock_vnfr.id}],
@@ -182,7 +182,7 @@
'vnfd_monitoring_param_ref': '2'}]
}]
- mock_nsd = RwNsdYang.YangData_Nsd_NsdCatalog_Nsd.from_dict({
+ mock_nsd = RwNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd.from_dict({
'id': str(uuid.uuid1()),
'monitoring_param': (monp if not legacy else [])
})
@@ -207,9 +207,9 @@
def register_vnf_publisher(self):
yield from self.vnf_handler.register()
- def add_param_to_publisher(self):
+ def add_param_to_publisher(self, publisher):
msg = self.msg_gen.next_message()
- self.vnf_handler.on_update_mon_params([msg])
+ publisher.on_update_mon_params([msg])
return msg
@asyncio.coroutine
@@ -244,10 +244,10 @@
@rift.test.dts.async_test
def _test_add_vnf_mon_params(self):
yield from self.register_vnf_publisher()
- self.add_param_to_publisher()
+ self.add_param_to_publisher(self.vnf_handler)
yield from self.register_vnf_test_subscriber()
- self.add_param_to_publisher()
+ self.add_param_to_publisher(self.vnf_handler)
# RIFT-12888: Elements do not go immediately into cache after on_prepare.
# Because of this, we can't guarantee that the second param will actually be
@@ -265,7 +265,7 @@
def _test_publish(self, aggregation_type, expected_value, legacy=False):
- self.msg_gen = MonParamMsgGenerator(4)
+ self.msg_gen = MonParamMsgGenerator(5)
store = self.setup_mock_store(aggregation_type=aggregation_type,
monps=self.msg_gen.mon_param_msgs,
legacy=legacy)
@@ -284,12 +284,12 @@
published_xpaths = yield from self.get_published_xpaths()
yield from self.register_vnf_publisher()
- self.add_param_to_publisher()
- self.add_param_to_publisher()
+ self.add_param_to_publisher(self.vnf_handler)
+ self.add_param_to_publisher(self.vnf_handler)
nsr_id = store.get_nsr().ns_instance_config_ref
- yield from asyncio.sleep(5, loop=self.loop)
+ yield from asyncio.sleep(2, loop=self.loop)
itr = yield from self.dts.query_read(self.nsr_handler.xpath(),
rwdts.XactFlag.MERGE)
@@ -329,6 +329,71 @@
def test_legacy_nsr_monitor_publish_avg(self):
yield from self._test_publish("AVERAGE", 1, legacy=True)
+ @rift.test.dts.async_test
+ def test_vnfr_add_delete(self):
+ yield from self._test_publish("SUM", 3)
+
+ self.msg_gen = MonParamMsgGenerator(5)
+ store = self.setup_mock_store(aggregation_type="SUM",
+ monps=self.msg_gen.mon_param_msgs)
+ new_vnf_handler = vnf_mon_params.VnfMonitorDtsHandler(
+ self.log, self.dts, self.loop, 2, "2.2.2.1",
+ self.msg_gen.mon_param_msgs, self.msg_gen.endpoint_msgs
+ )
+ yield from new_vnf_handler.register()
+
+ # add a new vnfr
+ new_vnfr = store.get_vnfr()
+ new_vnfr.id = '2'
+ yield from self.nsr_handler.update([new_vnfr])
+
+ # check if the newly created one has been added in the model
+ poller = self.nsr_handler.mon_params_pollers[0]
+ assert len(poller.monp.nsr_mon_param_msg.vnfr_mon_param_ref) == 4
+ assert len(poller.subscribers) == 4
+ assert len(poller.monp.vnfr_monparams) == 4
+
+ # publish new values
+ yield from asyncio.sleep(2, loop=self.loop)
+ self.add_param_to_publisher(new_vnf_handler)
+ self.add_param_to_publisher(new_vnf_handler)
+ yield from asyncio.sleep(3, loop=self.loop)
+
+ itr = yield from self.dts.query_read(self.nsr_handler.xpath(),
+ rwdts.XactFlag.MERGE)
+
+ values = []
+ for res in itr:
+ result = yield from res
+ nsr_monp = result.result
+ values.append(nsr_monp.value_integer)
+
+ assert values[0] == 6
+
+ # delete the VNFR
+ yield from self.nsr_handler.delete([new_vnfr])
+
+ # check if the newly created one has been added in the model
+ poller = self.nsr_handler.mon_params_pollers[0]
+ assert len(poller.monp.vnfr_monparams) == 2
+ assert len(poller.monp.nsr_mon_param_msg.vnfr_mon_param_ref) == 2
+ assert len(poller.subscribers) == 2
+
+ self.msg_gen = MonParamMsgGenerator(5)
+ self.add_param_to_publisher(self.vnf_handler)
+ self.add_param_to_publisher(self.vnf_handler)
+ yield from asyncio.sleep(2, loop=self.loop)
+
+ itr = yield from self.dts.query_read(self.nsr_handler.xpath(),
+ rwdts.XactFlag.MERGE)
+ values = []
+ for res in itr:
+ result = yield from res
+ nsr_monp = result.result
+ values.append(nsr_monp.value_integer)
+
+ assert values[0] == 3
+
def main():
diff --git a/rwlaunchpad/plugins/rwnsm/CMakeLists.txt b/rwlaunchpad/plugins/rwnsm/CMakeLists.txt
index 1db4a46..01cdb06 100644
--- a/rwlaunchpad/plugins/rwnsm/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwnsm/CMakeLists.txt
@@ -1,4 +1,4 @@
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
# anything not in a site-packages directory so we have to
@@ -35,6 +35,7 @@
rift/tasklets/${TASKLET_NAME}/__init__.py
rift/tasklets/${TASKLET_NAME}/${TASKLET_NAME}.py
rift/tasklets/${TASKLET_NAME}/rwnsm_conman.py
+ rift/tasklets/${TASKLET_NAME}/nsmpluginbase.py
rift/tasklets/${TASKLET_NAME}/rwnsmplugin.py
rift/tasklets/${TASKLET_NAME}/openmano_nsm.py
rift/tasklets/${TASKLET_NAME}/cloud.py
@@ -43,5 +44,6 @@
rift/tasklets/${TASKLET_NAME}/xpath.py
rift/tasklets/${TASKLET_NAME}/rwvnffgmgr.py
rift/tasklets/${TASKLET_NAME}/scale_group.py
- COMPONENT ${PKG_LONG_NAME}
+ rift/tasklets/${TASKLET_NAME}/subscriber.py
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
index 343f809..4664742 100644
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/cloud.py
@@ -1,6 +1,5 @@
-
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -24,119 +23,24 @@
)
import rift.mano.cloud
+import rift.mano.ro_account
import rift.mano.dts as mano_dts
import rift.tasklets
-from . import openmano_nsm
from . import rwnsmplugin
-
-class RwNsPlugin(rwnsmplugin.NsmPluginBase):
- """
- RW Implentation of the NsmPluginBase
- """
- def __init__(self, dts, log, loop, publisher, ro_account):
- self._dts = dts
- self._log = log
- self._loop = loop
-
- def set_state(self, nsr_id, state):
- pass
-
- def create_nsr(self, nsr_msg, nsd,key_pairs=None):
- """
- Create Network service record
- """
- pass
-
- @asyncio.coroutine
- def deploy(self, nsr):
- pass
-
- @asyncio.coroutine
- def instantiate_ns(self, nsr, config_xact):
- """
- Instantiate NSR with the passed nsr id
- """
- yield from nsr.instantiate(config_xact)
-
- @asyncio.coroutine
- def instantiate_vnf(self, nsr, vnfr, scaleout=False):
- """
- Instantiate NSR with the passed nsr id
- """
- yield from vnfr.instantiate(nsr)
-
- @asyncio.coroutine
- def instantiate_vl(self, nsr, vlr):
- """
- Instantiate NSR with the passed nsr id
- """
- yield from vlr.instantiate()
-
- @asyncio.coroutine
- def terminate_ns(self, nsr):
- """
- Terminate the network service
- """
- pass
-
- @asyncio.coroutine
- def terminate_vnf(self, vnfr):
- """
- Terminate the network service
- """
- yield from vnfr.terminate()
-
- @asyncio.coroutine
- def terminate_vl(self, vlr):
- """
- Terminate the virtual link
- """
- yield from vlr.terminate()
-
-
-class NsmPlugins(object):
- """ NSM Plugins """
- def __init__(self):
- self._plugin_classes = {
- "openmano": openmano_nsm.OpenmanoNsPlugin,
- }
-
- @property
- def plugins(self):
- """ Plugin info """
- return self._plugin_classes
-
- def __getitem__(self, name):
- """ Get item """
- print("%s", self._plugin_classes)
- return self._plugin_classes[name]
-
- def register(self, plugin_name, plugin_class, *args):
- """ Register a plugin to this Nsm"""
- self._plugin_classes[plugin_name] = plugin_class
-
- def deregister(self, plugin_name, plugin_class, *args):
- """ Deregister a plugin to this Nsm"""
- if plugin_name in self._plugin_classes:
- del self._plugin_classes[plugin_name]
-
- def class_by_plugin_name(self, name):
- """ Get class by plugin name """
- return self._plugin_classes[name]
-
-
class CloudAccountConfigSubscriber:
- def __init__(self, log, dts, log_hdl):
+ def __init__(self, log, dts, log_hdl, project):
self._dts = dts
self._log = log
self._log_hdl = log_hdl
-
+ self._project = project
+
self._cloud_sub = rift.mano.cloud.CloudAccountConfigSubscriber(
self._dts,
self._log,
self._log_hdl,
+ self._project,
rift.mano.cloud.CloudAccountConfigCallbacks())
def get_cloud_account_sdn_name(self, account_name):
@@ -150,93 +54,49 @@
self._log.debug("No SDN Account associated with Cloud name %s", account_name)
return None
+ def get_cloud_account_msg(self,account_name):
+ if account_name in self._cloud_sub.accounts:
+ self._log.debug("Cloud accnt msg is %s",self._cloud_sub.accounts[account_name].account_msg)
+ return self._cloud_sub.accounts[account_name].account_msg
+
@asyncio.coroutine
def register(self):
- self._cloud_sub.register()
+ yield from self._cloud_sub.register()
+ def deregister(self):
+ self._cloud_sub.deregister()
-class ROAccountPluginSelector(object):
- """
- Select the RO based on the config.
-
- If no RO account is specified, then default to rift-ro.
-
- Note:
- Currently only one RO can be used (one-time global config.)
- """
- DEFAULT_PLUGIN = RwNsPlugin
-
- def __init__(self, dts, log, loop, records_publisher):
+class ROAccountConfigSubscriber:
+ def __init__(self, dts, log, loop, project, records_publisher):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
self._records_publisher = records_publisher
- self._nsm_plugins = NsmPlugins()
-
- self._ro_sub = mano_dts.ROAccountConfigSubscriber(
- self._log,
+ self._log.debug("Inside cloud - RO Account Config Subscriber init")
+
+ self._ro_sub = rift.mano.ro_account.ROAccountConfigSubscriber(
self._dts,
- self._loop,
- callback=self.on_ro_account_change
- )
- self._nsr_sub = mano_dts.NsrCatalogSubscriber(
self._log,
- self._dts,
self._loop,
- self.handle_nsr)
+ self._project,
+ self._records_publisher,
+ rift.mano.ro_account.ROAccountConfigCallbacks())
- # The default plugin will be RwNsPlugin
- self._ro_plugin = self._create_plugin(self.DEFAULT_PLUGIN, None)
- self.live_instances = 0
+ def get_ro_plugin(self, account_name):
+ if (account_name is not None) and (account_name in self._ro_sub.accounts):
+ ro_account = self._ro_sub.accounts[account_name]
+ self._log.debug("RO Account associated with name %s is %s", account_name, ro_account)
+ return ro_account.ro_plugin
- @property
- def ro_plugin(self):
- return self._ro_plugin
-
- def handle_nsr(self, nsr, action):
- if action == rwdts.QueryAction.CREATE:
- self.live_instances += 1
- elif action == rwdts.QueryAction.DELETE:
- self.live_instances -= 1
-
- def on_ro_account_change(self, ro_account, action):
- if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE]:
- self._on_ro_account_change(ro_account)
- elif action == rwdts.QueryAction.DELETE:
- self._on_ro_account_deleted(ro_account)
-
- def _on_ro_account_change(self, ro_account):
- self._log.debug("Got nsm plugin RO account: %s", ro_account)
- try:
- nsm_cls = self._nsm_plugins.class_by_plugin_name(
- ro_account.account_type
- )
- except KeyError as e:
- self._log.debug(
- "RO account nsm plugin not found: %s. Using standard rift nsm.",
- ro_account.name
- )
- nsm_cls = self.DEFAULT_PLUGIN
-
- ro_plugin = self._create_plugin(nsm_cls, ro_account)
- if self.live_instances == 0:
- self._ro_plugin = ro_plugin
- else:
- raise ValueError("Unable to change the plugin when live NS instances exists!")
-
- def _on_ro_account_deleted(self, ro_account):
- self._ro_plugin = None
-
- def _create_plugin(self, nsm_cls, ro_account):
-
- self._log.debug("Instantiating new RO account using class: %s", nsm_cls)
- nsm_instance = nsm_cls(self._dts, self._log, self._loop,
- self._records_publisher, ro_account)
-
- return nsm_instance
-
+ self._log.debug("RO Account associated with name %s using default plugin", account_name)
+ return rwnsmplugin.RwNsPlugin(self._dts, self._log, self._loop, self._records_publisher, None, self._project)
+
@asyncio.coroutine
def register(self):
- yield from self._ro_sub.register()
- yield from self._nsr_sub.register()
+ self._log.debug("Registering ROAccount Config Subscriber")
+ yield from self._ro_sub.register()
+
+ def deregister(self):
+ self._ro_sub.deregister()
\ No newline at end of file
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/nsmpluginbase.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/nsmpluginbase.py
new file mode 100755
index 0000000..31b545a
--- /dev/null
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/nsmpluginbase.py
@@ -0,0 +1,122 @@
+#
+# Copyright 2016 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import asyncio
+import abc
+
+class NsmPluginBase(object):
+ """
+ Abstract base class for the NSM plugin.
+ There will be single instance of this plugin for each plugin type.
+ """
+
+ def __init__(self, dts, log, loop, nsm, plugin_name, dts_publisher):
+ self._dts = dts
+ self._log = log
+ self._loop = loop
+ self._nsm = nsm
+ self._plugin_name = plugin_name
+ self._dts_publisher = dts_publisher
+
+ @property
+ def dts(self):
+ return self._dts
+
+ @property
+ def log(self):
+ return self._log
+
+ @property
+ def loop(self):
+ return self._loop
+
+ @property
+ def nsm(self):
+ return self._nsm
+
+ @abc.abstractmethod
+ def set_state(self, nsr_id, state):
+ pass
+
+ @abc.abstractmethod
+ def create_nsr(self, nsr, nsd, key_pairs=None, ssh_key=None):
+ """ Create an NSR """
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def deploy(self, nsr_msg):
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def instantiate_ns(self, nsr, xact):
+ """ Instantiate the network service """
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def instantiate_vnf(self, nsr, vnfr, scaleout=False):
+ """ Instantiate the virtual network function """
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def instantiate_vl(self, nsr, vl):
+ """ Instantiate the virtual link"""
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def update_vnfr(self, vnfr):
+ """ Update the virtual network function record """
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def get_nsr(self, nsr_path):
+ """ Get the NSR """
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def get_vnfr(self, vnfr_path):
+ """ Get the VNFR """
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def get_vlr(self, vlr_path):
+ """ Get the VLR """
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def terminate_ns(self, nsr):
+ """Terminate the network service """
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def terminate_vnf(self, nsr, vnfr, scalein=False):
+ """Terminate the VNF """
+ pass
+
+ @abc.abstractmethod
+ @asyncio.coroutine
+ def terminate_vl(self, vlr):
+ """Terminate the Virtual Link Record"""
+ pass
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
index 5ca0f3f..4ba5011 100644
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
@@ -16,25 +16,27 @@
#
import asyncio
+import gi
import os
import sys
import time
import yaml
-import gi
gi.require_version('RwDts', '1.0')
gi.require_version('RwVnfrYang', '1.0')
from gi.repository import (
RwDts as rwdts,
RwVnfrYang,
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
import rift.openmano.rift2openmano as rift2openmano
import rift.openmano.openmano_client as openmano_client
-from . import rwnsmplugin
+from . import nsmpluginbase
from enum import Enum
-
+import ipaddress
import rift.tasklets
if sys.version_info < (3, 4, 4):
@@ -42,7 +44,7 @@
DUMP_OPENMANO_DIR = os.path.join(
- os.environ["RIFT_ARTIFACTS"],
+ os.environ["RIFT_VAR_ROOT"],
"openmano_descriptors"
)
@@ -78,9 +80,12 @@
@property
def vnfr_vdu_console_xpath(self):
""" path for resource-mgr"""
- return ("D,/rw-vnfr:vnfr-console/rw-vnfr:vnfr[rw-vnfr:id='{}']/rw-vnfr:vdur[vnfr:id='{}']".format(self._vnfr_id,self._vdur_id))
+ return self._project.add_project(
+ "D,/rw-vnfr:vnfr-console/rw-vnfr:vnfr[rw-vnfr:id={}]/rw-vnfr:vdur[vnfr:id={}]".format(
+ quoted_key(self._vnfr_id), quoted_key(self._vdur_id)))
- def __init__(self, dts, log, loop, nsr, vnfr_id, vdur_id, vdu_id):
+ def __init__(self, project, dts, log, loop, nsr, vnfr_id, vdur_id, vdu_id):
+ self._project = project
self._dts = dts
self._log = log
self._loop = loop
@@ -105,7 +110,7 @@
)
if action == rwdts.QueryAction.READ:
- schema = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur.schema()
+ schema = RwVnfrYang.YangData_RwProject_Project_VnfrConsole_Vnfr_Vdur.schema()
path_entry = schema.keyspec_to_entry(ks_path)
try:
@@ -117,11 +122,11 @@
)
self._log.debug("Got console response: %s for NSR ID %s vdur ID %s",
- console_url,
- self._nsr._nsr_uuid,
- self._vdur_id
- )
- vdur_console = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur()
+ console_url,
+ self._nsr._nsr_uuid,
+ self._vdur_id
+ )
+ vdur_console = RwVnfrYang.YangData_RwProject_Project_VnfrConsole_Vnfr_Vdur()
vdur_console.id = self._vdur_id
if console_url:
vdur_console.console_url = console_url
@@ -130,8 +135,8 @@
self._log.debug("Recevied console URL for vdu {} is {}".format(self._vdu_id,vdur_console))
except openmano_client.InstanceStatusError as e:
self._log.error("Could not get NS instance console URL: %s",
- str(e))
- vdur_console = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur()
+ str(e))
+ vdur_console = RwVnfrYang.YangData_RwProject_Project_VnfrConsole_Vnfr_Vdur()
vdur_console.id = self._vdur_id
vdur_console.console_url = 'none'
@@ -156,10 +161,11 @@
class OpenmanoVnfr(object):
- def __init__(self, log, loop, cli_api, vnfr, nsd):
+ def __init__(self, log, loop, cli_api, http_api, vnfr, nsd, ssh_key=None):
self._log = log
self._loop = loop
self._cli_api = cli_api
+ self._http_api = http_api
self._vnfr = vnfr
self._vnfd_id = vnfr.vnfd.id
@@ -168,6 +174,7 @@
self._created = False
self.nsd = nsd
+ self._ssh_key = ssh_key
@property
def vnfd(self):
@@ -188,7 +195,7 @@
@property
def openmano_vnfd(self):
self._log.debug("Converting vnfd %s from rift to openmano", self.vnfd.id)
- openmano_vnfd = rift2openmano.rift2openmano_vnfd(self.vnfd, self.nsd)
+ openmano_vnfd = rift2openmano.rift2openmano_vnfd(self.vnfd, self.nsd, self._http_api)
return openmano_vnfd
@property
@@ -197,36 +204,19 @@
@asyncio.coroutine
def create(self):
- self._log.debug("Creating openmano vnfd")
- openmano_vnfd = self.openmano_vnfd
- name = openmano_vnfd["vnf"]["name"]
+ try:
+ self._log.debug("Created openmano vnfd")
+ # The self.openmano_vnfd_yaml internally creates the vnf if not found.
+ # Assigning the yaml to a variable so that the api is not fired unnecessarily.
+ openmano_vnfd = self.openmano_vnfd
+ name = openmano_vnfd["name"]
- # If the name already exists, get the openmano vnfd id
- name_uuid_map = yield from self._loop.run_in_executor(
- None,
- self._cli_api.vnf_list,
- )
+ self._vnf_id = openmano_vnfd['uuid']
- if name in name_uuid_map:
- vnf_id = name_uuid_map[name]
- self._log.debug("Vnf already created. Got existing openmano vnfd id: %s", vnf_id)
- self._vnf_id = vnf_id
- return
-
- self._vnf_id, _ = yield from self._loop.run_in_executor(
- None,
- self._cli_api.vnf_create,
- self.openmano_vnfd_yaml,
- )
-
- fpath = dump_openmano_descriptor(
- "{}_vnf".format(name),
- self.openmano_vnfd_yaml
- )
-
- self._log.debug("Dumped Openmano VNF descriptor to: %s", fpath)
-
- self._created = True
+ self._created = True
+ except Exception as e:
+ self._log.error("Failed to create vnf on Openmano RO : %s", e)
+ raise e
def delete(self):
if not self._created:
@@ -260,7 +250,9 @@
TIMEOUT_SECS = 300
INSTANCE_TERMINATE_TIMEOUT = 60
- def __init__(self, dts, log, loop, publisher, cli_api, http_api, nsd_msg, nsr_config_msg,key_pairs,rift_vnfd_id=None ):
+ def __init__(self, project, dts, log, loop, publisher, cli_api, http_api, nsd_msg,
+ nsr_config_msg, key_pairs, ssh_key, rift_vnfd_id=None ):
+ self._project = project
self._log = log
self._dts = dts
self._loop = loop
@@ -275,6 +267,7 @@
self._nsrs = {}
self._vdur_console_handler = {}
self._key_pairs = key_pairs
+ self._ssh_key = ssh_key
self._nsd_uuid = None
self._nsr_uuid = None
@@ -288,6 +281,9 @@
self._rift_vnfd_id = rift_vnfd_id
self._state = OpenmanoNSRecordState.INIT
+ self._active_vms = 0
+ self._active_nets = 0
+
@property
def nsd(self):
return rift2openmano.RiftNSD(self._nsd_msg)
@@ -330,16 +326,20 @@
return self._vlrs
@property
+ def http_api(self):
+ return self._http_api
+
+ @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,self.vnfr_ids)
+ openmano_nsd = rift2openmano.rift2openmano_nsd(self.nsd, self.vnfds,self.vnfr_ids, self.http_api)
return yaml.safe_dump(openmano_nsd, default_flow_style=False)
@property
def openmano_scaling_yaml(self):
self._log.debug("Creating Openmano Scaling Descriptor %s")
try:
- openmano_vnfd_nsd = rift2openmano.rift2openmano_vnfd_nsd(self.nsd, self.vnfds, self.vnfr_ids, self._rift_vnfd_id)
+ openmano_vnfd_nsd = rift2openmano.rift2openmano_vnfd_nsd(self.nsd, self.vnfds, self.vnfr_ids, self.http_api, self._rift_vnfd_id)
return yaml.safe_dump(openmano_vnfd_nsd, default_flow_style=False)
except Exception as e:
self._log.exception("Scaling Descriptor Exception: %s", str(e))
@@ -356,6 +356,10 @@
self._log.debug("Key pair NSD is %s",authorized_key)
key_pairs.append(authorized_key.key)
+ if self._ssh_key['public_key']:
+ self._log.debug("Pub key NSD is %s", self._ssh_key['public_key'])
+ key_pairs.append(self._ssh_key['public_key'])
+
if key_pairs:
cloud_config["key-pairs"] = key_pairs
@@ -397,13 +401,13 @@
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
+ if self._nsr_config_msg.has_field("datacenter"):
+ openmano_instance_create["datacenter"] = self._nsr_config_msg.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}
+ if "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.datacenter}
openmano_instance_create["networks"] = {}
for vld_msg in self._nsd_msg.vld:
openmano_instance_create["networks"][vld_msg.name] = {}
@@ -411,7 +415,7 @@
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)
+ vlr.datacenter_name,vld_msg.name)
#network["vim-network-name"] = vld_msg.name
network = {}
ip_profile = {}
@@ -434,12 +438,32 @@
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
+ if ip_profile['dhcp']['enabled'] is True and ip_profile['dhcp']['start-address'] is None:
+ addr_pool = list(ipaddress.ip_network(ip_profile['subnet-address']).hosts())
+ gateway_ip_addr = ip_profile.get('gateway-address', None)
+ if gateway_ip_addr is None:
+ gateway_ip_addr = str(next(iter(addr_pool)))
+ ip_profile['gateway-address'] = gateway_ip_addr
+
+ self._log.debug("Gateway Address {}".format(gateway_ip_addr))
+
+ if ipaddress.ip_address(gateway_ip_addr) in addr_pool:
+ addr_pool.remove(ipaddress.ip_address(gateway_ip_addr))
+ if len(addr_pool) > 0:
+ ip_profile['dhcp']['start-address'] = str(next(iter(addr_pool)))
+ #DHCP count more than 200 is not instantiating any instances using OPENMANO RO
+ #So restricting it to a feasible count of 100.
+ dhcp_count = ip_profile['dhcp']['count']
+ if dhcp_count is None or dhcp_count == 0 or dhcp_count > len(addr_pool):
+ ip_profile['dhcp']['count'] = min(len(addr_pool), 100)
+ self._log.debug("DHCP start Address {} DHCP count {}".
+ format(ip_profile['dhcp']['start-address'], ip_profile['dhcp']['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
+ if vlr.datacenter_name:
+ network["datacenter"] = vlr.datacenter_name
+ elif vld_msg.has_field("datacenter"):
+ network["datacenter"] = vld_msg.datacenter
elif "datacenter" in openmano_instance_create:
network["datacenter"] = openmano_instance_create["datacenter"]
if network:
@@ -462,13 +486,13 @@
scaling_instance_create["description"] = self._nsr_config_msg.description
- if self._nsr_config_msg.has_field("om_datacenter"):
- scaling_instance_create["datacenter"] = self._nsr_config_msg.om_datacenter
+ if self._nsr_config_msg.has_field("datacenter"):
+ scaling_instance_create["datacenter"] = self._nsr_config_msg.datacenter
scaling_instance_create["vnfs"] = {}
for vnfr in self._vnfrs:
- if "om_datacenter" in vnfr.vnfr.vnfr_msg:
+ if "datacenter" in vnfr.vnfr.vnfr_msg:
vnfr_name = vnfr.vnfr.vnfd.name + "__" + str(vnfr.vnfr.vnfr_msg.member_vnf_index_ref)
- scaling_instance_create["vnfs"][vnfr_name] = {"datacenter": vnfr.vnfr.vnfr_msg.om_datacenter}
+ scaling_instance_create["vnfs"][vnfr_name] = {"datacenter": vnfr.vnfr.vnfr_msg.datacenter}
scaling_instance_create["networks"] = {}
for vld_msg in self._nsd_msg.vld:
scaling_instance_create["networks"][vld_msg.name] = {}
@@ -476,7 +500,7 @@
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)
+ vlr.datacenter_name,vld_msg.name)
#network["vim-network-name"] = vld_msg.name
network = {}
ip_profile = {}
@@ -484,10 +508,10 @@
network["netmap-use"] = vld_msg.vim_network_name
#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
+ if vlr.datacenter_name:
+ network["datacenter"] = vlr.datacenter_name
+ elif vld_msg.has_field("datacenter"):
+ network["datacenter"] = vld_msg.datacenter
elif "datacenter" in scaling_instance_create:
network["datacenter"] = scaling_instance_create["datacenter"]
if network:
@@ -527,13 +551,14 @@
None,
self._cli_api.ns_vim_network_delete,
vlr.name,
- vlr.om_datacenter_name)
+ vlr.datacenter_name)
yield from self._publisher.unpublish_vlr(None, vlr.vlr_msg)
yield from asyncio.sleep(1, loop=self._loop)
@asyncio.coroutine
def add_vnfr(self, vnfr):
- vnfr = OpenmanoVnfr(self._log, self._loop, self._cli_api, vnfr, nsd=self.nsd)
+ vnfr = OpenmanoVnfr(self._log, self._loop, self._cli_api, self.http_api,
+ vnfr, nsd=self.nsd, ssh_key=self._ssh_key)
yield from vnfr.create()
self._vnfrs.append(vnfr)
@@ -559,58 +584,70 @@
@asyncio.coroutine
def create(self):
- self._log.debug("Creating openmano scenario")
- name_uuid_map = yield from self._loop.run_in_executor(
- None,
- self._cli_api.ns_list,
- )
+ try:
+ self._log.debug("Created openmano scenario")
+ # The self.openmano_nsd_yaml internally creates the scenario if not found.
+ # Assigning the yaml to a variable so that the api is not fired unnecessarily.
+ nsd_yaml = self.openmano_nsd_yaml
- if self._nsd_msg.name in name_uuid_map:
- self._log.debug("Found existing openmano scenario")
- self._nsd_uuid = name_uuid_map[self._nsd_msg.name]
- return
+ self._nsd_uuid = yaml.load(nsd_yaml)['uuid']
+ fpath = dump_openmano_descriptor(
+ "{}_nsd".format(self._nsd_msg.name),
+ nsd_yaml,
+ )
+ self._log.debug("Dumped Openmano NS descriptor to: %s", fpath)
- # Use the nsd uuid as the scenario name to rebind to existing
- # scenario on reload or to support muliple instances of the name
- # nsd
- self._nsd_uuid, _ = yield from self._loop.run_in_executor(
- None,
- self._cli_api.ns_create,
- self.openmano_nsd_yaml,
- self._nsd_msg.name
- )
- fpath = dump_openmano_descriptor(
- "{}_nsd".format(self._nsd_msg.name),
- self.openmano_nsd_yaml,
- )
-
- self._log.debug("Dumped Openmano NS descriptor to: %s", fpath)
-
- self._created = True
+ self._created = True
+ except Exception as e:
+ self._log.error("Failed to create scenario on Openmano RO : %s", e)
+ raise e
@asyncio.coroutine
def scaling_scenario_create(self):
self._log.debug("Creating scaling openmano scenario")
- self._nsd_uuid, _ = yield from self._loop.run_in_executor(
- None,
- self._cli_api.ns_create,
- self.openmano_scaling_yaml,
- )
+ # The self.openmano_nsd_yaml internally creates the scenario if not found.
+ # Assigning the yaml to a variable so that the api is not fired unnecessarily.
+ nsd_yaml = self.openmano_scaling_yaml
+
+ self._nsd_uuid = yaml.load(nsd_yaml)['uuid']
+
fpath = dump_openmano_descriptor(
"{}_sgd".format(self._nsd_msg.name),
self.scaling_instance_create_yaml,
)
+
+ @asyncio.coroutine
+ def get_nsr_opdata(self):
+ """ NSR opdata associated with this VNFR """
+ xpath = self._project.add_project(
+ "D,/nsr:ns-instance-opdata/nsr:nsr" \
+ "[nsr:ns-instance-config-ref={}]". \
+ format(quoted_key(self.nsr_config_msg.id)))
+
+ results = yield from self._dts.query_read(xpath, rwdts.XactFlag.MERGE)
+
+ for result in results:
+ entry = yield from result
+ nsr_op = entry.result
+ return nsr_op
+
+ return None
+
+
@asyncio.coroutine
def instance_monitor_task(self):
self._log.debug("Starting Instance monitoring task")
start_time = time.time()
active_vnfs = []
-
+ nsr = yield from self.get_nsr_opdata()
while True:
+ active_vms = 0
+ active_nets = 0
+
yield from asyncio.sleep(1, loop=self._loop)
try:
@@ -624,10 +661,28 @@
instance_resp_json,
self._nsr_uuid)
+ for vnf in instance_resp_json['vnfs']:
+ for vm in vnf['vms']:
+ if vm['status'] == 'ACTIVE':
+ active_vms += 1
+ for net in instance_resp_json['nets']:
+ if net['status'] == 'ACTIVE':
+ active_nets += 1
+
+ nsr.orchestration_progress.vms.active = active_vms
+ nsr.orchestration_progress.networks.active = active_nets
+
+ # This is for accesibility of the status from nsm when the control goes back.
+ self._active_vms = active_vms
+ self._active_nets = active_nets
+
+ yield from self._publisher.publish_nsr_opdata(None, nsr)
+
except openmano_client.InstanceStatusError as e:
self._log.error("Could not get NS instance status: %s", str(e))
continue
+
def all_vms_active(vnf):
for vm in vnf["vms"]:
vm_status = vm["status"]
@@ -662,6 +717,18 @@
def get_vnf_ip_address(vnf):
if "ip_address" in vnf:
return vnf["ip_address"].strip()
+
+ else:
+ cp_info_list = get_ext_cp_info(vnf)
+
+ for cp_name, ip, mac in cp_info_list:
+ for vld in self.nsd.vlds:
+ if not vld.mgmt_network:
+ continue
+
+ for vld_cp in vld.vnfd_connection_point_ref:
+ if vld_cp.vnfd_connection_point_ref == cp_name:
+ return ip
return None
def get_vnf_mac_address(vnf):
@@ -695,17 +762,17 @@
return cp_info_list
def get_vnf_status(vnfr):
- # When we create an openmano descriptor we use <name>__<idx>
+ # When we create an openmano descriptor we use <name>.<idx>
# to come up with openmano constituent VNF name. Use this
# knowledge to map the vnfr back.
- openmano_vnfr_suffix = "__{}".format(
+ openmano_vnfr_suffix = ".{}".format(
vnfr.vnfr.vnfr_msg.member_vnf_index_ref
)
for vnf in instance_resp_json["vnfs"]:
if vnf["vnf_name"].endswith(openmano_vnfr_suffix):
return vnf
-
+
self._log.warning("Could not find vnf status with name that ends with: %s",
openmano_vnfr_suffix)
return None
@@ -730,7 +797,7 @@
# If there was a VNF that has a errored VM, then just fail the VNF and stop monitoring.
if any_vms_error(vnf_status):
- self._log.debug("VM was found to be in error state. Marking as failed.")
+ self._log.error("VM was found to be in error state. Marking as failed.")
self._state = OpenmanoNSRecordState.FAILED
vnfr_msg.operational_status = "failed"
yield from self._publisher.publish_vnfr(None, vnfr_msg)
@@ -748,7 +815,7 @@
vnf_mac_address = get_vnf_mac_address(vnf_status)
if vnf_ip_address is None:
- self._log.warning("No IP address obtained "
+ self._log.error("No IP address obtained "
"for VNF: {}, will retry.".format(
vnf_status['vnf_name']))
continue
@@ -756,14 +823,17 @@
self._log.debug("All VMs in VNF are active. Marking as running.")
vnfr_msg.operational_status = "running"
- self._log.debug("Got VNF ip address: %s, mac-address: %s", vnf_ip_address, vnf_mac_address)
+ self._log.debug("Got VNF ip address: %s, mac-address: %s",
+ vnf_ip_address, vnf_mac_address)
vnfr_msg.mgmt_interface.ip_address = vnf_ip_address
- vnfr_msg.vnf_configuration.config_access.mgmt_ip_address = vnf_ip_address
-
+ vnfr_msg.mgmt_interface.ssh_key.public_key = \
+ vnfr._ssh_key['public_key']
+ vnfr_msg.mgmt_interface.ssh_key.private_key_file = \
+ vnfr._ssh_key['private_key']
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._project, 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
@@ -793,7 +863,7 @@
if len(active_vnfs) == len(self._vnfrs):
self._state = OpenmanoNSRecordState.RUNNING
- self._log.info("All VNF's are active. Exiting NSR monitoring task")
+ self._log.debug("All VNF's are active. Exiting NSR monitoring task")
return
@asyncio.coroutine
@@ -872,14 +942,14 @@
@asyncio.coroutine
def create_vlr(self,vlr):
- self._log.debug("Creating openmano vim network VLR name %s, VLR DC: %s",vlr.vld_msg.name,
- vlr.om_datacenter_name)
+ self._log.error("Creating openmano vim network VLR name %s, VLR DC: %s",vlr.vld_msg.name,
+ vlr.datacenter_name)
net_create = {}
net = {}
net['name'] = vlr.name
net['shared'] = True
net['type'] = 'bridge'
- self._log.debug("Received ip profile is %s",vlr._ip_profile)
+ self._log.error("Received ip profile is %s",vlr._ip_profile)
if vlr._ip_profile and vlr._ip_profile.has_field("ip_profile_params"):
ip_profile_params = vlr._ip_profile.ip_profile_params
ip_profile = {}
@@ -904,27 +974,28 @@
fpath = dump_openmano_descriptor(
"{}_vim_net_create_{}".format(self._nsr_config_msg.name,vlr.name),
net_create_msg)
- self._log.debug("Dumped Openmano VIM Net create to: %s", fpath)
+ self._log.error("Dumped Openmano VIM Net create to: %s", fpath)
vim_network_uuid = yield from self._loop.run_in_executor(
None,
self._cli_api.ns_vim_network_create,
net_create_msg,
- vlr.om_datacenter_name)
+ vlr.datacenter_name)
self._vlrs.append(vlr)
-class OpenmanoNsPlugin(rwnsmplugin.NsmPluginBase):
+class OpenmanoNsPlugin(nsmpluginbase.NsmPluginBase):
"""
RW Implentation of the NsmPluginBase
"""
- def __init__(self, dts, log, loop, publisher, ro_account):
+ def __init__(self, dts, log, loop, publisher, ro_account, project):
self._dts = dts
self._log = log
self._loop = loop
self._publisher = publisher
-
+ self._project = project
+
self._cli_api = None
self._http_api = None
self._openmano_nsrs = {}
@@ -958,21 +1029,24 @@
OpenmanoNSRecordState.__members__.items() \
if member.value == state.value]
- def create_nsr(self, nsr_config_msg, nsd_msg, key_pairs=None):
+ def create_nsr(self, nsr_config_msg, nsd_msg, key_pairs=None, ssh_key=None):
"""
Create Network service record
"""
openmano_nsr = OpenmanoNsr(
- self._dts,
- self._log,
- self._loop,
- self._publisher,
- self._cli_api,
- self._http_api,
- nsd_msg,
- nsr_config_msg,
- key_pairs
- )
+ self._project,
+ self._dts,
+ self._log,
+ self._loop,
+ self._publisher,
+ self._cli_api,
+ self._http_api,
+ nsd_msg,
+ nsr_config_msg,
+ key_pairs,
+ ssh_key,
+ )
+ self.log.debug("NSR created in openmano nsm %s", openmano_nsr)
self._openmano_nsrs[nsr_config_msg.id] = openmano_nsr
@asyncio.coroutine
@@ -997,6 +1071,7 @@
openmano_nsr = self._openmano_nsrs[nsr.id]
if scaleout:
openmano_vnf_nsr = OpenmanoNsr(
+ self._project,
self._dts,
self._log,
self._loop,
@@ -1006,7 +1081,8 @@
openmano_nsr.nsd_msg,
openmano_nsr.nsr_config_msg,
openmano_nsr.key_pairs,
- vnfr.vnfd.id
+ None,
+ rift_vnfd_id=vnfr.vnfd.id,
)
self._openmano_nsr_by_vnfr_id[nsr.id] = openmano_nsr
if vnfr.id in self._openmano_nsr_by_vnfr_id:
@@ -1041,8 +1117,12 @@
vnfr_msg.operational_status = "init"
self._log.debug("Attempting to publish openmano vnf: %s", vnfr_msg)
- with self._dts.transaction() as xact:
- yield from self._publisher.publish_vnfr(xact, vnfr_msg)
+ yield from self._publisher.publish_vnfr(None, vnfr_msg)
+
+ def update_vnfr(self, vnfr):
+ vnfr_msg = vnfr.vnfr_msg.deep_copy()
+ self._log.debug("Attempting to publish openmano vnf: %s", vnfr_msg)
+ yield from self._publisher.publish_vnfr(None, vnfr_msg)
@asyncio.coroutine
def instantiate_vl(self, nsr, vlr):
@@ -1074,10 +1154,9 @@
openmano_nsr,
)
- with self._dts.transaction() as xact:
- for vnfr in openmano_nsr.vnfrs:
- self._log.debug("Unpublishing VNFR: %s", vnfr.vnfr.vnfr_msg)
- yield from self._publisher.unpublish_vnfr(xact, vnfr.vnfr.vnfr_msg)
+ for vnfr in openmano_nsr.vnfrs:
+ self._log.debug("Unpublishing VNFR: %s", vnfr.vnfr.vnfr_msg)
+ yield from self._publisher.unpublish_vnfr(None, vnfr.vnfr.vnfr_msg)
del self._openmano_nsrs[nsr_id]
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/publisher.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/publisher.py
index bff6d49..6def40e 100644
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/publisher.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/publisher.py
@@ -21,7 +21,7 @@
from gi.repository import (
RwDts as rwdts,
RwTypes,
- RwVnfdYang,
+ RwProjectVnfdYang as RwVnfdYang,
RwYang
)
import rift.tasklets
@@ -33,10 +33,11 @@
""" The network service op data DTS handler """
XPATH = "D,/nsr:ns-instance-opdata/nsr:nsr"
- def __init__(self, dts, log, loop):
+ def __init__(self, dts, log, loop, project):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
self._regh = None
@property
@@ -47,51 +48,63 @@
@asyncio.coroutine
def register(self):
""" Register for Nsr op data publisher registration"""
- self._log.debug("Registering Nsr op data path %s as publisher",
- NsrOpDataDtsHandler.XPATH)
+ if self._regh:
+ return
+
+ xpath = self._project.add_project(NsrOpDataDtsHandler.XPATH)
+ self._log.debug("Registering Nsr op data path {} as publisher".
+ format(xpath))
hdl = rift.tasklets.DTS.RegistrationHandler()
with self._dts.group_create() as group:
- self._regh = group.register(xpath=NsrOpDataDtsHandler.XPATH,
+ self._regh = group.register(xpath=xpath,
handler=hdl,
flags=rwdts.Flag.PUBLISHER | rwdts.Flag.NO_PREP_READ)
@asyncio.coroutine
- def create(self, xact, path, msg):
+ def create(self, xact, xpath, msg):
"""
Create an NS record in DTS with the path and message
"""
+ path = self._project.add_project(xpath)
self._log.debug("Creating NSR xact = %s, %s:%s", xact, path, msg)
self.regh.create_element(path, msg, xact=xact)
self._log.debug("Created NSR xact = %s, %s:%s", xact, path, msg)
@asyncio.coroutine
- def update(self, xact, path, msg, flags=rwdts.XactFlag.REPLACE):
+ def update(self, xact, xpath, msg, flags=rwdts.XactFlag.REPLACE):
"""
Update an NS record in DTS with the path and message
"""
+ path = self._project.add_project(xpath)
self._log.debug("Updating NSR xact = %s, %s:%s regh = %s", xact, path, msg, self.regh)
self.regh.update_element(path, msg, flags, xact=xact)
self._log.debug("Updated NSR xact = %s, %s:%s", xact, path, msg)
@asyncio.coroutine
- def delete(self, xact, path):
+ def delete(self, xact, xpath):
"""
Update an NS record in DTS with the path and message
"""
+ path = self._project.add_project(xpath)
self._log.debug("Deleting NSR xact:%s, path:%s", xact, path)
self.regh.delete_element(path, xact=xact)
self._log.debug("Deleted NSR xact:%s, path:%s", xact, path)
+ def deregister(self):
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
class VnfrPublisherDtsHandler(object):
- """ Registers 'D,/vnfr:vnfr-catalog/vnfr:vnfr' DTS"""
+ """ Registers 'D,/rw-project:project/vnfr:vnfr-catalog/vnfr:vnfr' DTS"""
XPATH = "D,/vnfr:vnfr-catalog/vnfr:vnfr"
- def __init__(self, dts, log, loop):
+ def __init__(self, dts, log, loop, project):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
self._regh = None
@@ -103,6 +116,8 @@
@asyncio.coroutine
def register(self):
""" Register for Vvnfr create/update/delete/read requests from dts """
+ if self._regh:
+ return
@asyncio.coroutine
def on_prepare(xact_info, action, ks_path, msg):
@@ -115,17 +130,24 @@
"%s action on VirtualNetworkFunctionRecord not supported",
action)
- self._log.debug("Registering for VNFR using xpath: %s",
- VnfrPublisherDtsHandler.XPATH,)
+ xpath = self._project.add_project(VnfrPublisherDtsHandler.XPATH)
+ self._log.debug("Registering for VNFR using xpath: {}".
+ format(xpath))
hdl = rift.tasklets.DTS.RegistrationHandler()
with self._dts.group_create() as group:
- self._regh = group.register(xpath=VnfrPublisherDtsHandler.XPATH,
+ self._regh = group.register(xpath=xpath,
handler=hdl,
flags=(rwdts.Flag.PUBLISHER |
+ rwdts.Flag.SHARED |
rwdts.Flag.NO_PREP_READ |
rwdts.Flag.CACHE),)
+ def deregister(self):
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
@asyncio.coroutine
def create(self, xact, path, msg):
"""
@@ -159,13 +181,14 @@
class VlrPublisherDtsHandler(object):
- """ registers 'D,/vlr:vlr-catalog/vlr:vlr """
+ """ registers 'D,/rw-project:project/vlr:vlr-catalog/vlr:vlr """
XPATH = "D,/vlr:vlr-catalog/vlr:vlr"
- def __init__(self, dts, log, loop):
+ def __init__(self, dts, log, loop, project):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
self._regh = None
@@ -178,6 +201,9 @@
def register(self):
""" Register for vlr create/update/delete/read requests from dts """
+ if self._regh:
+ return
+
@asyncio.coroutine
def on_prepare(xact_info, action, ks_path, msg):
""" prepare callback from dts """
@@ -189,17 +215,23 @@
"%s action on VirtualLinkRecord not supported",
action)
- self._log.debug("Registering for VLR using xpath: %s",
- VlrPublisherDtsHandler.XPATH,)
+ xpath = self._project.add_project(VlrPublisherDtsHandler.XPATH)
+ self._log.debug("Registering for VLR using xpath: {}".
+ format(xpath))
hdl = rift.tasklets.DTS.RegistrationHandler()
with self._dts.group_create() as group:
- self._regh = group.register(xpath=VlrPublisherDtsHandler.XPATH,
+ self._regh = group.register(xpath=xpath,
handler=hdl,
flags=(rwdts.Flag.PUBLISHER |
rwdts.Flag.NO_PREP_READ |
rwdts.Flag.CACHE),)
+ def deregister(self):
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
@asyncio.coroutine
def create(self, xact, path, msg):
"""
@@ -233,14 +265,15 @@
class VnfdPublisher(object):
- AUTH = ('admin', 'admin')
+ AUTH = ('@rift', 'rift')
HEADERS = {"content-type": "application/vnd.yang.data+json"}
- def __init__(self, use_ssl, ssl_cert, ssl_key, loop):
+ def __init__(self, use_ssl, ssl_cert, ssl_key, loop, project):
self.use_ssl = use_ssl
self.ssl_cert = ssl_cert
self.ssl_key = ssl_key
+ self._project = project
self.executor = concurrent.futures.ThreadPoolExecutor(max_workers=1)
self.loop = loop
@@ -254,15 +287,15 @@
scheme = "https" if self.use_ssl else "http"
- url = "{}://127.0.0.1:8008/api/config/vnfd-catalog/vnfd/{}"
+ url = "{}://127.0.0.1:8008/api/config/project/{}/vnfd-catalog/vnfd/{}"
- model = RwYang.Model.create_libncx()
- model.load_module("rw-vnfd")
- model.load_module("vnfd")
+ model = RwYang.Model.create_libyang()
+ model.load_module("rw-project-vnfd")
+ model.load_module("project-vnfd")
data = vnfd.to_json(model)
- key = "vnfd:vnfd-catalog"
+ key = "project-vnfd:vnfd-catalog"
newdict = json.loads(data)
if key in newdict:
data = json.dumps(newdict[key])
@@ -276,7 +309,7 @@
options["cert"] = (self.ssl_cert, self.ssl_key)
response = requests.put(
- url.format(scheme, vnfd.id),
+ url.format(scheme, self._project.name, vnfd.id),
**options
)
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsm_conman.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsm_conman.py
index 23ab7b6..1f5599d 100644
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsm_conman.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsm_conman.py
@@ -46,6 +46,7 @@
self._loop = loop
self._dts = dts
self.nsm = parent
+ self.project = parent._project
self._log.debug("Initialized ROConfigManager")
def is_ready(self):
@@ -53,7 +54,7 @@
@property
def cm_state_xpath(self):
- return ("/rw-conman:cm-state/rw-conman:cm-nsr")
+ return self.project.add_project("/rw-conman:cm-state/rw-conman:cm-nsr")
@classmethod
def map_config_status(cls, status):
@@ -73,6 +74,7 @@
'cfg_failed': nsrY.ConfigStates.FAILED,
'ready_no_cfg': nsrY.ConfigStates.CONFIG_NOT_NEEDED,
'ready': nsrY.ConfigStates.CONFIGURED,
+ 'terminate': nsrY.ConfigStates.TERMINATE,
}
return cfg_map[status]
@@ -83,33 +85,39 @@
return
try:
- nsrid = cm_nsr['id']
+ nsrid = cm_nsr.id
# Update the VNFRs' config status
- gen = []
- if 'cm_vnfr' in cm_nsr:
- gen = (vnfr for vnfr in cm_nsr['cm_vnfr']
- if vnfr['id'] in self.nsm._vnfrs)
+ gen = (vnfr for vnfr in cm_nsr.cm_vnfr
+ if vnfr.id in self.nsm._vnfrs)
for vnfr in gen:
- vnfrid = vnfr['id']
- new_status = ROConfigManager.map_config_status(vnfr['state'])
+ vnfrid = vnfr.id
+ new_status = ROConfigManager.map_config_status(vnfr.state)
self._log.debug("Updating config status of VNFR {} " \
"in NSR {} to {}({})".
format(vnfrid, nsrid, new_status,
- vnfr['state']))
+ vnfr.state))
yield from \
self.nsm.vnfrs[vnfrid].set_config_status(new_status)
- # Update the NSR's config status
- new_status = ROConfigManager.map_config_status(cm_nsr['state'])
- self._log.info("Updating config status of NSR {} to {}({})".
- format(nsrid, new_status, cm_nsr['state']))
+ yield from \
+ self.nsm.vnfrs[vnfrid].update_config_primitives(
+ vnfr.vnf_configuration,
+ self.nsm.nsrs[nsrid])
- # If terminate nsr request comes when NS instantiation is in 'Configuring state'; self.nsm.nsrs dict
- # is already empty when self.nsm.nsrs[nsrid].set_config_status gets executed. So adding a check here.
+ # Update the NSR's config status
+ new_status = ROConfigManager.map_config_status(cm_nsr.state)
+ self._log.debug("Updating config status of NSR {} to {}({})".
+ format(nsrid, new_status, cm_nsr.state))
+
+ # If terminate nsr request comes when NS instantiation is in
+ # 'Configuring state'; self.nsm.nsrs dict is already empty when
+ # self.nsm.nsrs[nsrid].set_config_status gets executed. So adding a check here.
if nsrid in self.nsm.nsrs:
- yield from self.nsm.nsrs[nsrid].set_config_status(new_status, cm_nsr.get('state_details'))
+ yield from self.nsm.nsrs[nsrid].set_config_status(
+ new_status,
+ cm_nsr.state_details)
except Exception as e:
self._log.error("Failed to process cm-state for nsr {}: {}".
@@ -119,12 +127,11 @@
@asyncio.coroutine
def register(self):
""" Register for cm-state changes """
-
+
@asyncio.coroutine
def on_prepare(xact_info, query_action, ks_path, msg):
""" cm-state changed """
- #print("###>>> cm-state change ({}), msg_dict = {}".format(query_action, msg_dict))
self._log.debug("Received cm-state on_prepare (%s:%s:%s)",
query_action,
ks_path,
@@ -133,10 +140,11 @@
if (query_action == rwdts.QueryAction.UPDATE or
query_action == rwdts.QueryAction.CREATE):
# Update Each NSR/VNFR state
- msg_dict = msg.as_dict()
- yield from self.update_ns_cfg_state(msg_dict)
+ # msg_dict = msg.as_dict()
+ yield from self.update_ns_cfg_state(msg)
elif query_action == rwdts.QueryAction.DELETE:
- self._log.debug("DELETE action in on_prepare for cm-state, ignoring")
+ self._log.debug("DELETE action in on_prepare for cm-state, "
+ "ignoring")
else:
raise NotImplementedError(
"%s on cm-state is not supported",
@@ -145,10 +153,18 @@
xact_info.respond_xpath(rwdts.XactRspCode.ACK)
try:
- handler = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare)
- self.dts_reg_hdl = yield from self._dts.register(self.cm_state_xpath,
- flags=rwdts.Flag.SUBSCRIBER,
- handler=handler)
+ handler = rift.tasklets.DTS.RegistrationHandler(
+ on_prepare=on_prepare)
+ self.dts_reg_hdl = yield from self._dts.register(
+ self.cm_state_xpath,
+ flags=rwdts.Flag.SUBSCRIBER,
+ handler=handler)
+
except Exception as e:
self._log.error("Failed to register for cm-state changes as %s", str(e))
-
+
+
+ def deregister(self):
+ if self.dts_reg_hdl:
+ self.dts_reg_hdl.deregister()
+ self.dts_reg_hdl = None
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py
old mode 100755
new mode 100644
index 352a482..d7ec01a
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmplugin.py
@@ -12,106 +12,106 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+from . import nsmpluginbase
+from . import openmano_nsm
import asyncio
-import abc
-
-class NsmPluginBase(object):
+class RwNsPlugin(nsmpluginbase.NsmPluginBase):
"""
- Abstract base class for the NSM plugin.
- There will be single instance of this plugin for each plugin type.
+ RW Implentation of the NsmPluginBase
"""
-
- def __init__(self, dts, log, loop, nsm, plugin_name, dts_publisher):
+ def __init__(self, dts, log, loop, publisher, ro_account, project):
self._dts = dts
self._log = log
self._loop = loop
- self._nsm = nsm
- self._plugin_name = plugin_name
- self._dts_publisher = dts_publisher
+ self._project = project
- @property
- def dts(self):
- return self._dts
-
- @property
- def log(self):
- return self._log
-
- @property
- def loop(self):
- return self._loop
-
- @property
- def nsm(self):
- return self._nsm
-
- @abc.abstractmethod
def set_state(self, nsr_id, state):
pass
- @abc.abstractmethod
- def create_nsr(self, nsr):
- """ Create an NSR """
+ def create_nsr(self, nsr_msg, nsd, key_pairs=None, ssh_key=None):
+ """
+ Create Network service record
+ """
pass
- @abc.abstractmethod
@asyncio.coroutine
- def deploy(self, nsr_msg):
+ def deploy(self, nsr):
pass
- @abc.abstractmethod
@asyncio.coroutine
- def instantiate_ns(self, nsr, xact):
- """ Instantiate the network service """
- pass
+ def instantiate_ns(self, nsr, config_xact):
+ """
+ Instantiate NSR with the passed nsr id
+ """
+ yield from nsr.instantiate(config_xact)
- @abc.abstractmethod
@asyncio.coroutine
def instantiate_vnf(self, nsr, vnfr, scaleout=False):
- """ Instantiate the virtual network function """
- pass
+ """
+ Instantiate NSR with the passed nsr id
+ """
+ yield from vnfr.instantiate(nsr)
- @abc.abstractmethod
@asyncio.coroutine
- def instantiate_vl(self, nsr, vl):
- """ Instantiate the virtual link"""
- pass
+ def instantiate_vl(self, nsr, vlr):
+ """
+ Instantiate NSR with the passed nsr id
+ """
+ yield from vlr.instantiate()
- @abc.abstractmethod
- @asyncio.coroutine
- def get_nsr(self, nsr_path):
- """ Get the NSR """
- pass
-
- @abc.abstractmethod
- @asyncio.coroutine
- def get_vnfr(self, vnfr_path):
- """ Get the VNFR """
- pass
-
- @abc.abstractmethod
- @asyncio.coroutine
- def get_vlr(self, vlr_path):
- """ Get the VLR """
- pass
-
- @abc.abstractmethod
@asyncio.coroutine
def terminate_ns(self, nsr):
- """Terminate the network service """
+ """
+ Terminate the network service
+ """
pass
- @abc.abstractmethod
@asyncio.coroutine
- def terminate_vnf(self, vnfr):
- """Terminate the VNF """
- pass
+ def terminate_vnf(self, nsr, vnfr, scalein=False):
+ """
+ Terminate the VNF
+ """
+ yield from vnfr.terminate()
- @abc.abstractmethod
@asyncio.coroutine
def terminate_vl(self, vlr):
- """Terminate the Virtual Link Record"""
- pass
+ """
+ Terminate the virtual link
+ """
+ yield from vlr.terminate()
+
+ @asyncio.coroutine
+ def update_vnfr(self, vnfr):
+ """ Update the virtual network function record """
+ yield from vnfr.update_vnfm()
+
+class NsmPlugins(object):
+ """ NSM Plugins """
+ def __init__(self):
+ self._plugin_classes = {
+ "openmano": openmano_nsm.OpenmanoNsPlugin,
+ }
+
+ @property
+ def plugins(self):
+ """ Plugin info """
+ return self._plugin_classes
+
+ def __getitem__(self, name):
+ """ Get item """
+ return self._plugin_classes[name]
+
+ def register(self, plugin_name, plugin_class, *args):
+ """ Register a plugin to this Nsm"""
+ self._plugin_classes[plugin_name] = plugin_class
+
+ def deregister(self, plugin_name, plugin_class, *args):
+ """ Deregister a plugin to this Nsm"""
+ if plugin_name in self._plugin_classes:
+ del self._plugin_classes[plugin_name]
+
+ def class_by_plugin_name(self, name):
+ """ Get class by plugin name """
+ return self._plugin_classes[name]
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
index e600b9a..29676d1 100755
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwnsmtasklet.py
@@ -16,37 +16,46 @@
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
import asyncio
+import gi
+import json
import ncclient
import ncclient.asyncio_manager
import os
+import requests
import shutil
import sys
import tempfile
import time
import uuid
import yaml
-import requests
-import json
-
-from collections import deque
from collections import defaultdict
+from collections import deque
from enum import Enum
+from urllib.parse import urlparse
-import gi
+# disable unsigned certificate warning
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
+
gi.require_version('RwYang', '1.0')
-gi.require_version('RwNsdYang', '1.0')
+gi.require_version('NsdBaseYang', '1.0')
+gi.require_version('ProjectNsdYang', '1.0')
gi.require_version('RwDts', '1.0')
gi.require_version('RwNsmYang', '1.0')
gi.require_version('RwNsrYang', '1.0')
+gi.require_version('NsrYang', '1.0')
gi.require_version('RwTypes', '1.0')
gi.require_version('RwVlrYang', '1.0')
gi.require_version('RwVnfrYang', '1.0')
+gi.require_version('VnfrYang', '1.0')
+gi.require_version('ProjectVnfdYang', '1.0')
from gi.repository import (
RwYang,
RwNsrYang,
NsrYang,
- NsdYang,
+ NsdBaseYang,
+ ProjectNsdYang as NsdYang,
RwVlrYang,
VnfrYang,
RwVnfrYang,
@@ -54,22 +63,36 @@
RwsdnalYang,
RwDts as rwdts,
RwTypes,
+ ProjectVnfdYang,
ProtobufC,
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
-import rift.tasklets
+from rift.mano.utils.ssh_keys import ManoSshKey
import rift.mano.ncclient
import rift.mano.config_data.config
import rift.mano.dts as mano_dts
+import rift.tasklets
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectHandler,
+ get_add_delete_update_cfgs,
+ DEFAULT_PROJECT,
+ )
from . import rwnsm_conman as conman
from . import cloud
from . import publisher
+from . import subscriber
from . import xpath
from . import config_value_pool
from . import rwvnffgmgr
from . import scale_group
-
+from . import rwnsmplugin
+from . import openmano_nsm
+import functools
+import collections
class NetworkServiceRecordState(Enum):
""" Network Service Record State """
@@ -154,6 +177,10 @@
class NsrVlUpdateError(NsrNsdUpdateError):
pass
+class VirtualLinkRecordError(Exception):
+ """ Virtual Links Record Error """
+ pass
+
class VlRecordState(Enum):
""" VL Record State """
@@ -179,7 +206,7 @@
""" Vnffg Records class"""
SFF_DP_PORT = 4790
SFF_MGMT_PORT = 5000
- def __init__(self, dts, log, loop, vnffgmgr, nsr, nsr_name, vnffgd_msg, sdn_account_name):
+ def __init__(self, dts, log, loop, vnffgmgr, nsr, nsr_name, vnffgd_msg, sdn_account_name,cloud_account_name):
self._dts = dts
self._log = log
@@ -188,6 +215,7 @@
self._nsr = nsr
self._nsr_name = nsr_name
self._vnffgd_msg = vnffgd_msg
+ self._cloud_account_name = cloud_account_name
if sdn_account_name is None:
self._sdn_account_name = ''
else:
@@ -219,7 +247,7 @@
"sdn_account": self._sdn_account_name,
"operational_status": 'init',
}
- vnffgr = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_Vnffgr.from_dict(vnffgr_dict)
+ vnffgr = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_Vnffgr.from_dict(vnffgr_dict)
elif self._vnffgr_state == VnffgRecordState.TERMINATED:
vnffgr_dict = {"id": self._vnffgr_id,
"vnffgd_id_ref": self._vnffgd_msg.id,
@@ -227,7 +255,7 @@
"sdn_account": self._sdn_account_name,
"operational_status": 'terminated',
}
- vnffgr = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_Vnffgr.from_dict(vnffgr_dict)
+ vnffgr = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_Vnffgr.from_dict(vnffgr_dict)
else:
try:
vnffgr = self._vnffgmgr.fetch_vnffgr(self._vnffgr_id)
@@ -240,7 +268,7 @@
"sdn_account": self._sdn_account_name,
"operational_status": 'failed',
}
- vnffgr = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_Vnffgr.from_dict(vnffgr_dict)
+ vnffgr = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_Vnffgr.from_dict(vnffgr_dict)
return vnffgr
@@ -251,8 +279,9 @@
"vnffgd_id_ref": self._vnffgd_msg.id,
"vnffgd_name_ref": self._vnffgd_msg.name,
"sdn_account": self._sdn_account_name,
+ "cloud_account": self._cloud_account_name,
}
- vnffgr = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_Vnffgr.from_dict(vnffgr_dict)
+ vnffgr = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_Vnffgr.from_dict(vnffgr_dict)
for rsp in self._vnffgd_msg.rsp:
vnffgr_rsp = vnffgr.rsp.add()
vnffgr_rsp.id = str(uuid.uuid4())
@@ -264,9 +293,11 @@
vnfd = [vnfr.vnfd for vnfr in self._nsr.vnfrs.values() if vnfr.vnfd.id == rsp_cp_ref.vnfd_id_ref]
self._log.debug("VNFD message during VNFFG instantiation is %s",vnfd)
if len(vnfd) > 0 and vnfd[0].has_field('service_function_type'):
- self._log.debug("Service Function Type for VNFD ID %s is %s",rsp_cp_ref.vnfd_id_ref, vnfd[0].service_function_type)
+ self._log.debug("Service Function Type for VNFD ID %s is %s",
+ rsp_cp_ref.vnfd_id_ref, vnfd[0].service_function_type)
else:
- self._log.error("Service Function Type not available for VNFD ID %s; Skipping in chain",rsp_cp_ref.vnfd_id_ref)
+ self._log.error("Service Function Type not available for VNFD ID %s; Skipping in chain",
+ rsp_cp_ref.vnfd_id_ref)
continue
vnfr_cp_ref = vnffgr_rsp.vnfr_connection_point_ref.add()
@@ -287,7 +318,8 @@
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))
+ 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)
@@ -298,8 +330,8 @@
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:
+ for intf in vdu.interface:
+ if intf.type_yang == "EXTERNAL" and intf.external_connection_point_ref == 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)
@@ -314,7 +346,8 @@
rsp_id_ref = _rsp[0].id
rsp_name = _rsp[0].name
else:
- self._log.error("RSP with ID %s not found during classifier creation for classifier id %s",vnffgd_classifier.rsp_id_ref,vnffgd_classifier.id)
+ self._log.error("RSP with ID %s not found during classifier creation for classifier id %s",
+ vnffgd_classifier.rsp_id_ref,vnffgd_classifier.id)
continue
vnffgr_classifier = vnffgr.classifier.add()
vnffgr_classifier.id = vnffgd_classifier.id
@@ -338,7 +371,8 @@
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))
+ 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)
@@ -348,11 +382,12 @@
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:
+ for intf in vdu.interface:
+ if intf.type_yang == "EXTERNAL" and intf.external_connection_point_ref == 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)
+ 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)
@@ -377,7 +412,7 @@
vnfr = yield from self._nsr.fetch_vnfr(nsr_vnfr.xpath)
self._log.debug("Received VNFR is %s", vnfr)
- sff = RwsdnalYang.VNFFGSff()
+ sff = RwsdnalYang.YangData_RwProject_Project_Vnffgs_VnffgChain_Sff()
sff_list[nsr_vnfr.vnfd.id] = sff
sff.name = nsr_vnfr.name
sff.function_type = nsr_vnfr.vnfd.service_function_chain
@@ -453,7 +488,8 @@
XPATH = "D,/vlr:vlr-catalog/vlr:vlr"
@staticmethod
@asyncio.coroutine
- def create_record(dts, log, loop, nsr_name, vld_msg, cloud_account_name, om_datacenter, ip_profile, nsr_id, restart_mode=False):
+ def create_record(dts, log, loop, project, nsr_name, vld_msg,
+ 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
@@ -466,17 +502,17 @@
dts,
log,
loop,
+ project,
nsr_name,
vld_msg,
- cloud_account_name,
- om_datacenter,
+ datacenter,
ip_profile,
nsr_id,
)
if restart_mode:
res_iter = yield from dts.query_read(
- "D,/vlr:vlr-catalog/vlr:vlr",
+ project.add_project("D,/vlr:vlr-catalog/vlr:vlr"),
rwdts.XactFlag.MERGE)
for fut in res_iter:
@@ -492,14 +528,15 @@
return vlr_obj
- def __init__(self, dts, log, loop, nsr_name, vld_msg, cloud_account_name, om_datacenter, ip_profile, nsr_id):
+ def __init__(self, dts, log, loop, project, nsr_name, vld_msg,
+ datacenter, ip_profile, nsr_id):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
self._nsr_name = nsr_name
self._vld_msg = vld_msg
- self._cloud_account_name = cloud_account_name
- self._om_datacenter_name = om_datacenter
+ self._datacenter_name = datacenter
self._assigned_subnet = None
self._nsr_id = nsr_id
self._ip_profile = ip_profile
@@ -507,11 +544,13 @@
self._state = VlRecordState.INIT
self._prev_state = None
self._create_time = int(time.time())
+ self.state_failed_reason = None
@property
def xpath(self):
""" path for this object """
- return "D,/vlr:vlr-catalog/vlr:vlr[vlr:id = '{}']".format(self._vlr_id)
+ return self._project.add_project("D,/vlr:vlr-catalog/vlr:vlr[vlr:id={}]".
+ format(quoted_key(self._vlr_id)))
@property
def id(self):
@@ -545,22 +584,17 @@
# This is a temporary hack to identify manually provisioned inter-site network
return self.vld_msg.name
else:
- return self._nsr_name + "." + self.vld_msg.name
+ return self._project.name + "." +self._nsr_name + "." + self.vld_msg.name
@property
- def cloud_account_name(self):
- """ Cloud account that this VLR should be created in """
- return self._cloud_account_name
-
- @property
- def om_datacenter_name(self):
+ def datacenter_name(self):
""" Datacenter that this VLR should be created in """
- return self._om_datacenter_name
+ return self._datacenter_name
@staticmethod
def vlr_xpath(vlr):
""" Get the VLR path from VLR """
- return (VirtualLinkRecord.XPATH + "[vlr:id = '{}']").format(vlr.id)
+ return (VirtualLinkRecord.XPATH + "[vlr:id={}]").format(quoted_key(vlr.id))
@property
def state(self):
@@ -601,15 +635,20 @@
"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,
+ "datacenter": self._datacenter_name,
}
if self._ip_profile and self._ip_profile.has_field('ip_profile_params'):
vlr_dict['ip_profile_params' ] = self._ip_profile.ip_profile_params.as_dict()
+
vlr_dict.update(vld_copy_dict)
- vlr = RwVlrYang.YangData_Vlr_VlrCatalog_Vlr.from_dict(vlr_dict)
+ vlr = RwVlrYang.YangData_RwProject_Project_VlrCatalog_Vlr.from_dict(vlr_dict)
+
+ if self.vld_msg.has_field('virtual_connection_points'):
+ for cp in self.vld_msg.virtual_connection_points:
+ vcp = vlr.virtual_connection_points.add()
+ vcp.from_dict(cp.as_dict())
return vlr
def reset_id(self, vlr_id):
@@ -617,18 +656,16 @@
def create_nsr_vlr_msg(self, vnfrs):
""" The VLR message"""
- nsr_vlr = RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_Vlr()
+ nsr_vlr = RwNsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_Vlr()
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
+ nsr_vlr.datacenter = self._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 and
- self.om_datacenter_name == vnfr.om_datacenter_name):
+ self._datacenter_name == vnfr._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
@@ -666,7 +703,6 @@
self._log.info("Instantiated VL with xpath %s and vlr:%s",
self.xpath, vlr)
- self._state = VlRecordState.ACTIVE
self._assigned_subnet = vlr.assigned_subnet
def vlr_in_vns(self):
@@ -698,6 +734,18 @@
self._state = VlRecordState.TERMINATED
self._log.debug("Terminated VL id:%s", self.id)
+ def set_state_from_op_status(self, operational_status):
+ """ Set the state of this VL based on operational_status"""
+
+ self._log.debug("set_state_from_op_status called for vlr id %s with value %s", self.id, operational_status)
+ if operational_status == 'running':
+ self._state = VlRecordState.ACTIVE
+ elif operational_status == 'failed':
+ self._state = VlRecordState.FAILED
+ elif operational_status == 'vl_alloc_pending':
+ self._state = VlRecordState.INSTANTIATION_PENDING
+ else:
+ raise VirtualLinkRecordError("Unknown operational_status %s" % (operational_status))
class VnfRecordState(Enum):
""" Vnf Record State """
@@ -715,9 +763,9 @@
@staticmethod
@asyncio.coroutine
- def create_record(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=False):
+ def create_record(dts, log, loop, project, vnfd, nsr_config, const_vnfd_msg, nsd_id, nsr_name,
+ datacenter_name, nsr_id, group_name, group_instance_id,
+ placement_groups, cloud_config, 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
@@ -726,25 +774,28 @@
Returns:
VirtualNetworkFunctionRecord
"""
+
vnfr_obj = VirtualNetworkFunctionRecord(
dts,
log,
loop,
+ project,
vnfd,
+ nsr_config,
const_vnfd_msg,
nsd_id,
nsr_name,
- cloud_account_name,
- om_datacenter_name,
+ datacenter_name,
nsr_id,
group_name,
group_instance_id,
placement_groups,
+ cloud_config,
restart_mode=restart_mode)
if restart_mode:
res_iter = yield from dts.query_read(
- "D,/vnfr:vnfr-catalog/vnfr:vnfr",
+ project.add_project("D,/vnfr:vnfr-catalog/vnfr:vnfr"),
rwdts.XactFlag.MERGE)
for fut in res_iter:
@@ -761,30 +812,36 @@
dts,
log,
loop,
+ project,
vnfd,
+ nsr_config,
const_vnfd_msg,
nsd_id,
nsr_name,
- cloud_account_name,
- om_datacenter_name,
+ datacenter_name,
nsr_id,
group_name=None,
group_instance_id=None,
placement_groups = [],
+ cloud_config = None,
restart_mode = False):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
self._vnfd = vnfd
+ self._nsr_config = nsr_config
self._const_vnfd_msg = const_vnfd_msg
self._nsd_id = nsd_id
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._datacenter_name = datacenter_name
self._group_name = group_name
self._group_instance_id = group_instance_id
self._placement_groups = placement_groups
+ self._cloud_config = cloud_config
+ self.restart_mode = restart_mode
+
self._config_status = NsrYang.ConfigStates.INIT
self._create_time = int(time.time())
@@ -792,15 +849,20 @@
self._state = VnfRecordState.INIT
self._state_failed_reason = None
+ self._active_vdus = 0
+
self.config_store = rift.mano.config_data.config.ConfigStore(self._log)
self.configure()
self._vnfr_id = str(uuid.uuid4())
self._name = None
+
+ self.substitute_vnf_input_parameters = VnfInputParameterSubstitution(self._log,
+ self._const_vnfd_msg,
+ self._project)
self._vnfr_msg = self.create_vnfr_msg()
self._log.debug("Set VNFR {} config type to {}".
format(self.name, self.config_type))
- self.restart_mode = restart_mode
if group_name is None and group_instance_id is not None:
@@ -814,7 +876,8 @@
@property
def xpath(self):
""" VNFR xpath """
- return "D,/vnfr:vnfr-catalog/vnfr:vnfr[vnfr:id = '{}']".format(self.id)
+ return self._project.add_project("D,/vnfr:vnfr-catalog/vnfr:vnfr[vnfr:id={}]"
+ .format(quoted_key(self.id)))
@property
def vnfr_msg(self):
@@ -824,7 +887,8 @@
@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,om_datacenter=self._om_datacenter_name)
+ return RwNsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_ConstituentVnfrRef(
+ vnfr_id=self.id, datacenter=self._datacenter_name)
@property
def vnfd(self):
@@ -832,14 +896,9 @@
return self._vnfd
@property
- def cloud_account_name(self):
- """ Cloud account that this VNF should be created in """
- return self._cloud_account_name
-
- @property
- def om_datacenter_name(self):
+ def datacenter_name(self):
""" Datacenter that this VNF should be created in """
- return self._om_datacenter_name
+ return self._datacenter_name
@property
@@ -873,7 +932,7 @@
if self._name is not None:
return self._name
- name_tags = [self._nsr_name]
+ name_tags = [self._project.name, self._nsr_name]
if self._group_name is not None:
name_tags.append(self._group_name)
@@ -890,7 +949,8 @@
@staticmethod
def vnfr_xpath(vnfr):
""" Get the VNFR path from VNFR """
- return (VirtualNetworkFunctionRecord.XPATH + "[vnfr:id = '{}']").format(vnfr.id)
+ return (VirtualNetworkFunctionRecord.XPATH +
+ "[vnfr:id={}]").format(quoted_key(vnfr.id))
@property
def config_type(self):
@@ -925,6 +985,7 @@
def configure(self):
self.config_store.merge_vnfd_config(
+ self._project.name,
self._nsd_id,
self._vnfd,
self.member_vnf_index,
@@ -944,15 +1005,14 @@
"id": self.id,
"nsr_id_ref": self._nsr_id,
"name": self.name,
- "cloud_account": self._cloud_account_name,
- "om_datacenter": self._om_datacenter_name,
+ "datacenter": self._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 = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr.from_dict(vnfr_dict)
+ vnfr.vnfd = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vnfd. \
+ from_dict(self.vnfd.as_dict())
vnfr.member_vnf_index_ref = self.member_vnf_index
vnfr.vnf_configuration.from_dict(self._vnfd.vnf_configuration.as_dict())
@@ -963,10 +1023,21 @@
group = vnfr.placement_groups_info.add()
group.from_dict(group_info.as_dict())
+ if self._cloud_config and len(self._cloud_config.as_dict()):
+ self._log.debug("Cloud config during vnfr create is {}".format(self._cloud_config))
+ vnfr.cloud_config = self._cloud_config
+
# UI expects the monitoring param field to exist
vnfr.monitoring_param = []
self._log.debug("Get vnfr_msg for VNFR {} : {}".format(self.name, vnfr))
+
+ if self.restart_mode:
+ vnfr.operational_status = 'init'
+ else:
+ # Set Operational Status as pre-init for Input Param Substitution
+ vnfr.operational_status = 'pre_init'
+
return vnfr
@asyncio.coroutine
@@ -975,7 +1046,7 @@
format(self.name, self.vnfr_msg))
yield from self._dts.query_update(
self.xpath,
- rwdts.XactFlag.TRACE,
+ rwdts.XactFlag.REPLACE,
self.vnfr_msg
)
@@ -1001,8 +1072,8 @@
format(self.name, self._config_status,
self.config_type, status))
if self._config_status == NsrYang.ConfigStates.CONFIGURED:
- self._log.error("Updating already configured VNFR {}".
- format(self.name))
+ self._log.warning("Updating already configured VNFR {}".
+ format(self.name))
return
if self._config_status != status:
@@ -1013,8 +1084,7 @@
# But not sure whats the use of this variable?
self.vnfr_msg.config_status = status_to_string(status)
except Exception as e:
- self._log.error("Exception=%s", str(e))
- pass
+ self._log.exception("Exception=%s", str(e))
self._log.debug("Updated VNFR {} status to {}".format(self.name, status))
@@ -1037,6 +1107,49 @@
return False
@asyncio.coroutine
+ def update_config_primitives(self, vnf_config, nsr):
+ # Update only after we are configured
+ if self._config_status == NsrYang.ConfigStates.INIT:
+ return
+
+ if not vnf_config.as_dict():
+ return
+
+ self._log.debug("Update VNFR {} config: {}".
+ format(self.name, vnf_config.as_dict()))
+
+ # Update config primitive
+ updated = False
+ for prim in self._vnfd.vnf_configuration.config_primitive:
+ for p in vnf_config.config_primitive:
+ if prim.name == p.name:
+ for param in prim.parameter:
+ for pa in p.parameter:
+ if pa.name == param.name:
+ if pa.default_value and \
+ (pa.default_value != param.default_value):
+ param.default_value = pa.default_value
+ param.read_only = pa.read_only
+ updated = True
+ break
+ self._log.debug("Prim: {}".format(prim.as_dict()))
+ break
+
+ if updated:
+ self._log.debug("Updated VNFD {} config: {}".
+ format(self._vnfd.name,
+ self._vnfd.vnf_configuration))
+ self._vnfr_msg = self.create_vnfr_msg()
+
+ try:
+ yield from nsr.nsm_plugin.update_vnfr(self)
+ except Exception as e:
+ self._log.error("Exception updating VNFM with new config "
+ "primitive for VNFR {}: {}".
+ format(self.name, e))
+ self._log.exception(e)
+
+ @asyncio.coroutine
def instantiate(self, nsr):
""" Instantiate this VNFR"""
@@ -1050,20 +1163,22 @@
def find_vlr_for_cp(conn):
""" Find VLR for the given connection point """
- for vlr in nsr.vlrs:
+ for vlr_id, vlr in nsr.vlrs.items():
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):
+ vlr._datacenter_name == self._datacenter_name):
self._log.debug("Found VLR for cp_name:%s and vnf-index:%d",
conn.name, self.member_vnf_index)
return vlr
return None
# For every connection point in the VNFD fill in the identifier
+ self._log.debug("Add connection point for VNF %s: %s",
+ self.vnfr_msg.name, self._vnfd.connection_point)
for conn_p in self._vnfd.connection_point:
- cpr = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_ConnectionPoint()
+ cpr = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_ConnectionPoint()
cpr.name = conn_p.name
cpr.type_yang = conn_p.type_yang
if conn_p.has_field('port_security_enabled'):
@@ -1077,24 +1192,30 @@
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.id)
+ self._log.debug("VNFR {} restart mode {}".
+ format(self.vnfr_msg.id, self.restart_mode))
if not self.restart_mode:
- yield from self._dts.query_create(self.xpath,
- 0, # this is sub
- self.vnfr_msg)
+ # Checking for NS Terminate.
+ if nsr._ns_terminate_received == False:
+ # Create with pre-init operational state publishes the vnfr for substitution.
+ yield from self._dts.query_create(self.xpath, 0, self.vnfr_msg)
+ # Call to substitute VNF Input Parameter
+ self.substitute_vnf_input_parameters(self.vnfr_msg, self._nsr_config)
+ # Calling Update with pre-init operational data after Param substitution to instatntiate vnfr
+ yield from self._dts.query_update(self.xpath, 0, self.vnfr_msg)
+
else:
yield from self._dts.query_update(self.xpath,
0,
self.vnfr_msg)
self._log.info("Created VNF with xpath %s and vnfr %s",
- self.xpath, self.vnfr_msg)
-
- self._log.info("Instantiated VNFR with xpath %s and vnfd %s, vnfr %s",
- self.xpath, self._vnfd, self.vnfr_msg)
+ self.xpath, self.vnfr_msg)
@asyncio.coroutine
def update_state(self, vnfr_msg):
@@ -1114,7 +1235,7 @@
@asyncio.coroutine
def instantiation_failed(self, failed_reason=None):
""" This VNFR instantiation failed"""
- self._log.error("VNFR %s instantiation failed", self._vnfr_id)
+ self._log.debug("VNFR %s instantiation failed", self._vnfr_id)
self.set_state(VnfRecordState.FAILED)
self._state_failed_reason = failed_reason
@@ -1216,7 +1337,7 @@
event_list = []
idx = 1
for entry in self._events:
- event = RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_OperationalEvents()
+ event = RwNsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_OperationalEvents()
event.id = idx
idx += 1
event.timestamp, event.event, event.description, event.details = entry
@@ -1228,7 +1349,8 @@
""" 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, key_pairs, restart_mode=False,
+ def __init__(self, dts, log, loop, nsm, nsm_plugin, nsr_cfg_msg,
+ sdn_account_name, key_pairs, project, restart_mode=False,
vlr_handler=None):
self._dts = dts
self._log = log
@@ -1238,12 +1360,15 @@
self._nsm_plugin = nsm_plugin
self._sdn_account_name = sdn_account_name
self._vlr_handler = vlr_handler
+ self._project = project
self._nsd = None
self._nsr_msg = None
self._nsr_regh = None
self._key_pairs = key_pairs
- self._vlrs = []
+ self._ssh_key_file = None
+ self._ssh_pub_key = None
+ self._vlrs = {}
self._vnfrs = {}
self._vnfds = {}
self._vnffgrs = {}
@@ -1260,6 +1385,16 @@
self._is_active = False
self._vl_phase_completed = False
self._vnf_phase_completed = False
+ self.instantiated = set()
+
+ # Used for orchestration_progress
+ self._active_vms = 0
+ self._active_networks = 0
+
+ # A flag to indicate if the NS has failed, currently it is recorded in
+ # operational status, but at the time of termination this field is
+ # over-written making it difficult to identify the failure.
+ self._is_failed = False
# Initalise the state to init
# The NSR moves through the following transitions
@@ -1269,7 +1404,14 @@
self.set_state(NetworkServiceRecordState.INIT)
- self.substitute_input_parameters = InputParameterSubstitution(self._log)
+ self.substitute_input_parameters = InputParameterSubstitution(self._log, self._project)
+
+ # Create an asyncio loop to know when the virtual links are ready
+ self._vls_ready = asyncio.Event(loop=self._loop)
+
+ # This variable stores all the terminate events received per NS. This is then used to prevent any
+ # further nsr non-terminate updates received in case of terminate being called bedore ns in in running state.
+ self._ns_terminate_received = False
@property
def nsm_plugin(self):
@@ -1278,7 +1420,6 @@
def set_state(self, state):
""" Set state for this NSR"""
- self._log.debug("Setting state to %s", state)
# We are in init phase and is moving to the next state
# The new state could be a FAILED state or VNF_INIIT_PHASE
if self.state == NetworkServiceRecordState.VL_INIT_PHASE:
@@ -1288,6 +1429,7 @@
self._vnf_phase_completed = True
self._op_status.set_state(state)
+
self._nsm_plugin.set_state(self.id, state)
@property
@@ -1301,13 +1443,9 @@
return self._nsr_cfg_msg.name
@property
- 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
+ def _datacenter_name(self):
+ if self._nsr_cfg_msg.has_field('datacenter'):
+ return self._nsr_cfg_msg.datacenter
return None
@property
@@ -1377,6 +1515,23 @@
""" Config status for NSR """
return self._config_status
+ @property
+ def nsm(self):
+ """NS Manager"""
+ return self._nsm
+
+ @property
+ def is_failed(self):
+ return self._is_failed
+
+ @property
+ def public_key(self):
+ return self._ssh_pub_key
+
+ @property
+ def private_key(self):
+ return self._ssh_key_file
+
def resolve_placement_group_cloud_construct(self, input_group):
"""
Returns the cloud specific construct for placement group
@@ -1385,7 +1540,7 @@
for group_info in self._nsr_cfg_msg.nsd_placement_group_maps:
if group_info.placement_group_ref == input_group.name:
- group = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_PlacementGroupsInfo()
+ group = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_PlacementGroupsInfo()
group_dict = {k:v for k,v in
group_info.as_dict().items() if k != 'placement_group_ref'}
for param in copy_dict:
@@ -1396,22 +1551,22 @@
def __str__(self):
- return "NSR(name={}, nsd_id={}, cloud_account={})".format(
- self.name, self.nsd_id, self.cloud_account_name
+ return "NSR(name={}, nsd_id={}, data center={})".format(
+ self.name, self.nsd_id, self._datacenter_name
)
def _get_vnfd(self, vnfd_id, config_xact):
""" Fetch vnfd msg for the passed vnfd id """
return self._nsm.get_vnfd(vnfd_id, config_xact)
- 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,vnf.om_datacenter) for vnf in self._nsr_cfg_msg.vnf_cloud_account_map \
- if vnfd_member_index == vnf.member_vnf_index_ref]
+ def _get_vnfd_datacenter(self, vnfd_member_index):
+ """ Fetch datacenter for the passed vnfd id """
+ if self._nsr_cfg_msg.vnf_datacenter_map:
+ vim_accounts = [vnf.datacenter for vnf in self._nsr_cfg_msg.vnf_datacenter_map \
+ if str(vnfd_member_index) == str(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)
+ return self._datacenter_name
def _get_constituent_vnfd_msg(self, vnf_index):
for const_vnfd in self.nsd_msg.constituent_vnfd:
@@ -1428,10 +1583,10 @@
def scaling_trigger_str(self, trigger):
SCALING_TRIGGER_STRS = {
- NsdYang.ScalingTrigger.PRE_SCALE_IN : 'pre-scale-in',
- NsdYang.ScalingTrigger.POST_SCALE_IN : 'post-scale-in',
- NsdYang.ScalingTrigger.PRE_SCALE_OUT : 'pre-scale-out',
- NsdYang.ScalingTrigger.POST_SCALE_OUT : 'post-scale-out',
+ NsdBaseYang.ScalingTrigger.PRE_SCALE_IN : 'pre-scale-in',
+ NsdBaseYang.ScalingTrigger.POST_SCALE_IN : 'post-scale-in',
+ NsdBaseYang.ScalingTrigger.PRE_SCALE_OUT : 'pre-scale-out',
+ NsdBaseYang.ScalingTrigger.POST_SCALE_OUT : 'post-scale-out',
}
try:
return SCALING_TRIGGER_STRS[trigger]
@@ -1441,6 +1596,32 @@
self._log.exception(e)
return "Unknown trigger"
+ def generate_ssh_key_pair(self, config_xact):
+ '''Generate a ssh key pair if required'''
+ if self._ssh_key_file:
+ self._log.debug("Key pair already generated")
+ return
+
+ gen_key = False
+ for cv in self.nsd_msg.constituent_vnfd:
+ vnfd = self._get_vnfd(cv.vnfd_id_ref, config_xact)
+ if vnfd and vnfd.mgmt_interface.ssh_key:
+ gen_key = True
+ break
+
+ if not gen_key:
+ return
+
+ try:
+ key = ManoSshKey(self._log)
+ path = tempfile.mkdtemp()
+ key.write_to_disk(name=self.id, directory=path)
+ self._ssh_key_file = "file://{}".format(key.private_key_file)
+ self._ssh_pub_key = key.public_key
+ except Exception as e:
+ self._log.exception("Error generating ssh key for {}: {}".
+ format(self.nsr_cfg_msg.name, e))
+
@asyncio.coroutine
def instantiate_vls(self):
"""
@@ -1448,14 +1629,30 @@
"""
self._log.debug("Instantiating %d VLs in NSD id %s", len(self._vlrs),
self.id)
- for vlr in self._vlrs:
+ for vlr_id, vlr in self._vlrs.items():
yield from self.nsm_plugin.instantiate_vl(self, vlr)
- vlr.state = VlRecordState.ACTIVE
+ if not isinstance(self.nsm_plugin, rwnsmplugin.RwNsPlugin):
+ self._vls_ready.set()
+ # Wait for the VLs to be ready before yielding control out
+ self._log.debug("Waitng for %d VLs in NSR id %s to be active",
+ len(self._vlrs), self.id)
+ if self._vlrs:
+ self._log.debug("NSR id:%s, name:%s - Waiting for %d VLs to be ready",
+ self.id, self.name, len(self._vlrs))
+ yield from self._vls_ready.wait()
+ else:
+ self._log.debug("NSR id:%s, name:%s, No virtual links found",
+ self.id, self.name)
+ self._vls_ready.set()
+
+ self._log.info("All %d VLs in NSR id %s are active, start the VNFs",
+ len(self._vlrs), self.id)
@asyncio.coroutine
def create(self, config_xact):
""" Create this network service"""
+ self._log.debug("Create NS {} for {}".format(self.name, self._project.name))
# Create virtual links for all the external vnf
# connection points in this NS
yield from self.create_vls()
@@ -1475,22 +1672,32 @@
@asyncio.coroutine
def apply_scale_group_config_script(self, script, group, scale_instance, trigger, vnfrs=None):
""" Apply config based on script for scale group """
+ rift_var_root_dir = os.environ['RIFT_VAR_ROOT']
@asyncio.coroutine
def add_vnfrs_data(vnfrs_list):
""" Add as a dict each of the VNFRs data """
vnfrs_data = []
+
for vnfr in vnfrs_list:
self._log.debug("Add VNFR {} data".format(vnfr))
vnfr_data = dict()
vnfr_data['name'] = vnfr.name
- if trigger in [NsdYang.ScalingTrigger.PRE_SCALE_IN, NsdYang.ScalingTrigger.POST_SCALE_OUT]:
+ if trigger in [NsdBaseYang.ScalingTrigger.PRE_SCALE_IN,
+ NsdBaseYang.ScalingTrigger.POST_SCALE_OUT]:
# Get VNF management and other IPs, etc
opdata = yield from self.fetch_vnfr(vnfr.xpath)
self._log.debug("VNFR {} op data: {}".format(vnfr.name, opdata))
try:
vnfr_data['rw_mgmt_ip'] = opdata.mgmt_interface.ip_address
vnfr_data['rw_mgmt_port'] = opdata.mgmt_interface.port
+ vnfr_data['member_vnf_index_ref'] = opdata.member_vnf_index_ref
+ vnfr_data['vdur_data'] = []
+ for vdur in opdata.vdur:
+ vdur_data = dict()
+ vdur_data['vm_name'] = vdur.name
+ vdur_data['vm_mgmt_ip'] = vdur.vm_management_ip
+ vnfr_data['vdur_data'].append(vdur_data)
except Exception as e:
self._log.error("Unable to get management IP for vnfr {}:{}".
format(vnfr.name, e))
@@ -1523,9 +1730,14 @@
if script[0] == '/':
path = script
else:
- path = os.path.join(os.environ['RIFT_INSTALL'], "usr/bin", script)
+ path = os.path.join(rift_var_root_dir,
+ 'launchpad/packages/nsd',
+ self._project.name,
+ self.nsd_id, 'scripts',
+ script)
+
if not os.path.exists(path):
- self._log.error("Config faled for scale group {}: Script does not exist at {}".
+ self._log.error("Config failed for scale group {}: Script does not exist at {}".
format(group.name, path))
return False
@@ -1577,7 +1789,11 @@
@asyncio.coroutine
def update_config_status(success=True, err_msg=None):
- self._log.debug("Update %s config status to %r : %s",
+ """ This is ugly!!!
+ We are trying to determine the scaling instance's config status
+ as a collation of the config status associated with 4 different triggers
+ """
+ self._log.debug("Update %s scaling config status to %r : %s",
scale_instance, success, err_msg)
if (scale_instance.config_status == "failed"):
# Do not update the config status if it is already in failed state
@@ -1592,21 +1808,32 @@
else:
# We are in configuring state
# Only after post scale out mark instance as configured
- if trigger == NsdYang.ScalingTrigger.POST_SCALE_OUT:
+ if trigger == NsdBaseYang.ScalingTrigger.POST_SCALE_OUT:
if success:
scale_instance.config_status = "configured"
+ for vnfr in scale_instance.vnfrs:
+ if vnfr.config_status == "configuring":
+ vnfr.vnfr_msg.config_status = "configured"
+ yield from vnfr.update_vnfm()
else:
scale_instance.config_status = "failed"
scale_instance.config_err_msg = err_msg
+
yield from self.update_state()
+ # Publish config state as update_state seems to care only operational status
+ yield from self.publish()
config = group.trigger_config(trigger)
if config is None:
+ if trigger == NsdBaseYang.ScalingTrigger.POST_SCALE_OUT:
+ self._log.debug("No config needed, update %s scaling config status to configured",
+ scale_instance)
+ scale_instance.config_status = "configured"
return True
self._log.debug("Scaling group {} config: {}".format(group.name, config))
- if config.has_field("ns_config_primitive_name_ref"):
- config_name = config.ns_config_primitive_name_ref
+ if config.has_field("ns_service_primitive_name_ref"):
+ config_name = config.ns_service_primitive_name_ref
nsd_msg = self.nsd_msg
config_primitive = None
for ns_cfg_prim in nsd_msg.service_primitive:
@@ -1619,7 +1846,8 @@
self._log.debug("Scaling group {} config primitive: {}".format(group.name, config_primitive))
if config_primitive.has_field("user_defined_script"):
- rc = yield from self.apply_scale_group_config_script(config_primitive.user_defined_script,
+ script_path = '/'.join(["launchpad/packages/nsd", self._project.name, nsd_msg.id, "scripts", config_primitive.user_defined_script])
+ rc = yield from self.apply_scale_group_config_script(script_path,
group, scale_instance, trigger, vnfrs)
err_msg = None
if not rc:
@@ -1672,11 +1900,11 @@
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, 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
+ datacenter_name = self._get_vnfd_datacenter(const_vnfd_msg.member_vnf_index)
+ if datacenter_name is None:
+ datacenter_name = self._datacenter_name
for _ in range(count):
- vnfr = yield from self.create_vnf_record(vnfd_msg, const_vnfd_msg, cloud_account_name, om_datacenter_name, group_name, index)
+ vnfr = yield from self.create_vnf_record(vnfd_msg, const_vnfd_msg, datacenter_name, group_name, index)
scale_instance.add_vnfr(vnfr)
vnfrs.append(vnfr)
return vnfrs
@@ -1692,7 +1920,7 @@
yield from self.update_state()
try:
- rc = yield from self.apply_scaling_group_config(NsdYang.ScalingTrigger.PRE_SCALE_OUT,
+ rc = yield from self.apply_scaling_group_config(NsdBaseYang.ScalingTrigger.PRE_SCALE_OUT,
group, scale_instance, vnfrs)
if not rc:
self._log.error("Pre scale out config for scale group {} ({}) failed".
@@ -1724,8 +1952,8 @@
@asyncio.coroutine
def terminate_instance():
- self._log.debug("Terminating %s VNFRS" % scale_instance)
- rc = yield from self.apply_scaling_group_config(NsdYang.ScalingTrigger.PRE_SCALE_IN,
+ self._log.debug("Terminating scaling instance %s VNFRS" % scale_instance)
+ rc = yield from self.apply_scaling_group_config(NsdBaseYang.ScalingTrigger.PRE_SCALE_IN,
group, scale_instance)
if not rc:
self._log.error("Pre scale in config for scale group {} ({}) failed".
@@ -1746,7 +1974,7 @@
@asyncio.coroutine
def post_scale_out_task(group, instance):
# Apply post scale out config once all VNFRs are active
- rc = yield from self.apply_scaling_group_config(NsdYang.ScalingTrigger.POST_SCALE_OUT,
+ rc = yield from self.apply_scaling_group_config(NsdBaseYang.ScalingTrigger.POST_SCALE_OUT,
group, instance)
instance.operational_status = "running"
if rc:
@@ -1780,7 +2008,7 @@
elif instance.operational_status == "vnf_terminate_phase":
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,
+ rc = yield from self.apply_scaling_group_config(NsdBaseYang.ScalingTrigger.POST_SCALE_IN,
group, instance)
if rc:
self._log.debug("Scale in for group {} and instance {} succeeded".
@@ -1802,7 +2030,8 @@
self,
self.name,
vnffgd,
- self._sdn_account_name
+ self._sdn_account_name,
+ self._datacenter_name
)
self._vnffgrs[vnffgr.id] = vnffgr
@@ -1814,12 +2043,12 @@
return profile[0] if profile else None
@asyncio.coroutine
- def _create_vls(self, vld, cloud_account,om_datacenter):
+ def _create_vls(self, vld, datacenter):
"""Create a VLR in the cloud account specified using the given VLD
Args:
vld : VLD yang obj
- cloud_account : Cloud account name
+ datacenter : Cloud account name
Returns:
VirtualLinkRecord
@@ -1828,60 +2057,58 @@
self._dts,
self._log,
self._loop,
+ self._project,
self.name,
vld,
- cloud_account,
- om_datacenter,
+ datacenter,
self.resolve_vld_ip_profile(self.nsd_msg, vld),
self.id,
restart_mode=self.restart_mode)
return vlr
- def _extract_cloud_accounts_for_vl(self, vld):
+ def _extract_datacenters_for_vl(self, vld):
"""
Extracts the list of cloud accounts from the NS Config obj
Rules:
- 1. Cloud accounts based connection point (vnf_cloud_account_map)
+ 1. Cloud accounts based connection point (vnf_datacenter_map)
Args:
vld : VLD yang object
Returns:
TYPE: Description
"""
- cloud_account_list = []
+ datacenter_list = []
- if self._nsr_cfg_msg.vnf_cloud_account_map:
- # 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 or vnf.om_datacenter is not None:
- vnf_cloud_map[vnf.member_vnf_index_ref] = (vnf.cloud_account,vnf.om_datacenter)
+ if self._nsr_cfg_msg.vnf_datacenter_map:
+ # Handle case where datacenter is None
+ vnf_datacenter_map = {}
+ for vnf in self._nsr_cfg_msg.vnf_datacenter_map:
+ if vnf.datacenter is not None or vnf.datacenter is not None:
+ vnf_datacenter_map[vnf.member_vnf_index_ref] = \
+ vnf.datacenter
for vnfc in vld.vnfd_connection_point_ref:
- cloud_account = vnf_cloud_map.get(
- vnfc.member_vnf_index_ref,
- (self.cloud_account_name,self.om_datacenter_name))
+ datacenter = vnf_datacenter_map.get(
+ vnfc.member_vnf_index_ref, self._datacenter_name)
- cloud_account_list.append(cloud_account)
+ datacenter_list.append(datacenter)
- if self._nsr_cfg_msg.vl_cloud_account_map:
- for vld_map in self._nsr_cfg_msg.vl_cloud_account_map:
+ if self._nsr_cfg_msg.vl_datacenter_map:
+ for vld_map in self._nsr_cfg_msg.vl_datacenter_map:
if vld_map.vld_id_ref == vld.id:
- 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))
+ for datacenter in vld_map.datacenters:
+ datacenter_list.append(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,self.om_datacenter_name)]
+ if not datacenter_list:
+ datacenter_list.append(self._datacenter_name)
- self._log.debug("VL {} cloud accounts: {}".
- format(vld.name, cloud_account_list))
- return set(cloud_account_list)
+ self._log.debug("VL {} data center list: {}".
+ format(vld.name, datacenter_list))
+ return set(datacenter_list)
@asyncio.coroutine
def create_vls(self):
@@ -1890,41 +2117,41 @@
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 cloud_account,om_datacenter in cloud_account_list:
- vlr = yield from self._create_vls(vld, cloud_account,om_datacenter)
- self._vlrs.append(vlr)
-
+ datacenter_list = self._extract_datacenters_for_vl(vld)
+ for datacenter in datacenter_list:
+ vlr = yield from self._create_vls(vld, datacenter)
+ self._vlrs[vlr.id] = vlr
+ self._nsm.add_vlr_id_nsr_map(vlr.id, self)
@asyncio.coroutine
def create_vl_instance(self, vld):
- self._log.debug("Create VL for {}: {}".format(self.id, vld.as_dict()))
+ self._log.error("Create VL for {}: {}".format(self.id, vld.as_dict()))
# Check if the VL is already present
vlr = None
- for vl in self._vlrs:
+ for vl_id, vl in self._vlrs.items():
if vl.vld_msg.id == vld.id:
- self._log.debug("The VLD %s already in NSR %s as VLR %s with status %s",
+ self._log.error("The VLD %s already in NSR %s as VLR %s with status %s",
vld.id, self.id, vl.id, vl.state)
vlr = vl
if vlr.state != VlRecordState.TERMINATED:
- err_msg = "VLR for VL %s in NSR %s already instantiated", \
- vld, self.id
+ err_msg = "VLR for VL {} in NSR {} already instantiated". \
+ format(vld, self.id)
self._log.error(err_msg)
raise NsrVlUpdateError(err_msg)
break
if vlr is None:
- cloud_account_list = self._extract_cloud_accounts_for_vl(vld)
- for account,om_datacenter in cloud_account_list:
- vlr = yield from self._create_vls(vld, account,om_datacenter)
- self._vlrs.append(vlr)
+ datacenter_list = self._extract_datacenters_for_vl(vld)
+ for datacenter in datacenter_list:
+ vlr = yield from self._create_vls(vld, account, datacenter)
+ self._vlrs[vlr.id] = vlr
+ self._nsm.add_vlr_id_nsr_map(vlr.id, self)
vlr.state = VlRecordState.INSTANTIATION_PENDING
yield from self.update_state()
try:
yield from self.nsm_plugin.instantiate_vl(self, vlr)
- vlr.state = VlRecordState.ACTIVE
except Exception as e:
err_msg = "Error instantiating VL for NSR {} and VLD {}: {}". \
@@ -1937,7 +2164,7 @@
@asyncio.coroutine
def delete_vl_instance(self, vld):
- for vlr in self._vlrs:
+ for vlr_id, vlr in self._vlrs.items():
if vlr.vld_msg.id == vld.id:
self._log.debug("Found VLR %s for VLD %s in NSR %s",
vlr.id, vld.id, self.id)
@@ -1947,7 +2174,8 @@
try:
yield from self.nsm_plugin.terminate_vl(vlr)
vlr.state = VlRecordState.TERMINATED
- self._vlrs.remove(vlr)
+ del self._vlrs[vlr]
+ self.remove_vlr_id_nsr_map(vlr.id)
except Exception as e:
err_msg = "Error terminating VL for NSR {} and VLD {}: {}". \
@@ -1975,18 +2203,17 @@
continue
vnfd_msg = self._get_vnfd(const_vnfd.vnfd_id_ref, config_xact)
- 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, om_datacenter_name)
-
+ datacenter_name = self._get_vnfd_datacenter(const_vnfd.member_vnf_index)
+ if datacenter_name is None:
+ datacenter_name = self._datacenter_name
+ yield from self.create_vnf_record(vnfd_msg, const_vnfd, datacenter_name)
def get_placement_groups(self, vnfd_msg, const_vnfd):
placement_groups = []
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 == str(const_vnfd.member_vnf_index)):
group_info = self.resolve_placement_group_cloud_construct(group)
if group_info is None:
self._log.info("Could not resolve cloud-construct for placement group: %s", group.name)
@@ -1999,28 +2226,58 @@
placement_groups.append(group_info)
return placement_groups
+ def get_cloud_config(self):
+ cloud_config = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_CloudConfig()
+ self._log.debug("Received key pair is {}".format(self._key_pairs))
+
+ for authorized_key in self.nsr_cfg_msg.ssh_authorized_key:
+ if authorized_key.key_pair_ref in self._key_pairs:
+ key_pair = cloud_config.key_pair.add()
+ key_pair.from_dict(self._key_pairs[authorized_key.key_pair_ref].as_dict())
+ for nsd_key_pair in self.nsd_msg.key_pair:
+ key_pair = cloud_config.key_pair.add()
+ key_pair.from_dict(key_pair.as_dict())
+ for nsr_cfg_user in self.nsr_cfg_msg.user:
+ user = cloud_config.user.add()
+ user.name = nsr_cfg_user.name
+ user.user_info = nsr_cfg_user.user_info
+ for ssh_key in nsr_cfg_user.ssh_authorized_key:
+ if ssh_key.key_pair_ref in self._key_pairs:
+ key_pair = user.key_pair.add()
+ key_pair.from_dict(self._key_pairs[ssh_key.key_pair_ref].as_dict())
+ for nsd_user in self.nsd_msg.user:
+ user = cloud_config.user.add()
+ user.from_dict(nsd_user.as_dict())
+
+ self._log.debug("Formed cloud-config msg is {}".format(cloud_config))
+ return cloud_config
+
@asyncio.coroutine
- def create_vnf_record(self, vnfd_msg, const_vnfd, cloud_account_name, om_datacenter_name, group_name=None, group_instance_id=None):
+ def create_vnf_record(self, vnfd_msg, const_vnfd, 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)
+ cloud_config = self.get_cloud_config()
+ self._log.info("Cloud Account for VNF %d is %s",const_vnfd.member_vnf_index,datacenter_name)
self._log.info("Launching VNF: %s (Member Index: %s) in NSD plancement Groups: %s",
vnfd_msg.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,
+ self._project,
vnfd_msg,
+ self._nsr_cfg_msg,
const_vnfd,
self.nsd_id,
self.name,
- cloud_account_name,
- om_datacenter_name,
+ datacenter_name,
self.id,
group_name,
group_instance_id,
placement_groups,
+ cloud_config,
restart_mode=self.restart_mode,
)
if vnfr.id in self._vnfrs:
@@ -2076,10 +2333,38 @@
"""
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:
+ @asyncio.coroutine
+ def instantiate_vnf(vnf):
self._log.debug("Instantiating VNF: %s in NS %s", vnf, self.id)
+ vnfd_id = vnf.vnfr_msg.vnfd.id
+ for dependency_vnf in dependencies[vnfd_id]:
+ while dependency_vnf not in self.instantiated:
+ yield from asyncio.sleep(1, loop=self._loop)
+
yield from self.nsm_plugin.instantiate_vnf(self, vnf,scaleout)
+ self.instantiated.add(vnfd_id)
+
+ self._log.debug("Instantiating %u VNFs in NS %s", len(vnfrs), self.id)
+ dependencies = collections.defaultdict(list)
+ for dependency_vnf in self._nsr_cfg_msg.nsd.vnf_dependency:
+ dependencies[dependency_vnf.vnf_source_ref].append(dependency_vnf.vnf_depends_on_ref)
+
+ # The dictionary copy is to ensure that if a terminate is initiated right after instantiation, the
+ # Runtime error for "dictionary changed size during iteration" does not occur.
+ # vnfrs - 'dict_values' object
+ # vnfrs_copy - list object
+ vnfrs_copy = list(vnfrs)
+ tasks = []
+ for vnf in vnfrs_copy:
+ vnf_task = self._loop.create_task(instantiate_vnf(vnf))
+ tasks.append(vnf_task)
+
+ if len(tasks) > 0:
+ self._log.debug("Waiting for %s instantiate_vnf tasks to complete", len(tasks))
+ done, pending = yield from asyncio.wait(tasks, loop=self._loop, timeout=30)
+ if pending:
+ self._log.error("The Instantiate vnf task timed out after 30 seconds.")
+ raise VirtualNetworkFunctionRecordError("Task tied out : ", pending)
@asyncio.coroutine
def instantiate_vnffgs(self):
@@ -2142,6 +2427,7 @@
@asyncio.coroutine
def publish(self):
""" This function publishes this NSR """
+
self._nsr_msg = self.create_msg()
self._log.debug("Publishing the NSR with xpath %s and nsr %s",
@@ -2152,37 +2438,37 @@
self._log.debug("Publishing NSR in RUNNING state!")
#raise()
- with self._dts.transaction() as xact:
- yield from self._nsm.nsr_handler.update(xact, self.nsr_xpath, self._nsr_msg)
- if self._op_status.state == NetworkServiceRecordState.RUNNING:
- self._debug_running = True
+ yield from self._nsm.nsr_handler.update(None, self.nsr_xpath, self._nsr_msg)
+ if self._op_status.state == NetworkServiceRecordState.RUNNING:
+ self._debug_running = True
@asyncio.coroutine
- def unpublish(self, xact):
+ def unpublish(self, xact=None):
""" Unpublish this NSR object """
self._log.debug("Unpublishing Network service id %s", self.id)
+
yield from self._nsm.nsr_handler.delete(xact, self.nsr_xpath)
@property
def nsr_xpath(self):
""" Returns the xpath associated with this NSR """
- return(
+ return self._project.add_project((
"D,/nsr:ns-instance-opdata" +
- "/nsr:nsr[nsr:ns-instance-config-ref = '{}']"
- ).format(self.id)
+ "/nsr:nsr[nsr:ns-instance-config-ref={}]"
+ ).format(quoted_key(self.id)))
@staticmethod
def xpath_from_nsr(nsr):
""" Returns the xpath associated with this NSR op data"""
return (NetworkServiceRecord.XPATH +
- "[nsr:ns-instance-config-ref = '{}']").format(nsr.id)
+ "[nsr:ns-instance-config-ref={}]").format(quoted_key(nsr.id))
@property
def nsd_xpath(self):
""" Return NSD config xpath."""
- return(
- "C,/nsd:nsd-catalog/nsd:nsd[nsd:id = '{}']"
- ).format(self.nsd_id)
+ return self._project.add_project((
+ "C,/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id={}]"
+ ).format(quoted_key(self.nsd_id)))
@asyncio.coroutine
def instantiate(self, config_xact):
@@ -2211,17 +2497,17 @@
# Move the state to INIITALIZING
self.set_state(NetworkServiceRecordState.INIT)
- event_descr = "Instantiation Request Received NSR Id:%s" % self.id
+ event_descr = "Instantiation Request Received NSR Id: %s, NS Name: %s" % (self.id, self.name)
self.record_event("instantiating", event_descr)
# Find the NSD
self._nsd = self._nsr_cfg_msg.nsd
# Merge any config and initial config primitive values
- self.config_store.merge_nsd_config(self.nsd_msg)
+ self.config_store.merge_nsd_config(self.nsd_msg, self._project.name)
self._log.debug("Merged NSD: {}".format(self.nsd_msg.as_dict()))
- event_descr = "Fetched NSD with descriptor id %s" % self.nsd_id
+ event_descr = "Fetched NSD with descriptor id %s, NS Name: %s" % (self.nsd_id, self.name)
self.record_event("nsd-fetched", event_descr)
if self._nsd is None:
@@ -2249,59 +2535,86 @@
self.id, self.nsd_id)
# instantiate the VLs
- event_descr = ("Instantiating %s external VLs for NSR id %s" %
- (len(self.nsd_msg.vld), self.id))
+ event_descr = ("Instantiating %s external VLs for NSR id: %s, NS Name: %s " %
+ (len(self.nsd_msg.vld), self.id, self.name))
self.record_event("begin-external-vls-instantiation", event_descr)
self.set_state(NetworkServiceRecordState.VL_INIT_PHASE)
- yield from self.instantiate_vls()
-
# Publish the NSR to DTS
yield from self.publish()
- event_descr = ("Finished instantiating %s external VLs for NSR id %s" %
- (len(self.nsd_msg.vld), self.id))
+ if self._ns_terminate_received:
+ self._log.debug("Terminate Received. Interrupting Instantiation at event : begin-external-vls-instantiation.")
+ # Setting this flag as False again as this is a state where neither VL or VNF have been instantiated.
+ self._ns_terminate_received = False
+ # At this stage only ns-instance opdata is published. Cleaning up the record.
+ yield from self.unpublish()
+ return
+
+ yield from self.instantiate_vls()
+
+ event_descr = ("Finished instantiating %s external VLs for NSR id: %s, NS Name: %s " %
+ (len(self.nsd_msg.vld), self.id, self.name))
self.record_event("end-external-vls-instantiation", event_descr)
self.set_state(NetworkServiceRecordState.VNF_INIT_PHASE)
+ # Publish the NSR to DTS
+ yield from self.publish()
+
self._log.debug("Instantiating VNFs ...... nsr[%s], nsd[%s]",
self.id, self.nsd_id)
# instantiate the VNFs
- event_descr = ("Instantiating %s VNFS for NSR id %s" %
- (len(self.nsd_msg.constituent_vnfd), self.id))
+ event_descr = ("Instantiating %s VNFS for NSR id: %s, NS Name: %s " %
+ (len(self.nsd_msg.constituent_vnfd), self.id, self.name))
self.record_event("begin-vnf-instantiation", event_descr)
+ if self._ns_terminate_received:
+ self._log.debug("Terminate Received. Interrupting Instantiation at event : end-external-vls-instantiation.")
+ return
+
yield from self.instantiate_vnfs(self._vnfrs.values())
- self._log.debug(" Finished instantiating %d VNFs for NSR id %s",
- len(self.nsd_msg.constituent_vnfd), self.id)
+ self._log.debug(" Finished instantiating %d VNFs for NSR id: %s, NS Name: %s",
+ len(self.nsd_msg.constituent_vnfd), self.id, self.name)
- event_descr = ("Finished instantiating %s VNFs for NSR id %s" %
- (len(self.nsd_msg.constituent_vnfd), self.id))
+ event_descr = ("Finished instantiating %s VNFs for NSR id: %s, NS Name: %s" %
+ (len(self.nsd_msg.constituent_vnfd), self.id, self.name))
self.record_event("end-vnf-instantiation", event_descr)
+ # Publish the NSR to DTS
+ yield from self.publish()
+
if len(self.vnffgrs) > 0:
#self.set_state(NetworkServiceRecordState.VNFFG_INIT_PHASE)
- event_descr = ("Instantiating %s VNFFGS for NSR id %s" %
- (len(self.nsd_msg.vnffgd), self.id))
+ event_descr = ("Instantiating %s VNFFGS for NSR id: %s, NS Name: %s" %
+ (len(self.nsd_msg.vnffgd), self.id, self.name))
self.record_event("begin-vnffg-instantiation", event_descr)
+ if self._ns_terminate_received:
+ self._log.debug("Terminate Received. Interrupting Instantiation at event : begin-vnffg-instantiation.")
+ return
+
yield from self.instantiate_vnffgs()
- event_descr = ("Finished instantiating %s VNFFGDs for NSR id %s" %
- (len(self.nsd_msg.vnffgd), self.id))
+ event_descr = ("Finished instantiating %s VNFFGDs for NSR id: %s, NS Name: %s" %
+ (len(self.nsd_msg.vnffgd), self.id, self.name))
self.record_event("end-vnffg-instantiation", event_descr)
if self.has_scaling_instances():
- event_descr = ("Instantiating %s Scaling Groups for NSR id %s" %
- (len(self._scaling_groups), self.id))
+ event_descr = ("Instantiating %s Scaling Groups for NSR id: %s, NS Name: %s" %
+ (len(self._scaling_groups), self.id, self.name))
self.record_event("begin-scaling-group-instantiation", event_descr)
+
+ if self._ns_terminate_received:
+ self._log.debug("Terminate Received. Interrupting Instantiation at event : begin-scaling-group-instantiation.")
+ return
+
yield from self.instantiate_scaling_instances(config_xact)
self.record_event("end-scaling-group-instantiation", event_descr)
@@ -2309,14 +2622,14 @@
# virtual links and vnfs are instantiated
yield from self.nsm_plugin.deploy(self._nsr_msg)
- self._log.debug("Publishing NSR...... nsr[%s], nsd[%s]",
- self.id, self.nsd_id)
+ self._log.debug("Publishing NSR...... nsr[%s], nsd[%s], for NS[%s]",
+ self.id, self.nsd_id, self.name)
# Publish the NSR to DTS
yield from self.publish()
- self._log.debug("Published NSR...... nsr[%s], nsd[%s]",
- self.id, self.nsd_id)
+ self._log.debug("Published NSR...... nsr[%s], nsd[%s], for NS[%s]",
+ self.id, self.nsd_id, self.name)
def on_instantiate_done(fut):
# If the do_instantiate fails, then publish NSR with failed result
@@ -2344,6 +2657,9 @@
yield from self.publish()
+ if status == NsrYang.ConfigStates.TERMINATE:
+ yield from self.terminate_ns_cont()
+
@asyncio.coroutine
def is_active(self):
""" This NS is active """
@@ -2355,7 +2671,7 @@
self._log.debug("Network service %s is active ", self.id)
self._is_active = True
- event_descr = "NSR in running state for NSR id %s" % self.id
+ event_descr = "NSR in running state for NSR id: %s, NS Name: %s" % (self.id, self.name)
self.record_event("ns-running", event_descr)
yield from self.publish()
@@ -2366,8 +2682,9 @@
self._log.error("Network service id:%s, name:%s instantiation failed",
self.id, self.name)
self.set_state(NetworkServiceRecordState.FAILED)
+ self._is_failed = True
- event_descr = "Instantiation of NS %s failed" % self.id
+ event_descr = "Instantiation of NS %s - %s failed" % (self.id, self.name)
self.record_event("ns-failed", event_descr, evt_details=failed_reason)
# Publish the NSR to DTS
@@ -2376,59 +2693,94 @@
@asyncio.coroutine
def terminate_vnfrs(self, vnfrs, scalein=False):
""" Terminate VNFRS in this network service """
- self._log.debug("Terminating VNFs in network service %s", self.id)
- for vnfr in vnfrs:
+ self._log.debug("Terminating VNFs in network service %s - %s", self.id, self.name)
+ vnfr_ids = []
+ for vnfr in list(vnfrs):
self._log.debug("Terminating VNFs in network service %s %s", vnfr.id, self.id)
- if scalein:
- yield from self.nsm_plugin.terminate_vnf(self, vnfr, scalein=True)
+ yield from self.nsm_plugin.terminate_vnf(self, vnfr, scalein=scalein)
+ vnfr_ids.append(vnfr.id)
+
+ for vnfr_id in vnfr_ids:
+ self._vnfrs.pop(vnfr_id, None)
@asyncio.coroutine
def terminate(self):
- """ Terminate a NetworkServiceRecord."""
+ """Start terminate of a NetworkServiceRecord."""
+ # Move the state to TERMINATE
+ self.set_state(NetworkServiceRecordState.TERMINATE)
+ event_descr = "Terminate being processed for NS Id: %s, NS Name: %s" % (self.id, self.name)
+ self.record_event("terminate", event_descr)
+ self._log.debug("Terminating network service id: %s, NS Name: %s", self.id, self.name)
+
+ # Adding the NSR ID on terminate Evet. This will be checked to halt the instantiation if not already finished.
+ self._ns_terminate_received = True
+
+ yield from self.publish()
+
+ if self._is_failed:
+ # IN case the instantiation failed, then trigger a cleanup immediately
+ # don't wait for Cfg manager, as it will have no idea of this NSR.
+ # Due to the failure
+ yield from self.terminate_ns_cont()
+
+
+ @asyncio.coroutine
+ def terminate_ns_cont(self):
+ """Config script related to terminate finished, continue termination"""
def terminate_vnffgrs():
""" Terminate VNFFGRS in this network service """
- self._log.debug("Terminating VNFFGRs in network service %s", self.id)
+ self._log.debug("Terminating VNFFGRs in network service %s - %s", self.id, self.name)
for vnffgr in self.vnffgrs.values():
yield from vnffgr.terminate()
def terminate_vlrs():
""" Terminate VLRs in this netork service """
- self._log.debug("Terminating VLs in network service %s", self.id)
- for vlr in self.vlrs:
+ self._log.debug("Terminating VLs in network service %s - %s", self.id, self.name)
+ for vlr_id, vlr in self.vlrs.items():
yield from self.nsm_plugin.terminate_vl(vlr)
vlr.state = VlRecordState.TERMINATED
- self._log.debug("Terminating network service id %s", self.id)
-
- # Move the state to TERMINATE
- self.set_state(NetworkServiceRecordState.TERMINATE)
- event_descr = "Terminate being processed for NS Id:%s" % self.id
- self.record_event("terminate", event_descr)
-
# Move the state to VNF_TERMINATE_PHASE
- self._log.debug("Terminating VNFFGs in NS ID: %s", self.id)
+ self._log.debug("Terminating VNFFGs in NS ID: %s, NS Name: %s", self.id, self.name)
self.set_state(NetworkServiceRecordState.VNFFG_TERMINATE_PHASE)
- event_descr = "Terminating VNFFGS in NS Id:%s" % self.id
+ event_descr = "Terminating VNFFGS in NS Id: %s, NS Name: %s" % (self.id, self.name)
self.record_event("terminating-vnffgss", event_descr)
yield from terminate_vnffgrs()
# Move the state to VNF_TERMINATE_PHASE
self.set_state(NetworkServiceRecordState.VNF_TERMINATE_PHASE)
- event_descr = "Terminating VNFS in NS Id:%s" % self.id
+ event_descr = "Terminating VNFS in NS Id: %s, NS Name: %s" % (self.id, self.name)
self.record_event("terminating-vnfs", event_descr)
yield from self.terminate_vnfrs(self.vnfrs.values())
# Move the state to VL_TERMINATE_PHASE
self.set_state(NetworkServiceRecordState.VL_TERMINATE_PHASE)
- event_descr = "Terminating VLs in NS Id:%s" % self.id
+ event_descr = "Terminating VLs in NS Id: %s, NS Name: %s" % (self.id, self.name)
self.record_event("terminating-vls", event_descr)
yield from terminate_vlrs()
yield from self.nsm_plugin.terminate_ns(self)
+ # Remove the generated SSH key
+ if self._ssh_key_file:
+ p = urlparse(self._ssh_key_file)
+ if p[0] == 'file':
+ path = os.path.dirname(p[2])
+ self._log.debug("NSR {}: Removing keys in {}".format(self.name,
+ path))
+ shutil.rmtree(path, ignore_errors=True)
+
# Move the state to TERMINATED
self.set_state(NetworkServiceRecordState.TERMINATED)
- event_descr = "Terminated NS Id:%s" % self.id
+ event_descr = "Terminated NS Id: %s, NS Name: %s" % (self.id, self.name)
self.record_event("terminated", event_descr)
+ # Unpublish the NSR record
+ self._log.debug("Unpublishing the network service %s - %s", self.id, self.name)
+ yield from self.unpublish()
+
+ # Finaly delete the NS instance from this NS Manager
+ self._log.debug("Deleting the network service %s - %s", self.id, self.name)
+ self.nsm.delete_nsr(self.id)
+
def enable(self):
""""Enable a NetworkServiceRecord."""
pass
@@ -2457,8 +2809,8 @@
def create_msg(self):
""" The network serice record as a message """
nsr_dict = {"ns_instance_config_ref": self.id}
- nsr = RwNsrYang.YangData_Nsr_NsInstanceOpdata_Nsr.from_dict(nsr_dict)
- #nsr.cloud_account = self.cloud_account_name
+ nsr = RwNsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr.from_dict(nsr_dict)
+ #nsr.datacenter = self.cloud_account_name
nsr.sdn_account = self._sdn_account_name
nsr.name_ref = self.name
nsr.nsd_ref = self.nsd_id
@@ -2470,18 +2822,47 @@
nsr.create_time = self._create_time
nsr.uptime = int(time.time()) - self._create_time
+ # Added for OpenMano
+
+ nsr.orchestration_progress.networks.total = len(self.nsd_msg.vld)
+ if isinstance(self.nsm_plugin, openmano_nsm.OpenmanoNsPlugin):
+ # Taking the last update by OpenMano
+ nsr.orchestration_progress.networks.active = self.nsm_plugin._openmano_nsrs[self.id]._active_nets
+ else:
+ nsr.orchestration_progress.networks.active = self._active_networks
+ no_of_vdus = 0
+ for vnfr_id, vnfr in self._vnfrs.items():
+ no_of_vdus += len(vnfr.vnfd.vdu)
+
+ nsr.orchestration_progress.vms.total = no_of_vdus
+ if isinstance(self.nsm_plugin, openmano_nsm.OpenmanoNsPlugin):
+ # Taking the last update by OpenMano
+ nsr.orchestration_progress.vms.active = self.nsm_plugin._openmano_nsrs[self.id]._active_vms
+ else:
+ nsr.orchestration_progress.vms.active = self._active_vms
+
+ # Generated SSH key
+ if self._ssh_pub_key:
+ nsr.ssh_key_generated.private_key_file = self._ssh_key_file
+ nsr.ssh_key_generated.public_key = self._ssh_pub_key
+
for cfg_prim in self.nsd_msg.service_primitive:
- cfg_prim = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_ServicePrimitive.from_dict(
+ cfg_prim = RwNsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_ServicePrimitive.from_dict(
cfg_prim.as_dict())
nsr.service_primitive.append(cfg_prim)
- for init_cfg in self.nsd_msg.initial_config_primitive:
- prim = NsrYang.NsrInitialConfigPrimitive.from_dict(
+ for init_cfg in self.nsd_msg.initial_service_primitive:
+ prim = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_InitialServicePrimitive.from_dict(
init_cfg.as_dict())
- nsr.initial_config_primitive.append(prim)
+ nsr.initial_service_primitive.append(prim)
+
+ for term_cfg in self.nsd_msg.terminate_service_primitive:
+ prim = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_TerminateServicePrimitive.from_dict(
+ term_cfg.as_dict())
+ nsr.terminate_service_primitive.append(prim)
if self.vl_phase_completed():
- for vlr in self.vlrs:
+ for vlr_id, vlr in self.vlrs.items():
nsr.vlr.append(vlr.create_nsr_vlr_msg(self.vnfrs.values()))
if self.vnf_phase_completed():
@@ -2506,104 +2887,187 @@
""" Re-evaluate this NS's state """
curr_state = self._op_status.state
- if curr_state == NetworkServiceRecordState.TERMINATED:
- self._log.debug("NS (%s) in terminated state, not updating state", self.id)
+ # This means that the terminate has been fired before the NS was UP.
+ if self._ns_terminate_received:
+ # Resetting this flag so that terminate ns is not called via subsequent DTS Handlers after the intial call.
+ self._ns_terminate_received = False
+ yield from self.terminate_ns_cont()
+ else:
+ if curr_state == NetworkServiceRecordState.TERMINATED:
+ self._log.debug("NS (%s - %s) in terminated state, not updating state", self.id, self.name)
+ return
+
+ new_state = NetworkServiceRecordState.RUNNING
+ self._log.debug("Received update_state for nsr: %s, curr-state: %s",
+ self.id, curr_state)
+
+ # check all VLs
+ if (isinstance(self.nsm_plugin, rwnsmplugin.RwNsPlugin)):
+ for vlr_id, vl in self.vlrs.items():
+ self._log.debug("VLR %s state %s", vlr_id, vl.state)
+ if vl.state in [VlRecordState.ACTIVE, VlRecordState.TERMINATED]:
+ continue
+ elif vl.state == VlRecordState.FAILED:
+ if vl.prev_state != vl.state:
+ event_descr = "Instantiation of VL %s failed" % vl.id
+ event_error_details = vl.state_failed_reason
+ self.record_event("vl-failed", event_descr, evt_details=event_error_details)
+ vl.prev_state = vl.state
+ new_state = NetworkServiceRecordState.FAILED
+ break
+ else:
+ self._log.debug("VL already in failed state")
+ else:
+ if vl.state in [VlRecordState.INSTANTIATION_PENDING, VlRecordState.INIT]:
+ new_state = NetworkServiceRecordState.VL_INSTANTIATE
+ break
+
+ if vl.state in [VlRecordState.TERMINATE_PENDING]:
+ new_state = NetworkServiceRecordState.VL_TERMINATE
+ break
+
+ # Check all the VNFRs are present
+ if new_state == NetworkServiceRecordState.RUNNING:
+ for _, vnfr in self.vnfrs.items():
+ self._log.debug("VNFR state %s", vnfr.state)
+ if vnfr.state in [VnfRecordState.ACTIVE, VnfRecordState.TERMINATED]:
+ active_vdus = 0
+ for vnfr in self.vnfrs:
+ active_vdus += self.nsm._vnfrs[vnfr]._active_vdus
+
+ if self._active_vms != active_vdus:
+ self._active_vms = active_vdus
+ yield from self.publish()
+
+ continue
+
+ elif vnfr.state == VnfRecordState.FAILED:
+ if vnfr._prev_state != vnfr.state:
+ event_descr = "Instantiation of VNF %s for NS: %s failed" % (vnfr.id, self.name)
+ event_error_details = vnfr.state_failed_reason
+ self.record_event("vnf-failed", event_descr, evt_details=event_error_details)
+ vnfr.set_state(VnfRecordState.FAILED)
+ else:
+ self._log.info("VNF state did not change, curr=%s, prev=%s",
+ vnfr.state, vnfr._prev_state)
+ new_state = NetworkServiceRecordState.FAILED
+ break
+ else:
+ self._log.debug("VNF %s in NSR %s - %s is still not active; current state is: %s",
+ vnfr.id, self.id, self.name, vnfr.state)
+ new_state = curr_state
+
+ # If new state is RUNNING; check VNFFGRs are also active
+ if new_state == NetworkServiceRecordState.RUNNING:
+ for _, vnffgr in self.vnffgrs.items():
+ self._log.debug("Checking vnffgr state for nsr %s is: %s",
+ self.id, vnffgr.state)
+ if vnffgr.state == VnffgRecordState.ACTIVE:
+ continue
+ elif vnffgr.state == VnffgRecordState.FAILED:
+ event_descr = "Instantiation of VNFFGR %s failed" % vnffgr.id
+ self.record_event("vnffg-failed", event_descr)
+ new_state = NetworkServiceRecordState.FAILED
+ break
+ else:
+ self._log.info("VNFFGR %s in NSR %s - %s is still not active; current state is: %s",
+ vnffgr.id, self.id, self.name, vnffgr.state)
+ new_state = curr_state
+
+ # Update all the scaling group instance operational status to
+ # reflect the state of all VNFR within that instance
+ yield from self._update_scale_group_instances_status()
+
+ for _, group in self._scaling_groups.items():
+ if group.state == scale_group.ScaleGroupState.SCALING_OUT:
+ new_state = NetworkServiceRecordState.SCALING_OUT
+ break
+ elif group.state == scale_group.ScaleGroupState.SCALING_IN:
+ new_state = NetworkServiceRecordState.SCALING_IN
+ break
+
+ if new_state != curr_state:
+ self._log.debug("Changing state of Network service %s - %s from %s to %s",
+ self.id, self.name, curr_state, new_state)
+ if new_state == NetworkServiceRecordState.RUNNING:
+ yield from self.is_active()
+ elif new_state == NetworkServiceRecordState.FAILED:
+ # If the NS is already active and we entered scaling_in, scaling_out,
+ # do not mark the NS as failing if scaling operation failed.
+ if curr_state in [NetworkServiceRecordState.SCALING_OUT,
+ NetworkServiceRecordState.SCALING_IN] and self._is_active:
+ new_state = NetworkServiceRecordState.RUNNING
+ self.set_state(new_state)
+ else:
+ yield from self.instantiation_failed()
+ else:
+ self.set_state(new_state)
+
+ yield from self.publish()
+
+ def vl_instantiation_state(self):
+ """ Check if all VLs in this NS are active """
+ for vl_id, vlr in self.vlrs.items():
+ if vlr.state == VlRecordState.ACTIVE:
+ continue
+ elif vlr.state == VlRecordState.FAILED:
+ return VlRecordState.FAILED
+ elif vlr.state == VlRecordState.TERMINATED:
+ return VlRecordState.TERMINATED
+ elif vlr.state == VlRecordState.INSTANTIATION_PENDING:
+ return VlRecordState.INSTANTIATION_PENDING
+ else:
+ self._log.error("vlr %s still in state %s", vlr, vlr.state)
+ raise VirtualLinkRecordError("Invalid state %s" %(vlr.state))
+ return VlRecordState.ACTIVE
+
+ def vl_instantiation_successful(self):
+ """ Mark that all VLs in this NS are active """
+ if self._vls_ready.is_set():
+ self._log.error("NSR id %s, vls_ready is already set", self.id)
+
+ if self.vl_instantiation_state() == VlRecordState.ACTIVE:
+ self._log.debug("NSR id %s, All %d vlrs are in active state %s",
+ self.id, len(self.vlrs), self.vl_instantiation_state)
+ self._vls_ready.set()
+
+ def vlr_event(self, vlr, action):
+ self._log.debug("Received VLR %s with action:%s", vlr, action)
+
+ if vlr.id not in self.vlrs:
+ self._log.error("VLR %s:%s received for unknown id, state:%s",
+ vlr.id, vlr.name, vlr.operational_status)
return
- new_state = NetworkServiceRecordState.RUNNING
- self._log.info("Received update_state for nsr: %s, curr-state: %s",
- self.id, curr_state)
+ vlr_local = self.vlrs[vlr.id]
- # Check all the VNFRs are present
- for _, vnfr in self.vnfrs.items():
- if vnfr.state in [VnfRecordState.ACTIVE, VnfRecordState.TERMINATED]:
- pass
- elif vnfr.state == VnfRecordState.FAILED:
- if vnfr._prev_state != vnfr.state:
- event_descr = "Instantiation of VNF %s failed" % vnfr.id
- event_error_details = vnfr.state_failed_reason
- self.record_event("vnf-failed", event_descr, evt_details=event_error_details)
- vnfr.set_state(VnfRecordState.FAILED)
- else:
- self._log.info("VNF state did not change, curr=%s, prev=%s",
- vnfr.state, vnfr._prev_state)
- new_state = NetworkServiceRecordState.FAILED
- break
+ if action == rwdts.QueryAction.CREATE or action == rwdts.QueryAction.UPDATE:
+ if vlr.operational_status == 'running':
+ vlr_local.set_state_from_op_status(vlr.operational_status)
+ self._active_networks += 1
+ self._log.info("VLR %s:%s moving to active state",
+ vlr.id,vlr.name)
+ elif vlr.operational_status == 'failed':
+ vlr_local.set_state_from_op_status(vlr.operational_status)
+ vlr_local.state_failed_reason = vlr.operational_status_details
+ asyncio.ensure_future(self.update_state(), loop=self._loop)
+ self._log.info("VLR %s:%s moving to failed state",
+ vlr.id,vlr.name)
else:
- self._log.info("VNF %s in NSR %s is still not active; current state is: %s",
- vnfr.id, self.id, vnfr.state)
- new_state = curr_state
+ self._log.warning("VLR %s:%s received state:%s",
+ vlr.id, vlr.name, vlr.operational_status)
- # If new state is RUNNING; check all VLs
- if new_state == NetworkServiceRecordState.RUNNING:
- for vl in self.vlrs:
+ if isinstance(self.nsm_plugin, rwnsmplugin.RwNsPlugin):
+ self.vl_instantiation_successful()
- if vl.state in [VlRecordState.ACTIVE, VlRecordState.TERMINATED]:
- pass
- elif vl.state == VlRecordState.FAILED:
- if vl.prev_state != vl.state:
- event_descr = "Instantiation of VL %s failed" % vl.id
- event_error_details = vl.state_failed_reason
- self.record_event("vl-failed", event_descr, evt_details=event_error_details)
- vl.prev_state = vl.state
- else:
- self._log.debug("VL %s already in failed state")
- else:
- if vl.state in [VlRecordState.INSTANTIATION_PENDING, VlRecordState.INIT]:
- new_state = NetworkServiceRecordState.VL_INSTANTIATE
- break
-
- if vl.state in [VlRecordState.TERMINATE_PENDING]:
- new_state = NetworkServiceRecordState.VL_TERMINATE
- break
-
- # If new state is RUNNING; check VNFFGRs are also active
- if new_state == NetworkServiceRecordState.RUNNING:
- for _, vnffgr in self.vnffgrs.items():
- self._log.info("Checking vnffgr state for nsr %s is: %s",
- self.id, vnffgr.state)
- if vnffgr.state == VnffgRecordState.ACTIVE:
- pass
- elif vnffgr.state == VnffgRecordState.FAILED:
- event_descr = "Instantiation of VNFFGR %s failed" % vnffgr.id
- self.record_event("vnffg-failed", event_descr)
- new_state = NetworkServiceRecordState.FAILED
- break
- else:
- self._log.info("VNFFGR %s in NSR %s is still not active; current state is: %s",
- vnffgr.id, self.id, vnffgr.state)
- new_state = curr_state
-
- # Update all the scaling group instance operational status to
- # reflect the state of all VNFR within that instance
- yield from self._update_scale_group_instances_status()
-
- for _, group in self._scaling_groups.items():
- if group.state == scale_group.ScaleGroupState.SCALING_OUT:
- new_state = NetworkServiceRecordState.SCALING_OUT
- break
- elif group.state == scale_group.ScaleGroupState.SCALING_IN:
- new_state = NetworkServiceRecordState.SCALING_IN
- break
-
- if new_state != curr_state:
- self._log.debug("Changing state of Network service %s from %s to %s",
- self.id, curr_state, new_state)
- if new_state == NetworkServiceRecordState.RUNNING:
- yield from self.is_active()
- elif new_state == NetworkServiceRecordState.FAILED:
- # If the NS is already active and we entered scaling_in, scaling_out,
- # do not mark the NS as failing if scaling operation failed.
- if curr_state in [NetworkServiceRecordState.SCALING_OUT,
- NetworkServiceRecordState.SCALING_IN] and self._is_active:
- new_state = NetworkServiceRecordState.RUNNING
- self.set_state(new_state)
- else:
- yield from self.instantiation_failed()
- else:
- self.set_state(new_state)
-
- yield from self.publish()
+ # self.update_state() is responsible for publishing the NSR state. Its being called by vlr_event and update_vnfr.
+ # The call from vlr_event occurs only if vlr reaches a failed state. Hence implementing the check here to handle
+ # ns terminate received after other vlr states as vl-alloc-pending, vl-init, running.
+ if self._ns_terminate_received:
+ # Resetting this flag so that terminate ns is not called via subsequent DTS Handlers after the intial call.
+ if vlr.operational_status in ['running', 'failed']:
+ self._ns_terminate_received = False
+ asyncio.ensure_future(self.terminate_ns_cont(), loop=self._loop)
class InputParameterSubstitution(object):
@@ -2611,7 +3075,7 @@
This class is responsible for substituting input parameters into an NSD.
"""
- def __init__(self, log):
+ def __init__(self, log, project):
"""Create an instance of InputParameterSubstitution
Arguments:
@@ -2619,6 +3083,29 @@
"""
self.log = log
+ self.project = project
+
+ def _fix_xpath(self, xpath):
+ # Fix the parameter.xpath to include project and correct namespace
+ self.log.debug("Provided xpath: {}".format(xpath))
+ #Split the xpath at the /
+ attrs = xpath.split('/')
+ new_xp = attrs[0]
+ for attr in attrs[1:]:
+ new_ns = 'project-nsd'
+ name = attr
+ if ':' in attr:
+ # Includes namespace
+ ns, name = attr.split(':', 2)
+ if ns == "rw-nsd":
+ ns = "rw-project-nsd"
+
+ new_xp = new_xp + '/' + new_ns + ':' + name
+
+ updated_xpath = self.project.add_project(new_xp)
+
+ self.log.error("Updated xpath: {}".format(updated_xpath))
+ return updated_xpath
def __call__(self, nsd, nsr_config):
"""Substitutes input parameters from the NSR config into the NSD
@@ -2656,12 +3143,108 @@
)
try:
- xpath.setxattr(nsd, param.xpath, param.value)
+ xp = self._fix_xpath(param.xpath)
+ xpath.setxattr(nsd, xp, param.value)
except Exception as e:
self.log.exception(e)
+class VnfInputParameterSubstitution(object):
+ """
+ This class is responsible for substituting input parameters into a VNFD.
+ """
+
+ def __init__(self, log, const_vnfd, project):
+ """Create an instance of VnfInputParameterSubstitution
+
+ Arguments:
+ log - a logger for this object to use
+ const_vnfd - id refs for vnfs in a ns
+ project - project for the VNFs
+ """
+
+ self.log = log
+ self.member_vnf_index = const_vnfd.member_vnf_index
+ self.vnfd_id_ref = const_vnfd.vnfd_id_ref
+ self.project = project
+
+ def __call__(self, vnfr, nsr_config):
+ """Substitutes vnf input parameters from the NSR config into the VNFD
+
+ This call modifies the provided VNFD with the input parameters that are
+ contained in the NSR config.
+
+ Arguments:
+ vnfr - a GI VNFR object
+ nsr_config - a GI NSR Config object
+
+ """
+
+ def compose_xpath(xpath, id):
+ prefix = "/rw-project:project[rw-project:name={}]".format(quoted_key(self.project.name)) + \
+ "/vnfr:vnfr-catalog/vnfr:vnfr[vnfr:id={}]/vnfr:vnfd/".format(quoted_key(id))
+
+ suffix = '/'.join(xpath.split('/')[3:]).replace('vnfd', 'vnfr')
+ return prefix + suffix
+
+ def substitute_xpath(ip_xpath, substitute_value, vnfr):
+ vnfr_xpath = compose_xpath(ip_xpath, vnfr.id)
+
+ try:
+ verify_xpath_wildcarded = xpath.getxattr(vnfr, vnfr_xpath)
+
+ self.log.debug(
+ "vnf-input-parameter:{} = {}, for VNF : [member-vnf-index : {}, vnfd-id-ref : {}]".format(
+ ip_xpath,
+ substitute_value,
+ self.member_vnf_index,
+ self.vnfd_id_ref
+ )
+ )
+ try:
+ xpath.setxattr(vnfr, vnfr_xpath, substitute_value)
+
+ except Exception as e:
+ self.log.exception(e)
+
+ except Exception as e:
+ self.log.exception("Wildcarded xpath {} is listy in nature. Can not update. Exception => {}"
+ .format(ip_xpath, e))
+
+ if vnfr is None or nsr_config is None:
+ return
+
+ optional_input_parameters = set()
+ for input_parameter in nsr_config.nsd.input_parameter_xpath:
+ optional_input_parameters.add(input_parameter.xpath)
+
+ # Apply the input parameters to the vnfr
+ if nsr_config.vnf_input_parameter:
+ for param in nsr_config.vnf_input_parameter:
+ if (param.member_vnf_index_ref == self.member_vnf_index and param.vnfd_id_ref == self.vnfd_id_ref):
+ if param.input_parameter:
+ for ip in param.input_parameter:
+ if ip.xpath not in optional_input_parameters:
+ msg = "Substitution Failed. Tried to set an invalid vnf input parameter ({}) for vnf [member-vnf-index : {}, vnfd-id-ref : {}]"
+ self.log.error(msg.format(ip.xpath, self.member_vnf_index, self.vnfd_id_ref))
+ continue
+
+ try:
+ substitute_xpath(ip.xpath, ip.value, vnfr)
+ except Exception as e:
+ self.log.exception(e)
+ else:
+ self.log.debug("Substituting Xpaths with default Values")
+ for input_parameter in nsr_config.nsd.input_parameter_xpath:
+ if input_parameter.default_value is not None:
+ try:
+ if "vnfd-catalog" in input_parameter.xpath:
+ substitute_xpath(input_parameter.xpath, input_parameter.default_value, vnfr)
+ except Exception as e:
+ self.log.exception(e)
+
+
class NetworkServiceDescriptor(object):
"""
Network service descriptor class
@@ -2693,7 +3276,9 @@
@staticmethod
def path_for_id(nsd_id):
""" Return path for the passed nsd_id"""
- return "C,/nsd:nsd-catalog/nsd:nsd[nsd:id = '{}'".format(nsd_id)
+ return self._nsm._project.add_project(
+ "C,/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id = '{}'".
+ format(nsd_id))
def path(self):
""" Return the message associated with this NetworkServiceDescriptor"""
@@ -2706,7 +3291,7 @@
class NsdDtsHandler(object):
""" The network service descriptor DTS handler """
- XPATH = "C,/nsd:nsd-catalog/nsd:nsd"
+ XPATH = "C,/project-nsd:nsd-catalog/project-nsd:nsd"
def __init__(self, dts, log, loop, nsm):
self._dts = dts
@@ -2715,6 +3300,7 @@
self._nsm = nsm
self._regh = None
+ self._project = nsm._project
@property
def regh(self):
@@ -2725,36 +3311,35 @@
def register(self):
""" Register for Nsd create/update/delete/read requests from dts """
+ if self._regh:
+ self._log.warning("DTS handler already registered for project {}".
+ format(self._project.name))
+ return
+
def on_apply(dts, acg, xact, action, scratch):
"""Apply the configuration"""
is_recovery = xact.xact is None and action == rwdts.AppconfAction.INSTALL
self._log.debug("Got nsd apply cfg (xact:%s) (action:%s)",
xact, action)
- # Create/Update an NSD record
- for cfg in self._regh.get_xact_elements(xact):
- # Only interested in those NSD cfgs whose ID was received in prepare callback
- if cfg.id in scratch.get('nsds', []) or is_recovery:
- self._nsm.update_nsd(cfg)
+
+ if self._regh:
+ # Create/Update an NSD record
+ for cfg in self._regh.get_xact_elements(xact):
+ # Only interested in those NSD cfgs whose ID was received in prepare callback
+ if cfg.id in scratch.get('nsds', []) or is_recovery:
+ self._nsm.update_nsd(cfg)
+
+ else:
+ # This can happen if we do the deregister
+ # during project delete before this is called
+ self._log.debug("No reg handle for {} for project {}".
+ format(self.__class__, self._project.name))
scratch.pop('nsds', None)
return RwTypes.RwStatus.SUCCESS
@asyncio.coroutine
- def delete_nsd_libs(nsd_id):
- """ Remove any files uploaded with NSD and stored under $RIFT_ARTIFACTS/libs/<id> """
- try:
- rift_artifacts_dir = os.environ['RIFT_ARTIFACTS']
- nsd_dir = os.path.join(rift_artifacts_dir, 'launchpad/libs', nsd_id)
-
- if os.path.exists (nsd_dir):
- shutil.rmtree(nsd_dir, ignore_errors=True)
- except Exception as e:
- self._log.error("Exception in cleaning up NSD libs {}: {}".
- format(nsd_id, e))
- self._log.excpetion(e)
-
- @asyncio.coroutine
def on_prepare(dts, acg, xact, xact_info, ks_path, msg, scratch):
""" Prepare callback from DTS for NSD config """
@@ -2767,7 +3352,6 @@
if fref.is_field_deleted():
# Delete an NSD record
self._log.debug("Deleting NSD with id %s", msg.id)
- yield from delete_nsd_libs(msg.id)
self._nsm.delete_nsd(msg.id)
else:
# Add this NSD to scratch to create/update in apply callback
@@ -2777,9 +3361,10 @@
xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+ xpath = self._project.add_project(NsdDtsHandler.XPATH)
self._log.debug(
"Registering for NSD config using xpath: %s",
- NsdDtsHandler.XPATH,
+ xpath,
)
acg_hdl = rift.tasklets.AppConfGroup.Handler(on_apply=on_apply)
@@ -2787,14 +3372,21 @@
# Need a list in scratch to store NSDs to create/update later
# acg._scratch['nsds'] = list()
self._regh = acg.register(
- xpath=NsdDtsHandler.XPATH,
+ xpath=xpath,
flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY | rwdts.Flag.CACHE,
on_prepare=on_prepare)
+ def deregister(self):
+ self._log.debug("De-register NSD handler for project {}".
+ format(self._project.name))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
class VnfdDtsHandler(object):
""" DTS handler for VNFD config changes """
- XPATH = "C,/vnfd:vnfd-catalog/vnfd:vnfd"
+ XPATH = "C,/project-vnfd:vnfd-catalog/project-vnfd:vnfd"
def __init__(self, dts, log, loop, nsm):
self._dts = dts
@@ -2802,6 +3394,7 @@
self._loop = loop
self._nsm = nsm
self._regh = None
+ self._project = nsm._project
@property
def regh(self):
@@ -2812,21 +3405,33 @@
def register(self):
""" Register for VNFD configuration"""
+ if self._regh:
+ self._log.warning("DTS handler already registered for project {}".
+ format(self._project.name))
+ return
+
@asyncio.coroutine
def on_apply(dts, acg, xact, action, scratch):
"""Apply the configuration"""
self._log.debug("Got NSM VNFD apply (xact: %s) (action: %s)(scr: %s)",
xact, action, scratch)
- # Create/Update a VNFD record
- for cfg in self._regh.get_xact_elements(xact):
- # Only interested in those VNFD cfgs whose ID was received in prepare callback
- if cfg.id in scratch.get('vnfds', []):
- self._nsm.update_vnfd(cfg)
+ is_recovery = xact.xact is None and action == rwdts.AppconfAction.INSTALL
- for cfg in self._regh.elements:
- if cfg.id in scratch.get('deleted_vnfds', []):
- yield from self._nsm.delete_vnfd(cfg.id)
+ if self._regh:
+ # Create/Update a VNFD record
+ for cfg in self._regh.get_xact_elements(xact):
+ # Only interested in those VNFD cfgs whose ID was received in prepare callback
+ if cfg.id in scratch.get('vnfds', []) or is_recovery:
+ self._nsm.update_vnfd(cfg)
+
+ for cfg in self._regh.elements:
+ if cfg.id in scratch.get('deleted_vnfds', []):
+ yield from self._nsm.delete_vnfd(cfg.id)
+
+ else:
+ self._log.warning("Reg handle none for {} in project {}".
+ format(self.__class__, self._project))
scratch.pop('vnfds', None)
scratch.pop('deleted_vnfds', None)
@@ -2834,8 +3439,9 @@
@asyncio.coroutine
def on_prepare(dts, acg, xact, xact_info, ks_path, msg, scratch):
""" on prepare callback """
+ xpath = ks_path.to_xpath(NsdYang.get_schema())
self._log.debug("Got on prepare for VNFD (path: %s) (action: %s) (msg: %s)",
- ks_path.to_xpath(RwNsmYang.get_schema()), xact_info.query_action, msg)
+ xpath, xact_info.query_action, msg)
fref = ProtobufC.FieldReference.alloc()
fref.goto_whole_message(msg.to_pbcm())
@@ -2850,44 +3456,62 @@
vnfds = scratch.setdefault('vnfds', [])
vnfds.append(msg.id)
- xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+ try:
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+ except rift.tasklets.dts.ResponseError as e:
+ self._log.warning(
+ "VnfdDtsHandler in project {} with path {} for action {} failed: {}".
+ format(self._project, xpath, xact_info.query_action, e))
+
+ xpath = self._project.add_project(VnfdDtsHandler.XPATH)
self._log.debug(
- "Registering for VNFD config using xpath: %s",
- VnfdDtsHandler.XPATH,
- )
+ "Registering for VNFD config using xpath {} for project {}"
+ .format(xpath, self._project))
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
# acg._scratch['vnfds'] = list()
# acg._scratch['deleted_vnfds'] = list()
self._regh = acg.register(
- xpath=VnfdDtsHandler.XPATH,
+ xpath=xpath,
flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY,
on_prepare=on_prepare)
+ def deregister(self):
+ self._log.debug("De-register VNFD handler for project {}".
+ format(self._project.name))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
+
class NsrRpcDtsHandler(object):
""" The network service instantiation RPC DTS handler """
EXEC_NSR_CONF_XPATH = "I,/nsr:start-network-service"
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)
+ RESTCONF_PORT = 8008
+ NETCONF_USER = "@rift"
+ NETCONF_PW = "rift"
+ REST_BASE_V2_URL = 'https://{}:{}/v2/api/'.format("127.0.0.1",
+ RESTCONF_PORT)
def __init__(self, dts, log, loop, nsm):
self._dts = dts
self._log = log
self._loop = loop
self._nsm = nsm
+ self._project = nsm._project
self._nsd = None
self._ns_regh = None
self._manager = None
- self._nsr_config_url = NsrRpcDtsHandler.REST_BASE_V2_URL + 'config/ns-instance-config'
+ self._nsr_config_url = NsrRpcDtsHandler.REST_BASE_V2_URL + \
+ 'project/{}/'.format(self._project) + \
+ 'config/ns-instance-config'
self._model = RwYang.Model.create_libncx()
self._model.load_schema_ypbc(RwNsrYang.get_schema())
@@ -2934,26 +3558,43 @@
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)
+ response=requests.post(self._nsr_config_url,
+ headers=req_hdr,
+ auth=(NsrRpcDtsHandler.NETCONF_USER, NsrRpcDtsHandler.NETCONF_PW),
+ data=payload_dict,
+ verify=False)
return response
@asyncio.coroutine
def register(self):
""" Register for NS monitoring read from dts """
+
@asyncio.coroutine
def on_ns_config_prepare(xact_info, action, ks_path, msg):
""" prepare callback from dts start-network-service"""
assert action == rwdts.QueryAction.RPC
+
+ if not self._project.rpc_check(msg, xact_info):
+ return
+
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 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))
-
+ if not ('name' in rpc_ip and 'nsd_ref' in rpc_ip and
+ ('cloud_account' in rpc_ip or 'om_datacenter' in rpc_ip)):
+ errmsg = (
+ "Mandatory parameters name or nsd_ref or cloud account not found in start-network-service {}".
+ format(rpc_ip))
+ self._log.error(errmsg)
+ xact_info.send_error_xpath(RwTypes.RwStatus.FAILURE,
+ NsrRpcDtsHandler.EXEC_NSR_CONF_O_XPATH,
+ errmsg)
+ xact_info.respond_xpath(rwdts.XactRspCode.NACK,
+ NsrRpcDtsHandler.EXEC_NSR_CONF_O_XPATH)
+ return
self._log.debug("start-network-service RPC input: {}".format(rpc_ip))
@@ -2963,34 +3604,23 @@
nsd_copy = self.nsm.get_nsd(rpc_ip.nsd_ref)
- #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)
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()
- if k in RwNsrYang.YangData_Nsr_NsInstanceConfig_Nsr().fields}
+ if k in RwNsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr().fields}
ns_instance_config_dict.update(ns_instance_config_copy_dict)
- ns_instance_config = RwNsrYang.YangData_Nsr_NsInstanceConfig_Nsr.from_dict(ns_instance_config_dict)
- ns_instance_config.nsd = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_Nsd()
+ ns_instance_config = RwNsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr.from_dict(ns_instance_config_dict)
+ ns_instance_config.nsd = RwNsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_Nsd()
ns_instance_config.nsd.from_dict(nsd_copy.msg.as_dict())
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,
@@ -3003,20 +3633,26 @@
NsrRpcDtsHandler.EXEC_NSR_CONF_O_XPATH,
rpc_op)
except Exception as e:
- self._log.error("Exception processing the "
- "start-network-service: {}".format(e))
- self._log.exception(e)
+ errmsg = ("Exception processing the "
+ "start-network-service: {}".format(e))
+ self._log.exception(errmsg)
+ xact_info.send_error_xpath(RwTypes.RwStatus.FAILURE,
+ NsrRpcDtsHandler.EXEC_NSR_CONF_O_XPATH,
+ errmsg)
xact_info.respond_xpath(rwdts.XactRspCode.NACK,
NsrRpcDtsHandler.EXEC_NSR_CONF_O_XPATH)
+ self._ns_regh = yield from self._dts.register(
+ xpath=NsrRpcDtsHandler.EXEC_NSR_CONF_XPATH,
+ handler=rift.tasklets.DTS.RegistrationHandler(
+ on_prepare=on_ns_config_prepare),
+ flags=rwdts.Flag.PUBLISHER,
+ )
- hdl_ns = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_ns_config_prepare,)
-
- with self._dts.group_create() as group:
- self._ns_regh = group.register(xpath=NsrRpcDtsHandler.EXEC_NSR_CONF_XPATH,
- handler=hdl_ns,
- flags=rwdts.Flag.PUBLISHER,
- )
+ def deregister(self):
+ if self._ns_regh:
+ self._ns_regh.deregister()
+ self._ns_regh = None
class NsrDtsHandler(object):
@@ -3030,6 +3666,7 @@
self._log = log
self._loop = loop
self._nsm = nsm
+ self._project = self._nsm._project
self._nsr_regh = None
self._scale_regh = None
@@ -3044,13 +3681,18 @@
def register(self):
""" Register for Nsr create/update/delete/read requests from dts """
+ if self._nsr_regh:
+ self._log.warning("DTS handler already registered for project {}".
+ format(self._project.name))
+ return
+
def nsr_id_from_keyspec(ks):
- nsr_path_entry = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr.schema().keyspec_to_entry(ks)
+ nsr_path_entry = RwNsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr.schema().keyspec_to_entry(ks)
nsr_id = nsr_path_entry.key00.id
return nsr_id
def group_name_from_keyspec(ks):
- group_path_entry = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_ScalingGroup.schema().keyspec_to_entry(ks)
+ group_path_entry = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_ScalingGroup.schema().keyspec_to_entry(ks)
group_name = group_path_entry.key00.scaling_group_name_ref
return group_name
@@ -3141,32 +3783,6 @@
for vld in vl_delta["deleted"]:
yield from self._nsm.nsr_terminate_vl(nsr_id, vld)
- def get_add_delete_update_cfgs(dts_member_reg, xact, key_name, scratch):
- # Unfortunately, it is currently difficult to figure out what has exactly
- # changed in this xact without Pbdelta support (RIFT-4916)
- # As a workaround, we can fetch the pre and post xact elements and
- # perform a comparison to figure out adds/deletes/updates
- xact_cfgs = list(dts_member_reg.get_xact_elements(xact))
- curr_cfgs = list(dts_member_reg.elements)
-
- xact_key_map = {getattr(cfg, key_name): cfg for cfg in xact_cfgs}
- curr_key_map = {getattr(cfg, key_name): cfg for cfg in curr_cfgs}
-
- # Find Adds
- added_keys = set(xact_key_map) - set(curr_key_map)
- added_cfgs = [xact_key_map[key] for key in added_keys]
-
- # Find Deletes
- deleted_keys = set(curr_key_map) - set(xact_key_map)
- deleted_cfgs = [curr_key_map[key] for key in deleted_keys]
-
- # Find Updates
- updated_keys = set(curr_key_map) & set(xact_key_map)
- updated_cfgs = [xact_key_map[key] for key in updated_keys
- if xact_key_map[key] != curr_key_map[key]]
-
- 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):
@@ -3180,6 +3796,7 @@
self._log.debug("Got nsr apply (xact: %s) (action: %s)(scr: %s)",
xact, action, scratch)
+ @asyncio.coroutine
def handle_create_nsr(msg, key_pairs=None, restart_mode=False):
# Handle create nsr requests """
# Do some validations
@@ -3190,15 +3807,17 @@
self._log.debug("Creating NetworkServiceRecord %s from nsr config %s",
msg.id, msg.as_dict())
- nsr = self.nsm.create_nsr(msg, key_pairs=key_pairs, restart_mode=restart_mode)
+ nsr = yield from self.nsm.create_nsr(msg,
+ xact,
+ key_pairs=key_pairs,
+ restart_mode=restart_mode)
return nsr
def handle_delete_nsr(msg):
@asyncio.coroutine
def delete_instantiation(ns_id):
""" Delete instantiation """
- with self._dts.transaction() as xact:
- yield from self._nsm.terminate_ns(ns_id, xact)
+ yield from self._nsm.terminate_ns(ns_id, None)
# Handle delete NSR requests
self._log.info("Delete req for NSR Id: %s received", msg.id)
@@ -3206,7 +3825,7 @@
nsr = self._nsm.get_ns_by_nsr_id(msg.id)
nsr.set_state(NetworkServiceRecordState.TERMINATE_RCVD)
- event_descr = "Terminate rcvd for NS Id:%s" % msg.id
+ event_descr = "Terminate rcvd for NS Id: %s, NS Name: %s" % (msg.id, msg.name)
nsr.record_event("terminate-rcvd", event_descr)
self._loop.create_task(delete_instantiation(msg.id))
@@ -3215,9 +3834,18 @@
def begin_instantiation(nsr):
# Begin instantiation
self._log.info("Beginning NS instantiation: %s", nsr.id)
- yield from self._nsm.instantiate_ns(nsr.id, xact)
+ try:
+ yield from self._nsm.instantiate_ns(nsr.id, xact)
+ except Exception as e:
+ self._log.exception(e)
+ raise e
- def on_instantiate_done(fut):
+ @asyncio.coroutine
+ def instantiate_ns(msg, key_pairs, restart_mode=False):
+ nsr = yield from handle_create_nsr(msg, key_pairs, restart_mode=restart_mode)
+ yield from begin_instantiation(nsr)
+
+ def on_instantiate_done(fut, msg):
# If the do_instantiate fails, then publish NSR with failed result
e = fut.exception()
if e is not None:
@@ -3233,18 +3861,28 @@
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, key_pairs, restart_mode=True)
- instantiate_task = self._loop.create_task(begin_instantiation(nsr))
- instantiate_task.add_done_callback(on_instantiate_done)
+ if self._key_pair_regh:
+ for element in self._key_pair_regh.elements:
+ key_pairs.append(element)
+ else:
+ self._log.error("Reg handle none for key pair in project {}".
+ format(self._project))
+ if self._nsr_regh:
+ for element in self._nsr_regh.elements:
+ if element.id not in self.nsm._nsrs:
+ instantiate_task = self._loop.create_task(instantiate_ns(element, key_pairs,
+ restart_mode=True))
+ instantiate_task.add_done_callback(functools.partial(on_instantiate_done, msg=element))
+ else:
+ self._log.error("Reg handle none for NSR in project {}".
+ format(self._project))
+
+ return RwTypes.RwStatus.SUCCESS
(added_msgs, deleted_msgs, updated_msgs) = get_add_delete_update_cfgs(self._nsr_regh,
xact,
- "id",
- scratch)
+ "id")
self._log.debug("Added: %s, Deleted: %s, Updated: %s", added_msgs,
deleted_msgs, updated_msgs)
@@ -3252,9 +3890,8 @@
if msg.id not in self._nsm.nsrs:
self._log.info("Create NSR received in on_apply to instantiate NS:%s", msg.id)
key_pairs = get_nsr_key_pairs(self._key_pair_regh, xact)
- nsr = handle_create_nsr(msg,key_pairs)
- instantiate_task = self._loop.create_task(begin_instantiation(nsr))
- instantiate_task.add_done_callback(on_instantiate_done)
+ instantiate_task = self._loop.create_task(instantiate_ns(msg,key_pairs))
+ instantiate_task.add_done_callback(functools.partial(on_instantiate_done, msg=msg))
for msg in deleted_msgs:
self._log.info("Delete NSR received in on_apply to terminate NS:%s", msg.id)
@@ -3265,7 +3902,6 @@
for msg in updated_msgs:
self._log.info("Update NSR received in on_apply: %s", msg)
-
self._nsm.nsr_update_cfg(msg.id, msg)
if 'nsd' in msg:
@@ -3295,149 +3931,118 @@
xact, action, xact_info, xpath, msg
)
- @asyncio.coroutine
- def delete_instantiation(ns_id):
- """ Delete instantiation """
- yield from self._nsm.terminate_ns(ns_id, None)
-
- def handle_delete_nsr():
- """ Handle delete NSR requests """
- self._log.info("Delete req for NSR Id: %s received", msg.id)
- # Terminate the NSR instance
- nsr = self._nsm.get_ns_by_nsr_id(msg.id)
-
- nsr.set_state(NetworkServiceRecordState.TERMINATE_RCVD)
- event_descr = "Terminate rcvd for NS Id:%s" % msg.id
- nsr.record_event("terminate-rcvd", event_descr)
-
- self._loop.create_task(delete_instantiation(msg.id))
-
fref = ProtobufC.FieldReference.alloc()
fref.goto_whole_message(msg.to_pbcm())
+ def send_err_msg(err_msg):
+ self._log.error(errmsg)
+ xact_info.send_error_xpath(RwTypes.RwStatus.FAILURE,
+ xpath,
+ errmsg)
+ xact_info.respond_xpath(rwdts.XactRspCode.NACK)
+
+
if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE, rwdts.QueryAction.DELETE]:
# if this is an NSR create
if action != rwdts.QueryAction.DELETE and msg.id not in self._nsm.nsrs:
# Ensure the Cloud account/datacenter has been specified
- if not msg.has_field("cloud_account") and not msg.has_field("om_datacenter"):
- raise NsrInstantiationFailed("Cloud account or datacenter not specified in NSR")
+ if not msg.has_field("datacenter") and not msg.has_field("datacenter"):
+ errmsg = ("Cloud account or datacenter not specified in NS {}".
+ format(msg.name))
+ send_err_msg(errmsg)
+ return
# Check if nsd is specified
if not msg.has_field("nsd"):
- raise NsrInstantiationFailed("NSD not specified in NSR")
+ errmsg = ("NSD not specified in NS {}".
+ format(msg.name))
+ send_err_msg(errmsg)
+ return
else:
nsr = self._nsm.nsrs[msg.id]
-
if msg.has_field("nsd"):
if nsr.state != NetworkServiceRecordState.RUNNING:
- raise NsrVlUpdateError("Unable to update VL when NSR not in running state")
+ errmsg = ("Unable to update VL when NS {} not in running state".
+ format(msg.name))
+ send_err_msg(errmsg)
+ return
+
if 'vld' not in msg.nsd or len(msg.nsd.vld) == 0:
- raise NsrVlUpdateError("NS config NSD should have atleast 1 VLD defined")
+ errmsg = ("NS config {} NSD should have atleast 1 VLD".
+ format(msg.name))
+ send_err_msg(errmsg)
+ return
if msg.has_field("scaling_group"):
self._log.debug("ScaleMsg %s", msg)
self._log.debug("NSSCALINGSTATE %s", nsr.state)
if nsr.state != NetworkServiceRecordState.RUNNING:
- raise ScalingOperationError("Unable to perform scaling action when NS is not in running state")
+ errmsg = ("Unable to perform scaling action when NS {} not in running state".
+ format(msg.name))
+ send_err_msg(errmsg)
+ return
if len(msg.scaling_group) > 1:
- raise ScalingOperationError("Only a single scaling group can be configured at a time")
+ errmsg = ("Only a single scaling group can be configured at a time for NS {}".
+ format(msg.name))
+ send_err_msg(errmsg)
+ return
for group_msg in msg.scaling_group:
num_new_group_instances = len(group_msg.instance)
if num_new_group_instances > 1:
- raise ScalingOperationError("Only a single scaling instance can be modified at a time")
+ errmsg = ("Only a single scaling instance can be modified at a time for NS {}".
+ format(msg.name))
+ send_err_msg(errmsg)
+ return
elif num_new_group_instances == 1:
scale_group = nsr.scaling_groups[group_msg.scaling_group_name_ref]
if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE]:
if len(scale_group.instances) == scale_group.max_instance_count:
- raise ScalingOperationError("Max instances for %s reached" % scale_group)
+ errmsg = (" Max instances for {} reached for NS {}".
+ format(str(scale_group), msg.name))
+ send_err_msg(errmsg)
+ return
acg.handle.prepare_complete_ok(xact_info.handle)
- self._log.debug("Registering for NSR config using xpath: %s",
- NsrDtsHandler.NSR_XPATH)
+ xpath = self._project.add_project(NsrDtsHandler.NSR_XPATH)
+ self._log.debug("Registering for NSR config using xpath: {}".
+ format(xpath))
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)
+ self._nsr_regh = acg.register(
+ xpath=xpath,
+ 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=self._project.add_project(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,
- )
+ xpath=self._project.add_project(NsrDtsHandler.KEY_PAIR_XPATH),
+ flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY | rwdts.Flag.CACHE,
+ )
-
-class NsrOpDataDtsHandler(object):
- """ The network service op data DTS handler """
- XPATH = "D,/nsr:ns-instance-opdata/nsr:nsr"
-
- def __init__(self, dts, log, loop, nsm):
- self._dts = dts
- self._log = log
- self._loop = loop
- self._nsm = nsm
- self._regh = None
-
- @property
- def regh(self):
- """ Return the registration handle"""
- return self._regh
-
- @property
- def nsm(self):
- """ Return the NS manager instance """
- return self._nsm
-
- @asyncio.coroutine
- def register(self):
- """ Register for Nsr op data publisher registration"""
- self._log.debug("Registering Nsr op data path %s as publisher",
- NsrOpDataDtsHandler.XPATH)
-
- hdl = rift.tasklets.DTS.RegistrationHandler()
- handlers = rift.tasklets.Group.Handler()
- with self._dts.group_create(handler=handlers) as group:
- self._regh = group.register(xpath=NsrOpDataDtsHandler.XPATH,
- handler=hdl,
- flags=rwdts.Flag.PUBLISHER | rwdts.Flag.NO_PREP_READ | rwdts.Flag.DATASTORE)
-
- @asyncio.coroutine
- def create(self, path, msg):
- """
- Create an NS record in DTS with the path and message
- """
- self._log.debug("Creating NSR %s:%s", path, msg)
- self.regh.create_element(path, msg)
- self._log.debug("Created NSR, %s:%s", path, msg)
-
- @asyncio.coroutine
- def update(self, path, msg, flags=rwdts.XactFlag.REPLACE):
- """
- Update an NS record in DTS with the path and message
- """
- self._log.debug("Updating NSR, %s:%s regh = %s", path, msg, self.regh)
- self.regh.update_element(path, msg, flags)
- self._log.debug("Updated NSR, %s:%s", path, msg)
-
- @asyncio.coroutine
- def delete(self, path):
- """
- Update an NS record in DTS with the path and message
- """
- self._log.debug("Deleting NSR path:%s", path)
- self.regh.delete_element(path)
- self._log.debug("Deleted NSR path:%s", path)
+ def deregister(self):
+ self._log.debug("De-register NSR config for project {}".
+ format(self._project.name))
+ if self._nsr_regh:
+ self._nsr_regh.deregister()
+ self._nsr_regh = None
+ if self._scale_regh:
+ self._scale_regh.deregister()
+ self._scale_regh = None
+ if self._key_pair_regh:
+ self._key_pair_regh.deregister()
+ self._key_pair_regh = None
class VnfrDtsHandler(object):
@@ -3465,11 +4070,10 @@
@asyncio.coroutine
def register(self):
""" Register for vnfr create/update/delete/ advises from dts """
-
- def on_commit(xact_info):
- """ The transaction has been committed """
- self._log.debug("Got vnfr commit (xact_info: %s)", xact_info)
- return rwdts.MemberRspCode.ACTION_OK
+ if self._regh:
+ self._log.warning("VNFR DTS handler already registered for project {}".
+ format(self._project.name))
+ return
@asyncio.coroutine
def on_prepare(xact_info, action, ks_path, msg):
@@ -3480,43 +4084,51 @@
xact_info, action, ks_path, msg
)
- schema = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr.schema()
+ schema = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr.schema()
path_entry = schema.keyspec_to_entry(ks_path)
- if path_entry.key00.id not in self._nsm._vnfrs:
- self._log.error("%s request for non existent record path %s",
+ if not path_entry or (path_entry.key00.id not in self._nsm._vnfrs):
+ # This can happen when using external RO or after delete with monitoring params
+ self._log.debug("%s request for non existent record path %s",
action, xpath)
xact_info.respond_xpath(rwdts.XactRspCode.NA, xpath)
return
- self._log.debug("Deleting VNFR with id %s", path_entry.key00.id)
if action == rwdts.QueryAction.CREATE or action == rwdts.QueryAction.UPDATE:
yield from self._nsm.update_vnfr(msg)
elif action == rwdts.QueryAction.DELETE:
self._log.debug("Deleting VNFR with id %s", path_entry.key00.id)
+
self._nsm.delete_vnfr(path_entry.key00.id)
xact_info.respond_xpath(rwdts.XactRspCode.ACK, xpath)
self._log.debug("Registering for VNFR using xpath: %s",
- VnfrDtsHandler.XPATH,)
+ VnfrDtsHandler.XPATH)
- hdl = rift.tasklets.DTS.RegistrationHandler(on_commit=on_commit,
- on_prepare=on_prepare,)
+ hdl = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare,)
with self._dts.group_create() as group:
- self._regh = group.register(xpath=VnfrDtsHandler.XPATH,
+ self._regh = group.register(xpath=self._nsm._project.add_project(
+ VnfrDtsHandler.XPATH),
handler=hdl,
flags=(rwdts.Flag.SUBSCRIBER),)
+ def deregister(self):
+ self._log.debug("De-register VNFR for project {}".
+ format(self._nsm._project.name))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
class NsManager(object):
""" The Network Service Manager class"""
- def __init__(self, dts, log, loop,
+ def __init__(self, dts, log, loop, project,
nsr_handler, vnfr_handler, vlr_handler, ro_plugin_selector,
vnffgmgr, vnfd_pub_handler, cloud_account_handler):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
self._nsr_handler = nsr_handler
self._vnfr_pub_handler = vnfr_handler
self._vlr_pub_handler = vlr_handler
@@ -3528,19 +4140,20 @@
# Intialize the set of variables for implementing Scaling RPC using REST.
self._headers = {"content-type":"application/json", "accept":"application/json"}
- #This will break when we have rbac in the rift code and admin user password is changed or admin it self is removed.
- self._user = 'admin'
- self._password = 'admin'
+ self._user = '@rift'
+ self._password = 'rift'
self._ip = 'localhost'
self._rport = 8008
- self._conf_url = "https://{ip}:{port}/api/config". \
+ self._conf_url = "https://{ip}:{port}/api/config/project/{project}". \
format(ip=self._ip,
- port=self._rport)
+ port=self._rport,
+ project=self._project.name)
self._nsrs = {}
self._nsds = {}
self._vnfds = {}
self._vnfrs = {}
+ self._nsr_for_vlr = {}
self.cfgmgr_obj = conman.ROConfigManager(log, loop, dts, self)
@@ -3551,8 +4164,8 @@
self._dts_handlers = [self._nsd_dts_handler,
VnfrDtsHandler(dts, log, loop, self),
NsrDtsHandler(dts, log, loop, self),
- ScalingRpcHandler(log, dts, loop, self.scale_rpc_callback),
- NsrRpcDtsHandler(dts,log,loop,self),
+ ScalingRpcHandler(log, dts, loop, self, self.scale_rpc_callback),
+ # NsrRpcDtsHandler(dts, log, loop, self),
self._vnfd_dts_handler,
self.cfgmgr_obj,
]
@@ -3625,8 +4238,17 @@
@asyncio.coroutine
def register(self):
""" Register all static DTS handlers """
+ self._log.debug("Register DTS handlers for project {}".format(self._project))
for dts_handle in self._dts_handlers:
- yield from dts_handle.register()
+ if asyncio.iscoroutinefunction(dts_handle.register):
+ yield from dts_handle.register()
+ else:
+ dts_handle.register()
+
+ def deregister(self):
+ """ Register all static DTS handlers """
+ for dts_handle in self._dts_handlers:
+ dts_handle.deregister()
def get_ns_by_nsr_id(self, nsr_id):
@@ -3670,7 +4292,7 @@
def get_scaling_group_information():
scaling_group_url = "{url}/ns-instance-config/nsr/{nsr_id}".format(url=self._conf_url, nsr_id=msg.nsr_id_ref)
output = requests.get(scaling_group_url, headers=self._headers, auth=(self._user, self._password), verify=False)
- if output.text == None or len(output.text) == 0:
+ if output.text is None or len(output.text) == 0:
self.log.error("nsr id %s information not present", self._nsr_id)
return None
scaling_group_info = json.loads(output.text)
@@ -3678,14 +4300,15 @@
def config_scaling_group_information(scaling_group_info):
data_str = json.dumps(scaling_group_info)
- self.log.debug("scaling group Info %s", data_str)
scale_out_url = "{url}/ns-instance-config/nsr/{nsr_id}".format(url=self._conf_url, nsr_id=msg.nsr_id_ref)
- response = requests.put(scale_out_url, data=data_str, verify=False, auth=(self._user, self._password), headers=self._headers)
+ response = requests.put(scale_out_url, data=data_str, verify=False,
+ auth=(self._user, self._password), headers=self._headers)
response.raise_for_status()
def scale_out():
scaling_group_info = get_scaling_group_information()
+ self._log.debug("Scale out info: {}".format(scaling_group_info))
if scaling_group_info is None:
return
@@ -3704,7 +4327,8 @@
scaling_group["instance"].append({"id": int(msg.instance_id)})
if not scaling_group_present:
- scaling_group_info["nsr:nsr"]["scaling-group"] = [{"scaling-group-name-ref": msg.scaling_group_name_ref, "instance": [{"id": msg.instance_id}]}]
+ scaling_group_info["nsr:nsr"]["scaling-group"] = [{"scaling-group-name-ref": msg.scaling_group_name_ref,
+ "instance": [{"id": msg.instance_id}]}]
config_scaling_group_information(scaling_group_info)
return
@@ -3749,7 +4373,7 @@
nsr.nsr_cfg_msg= msg
def nsr_instantiate_vl(self, nsr_id, vld):
- self.log.debug("NSR {} create VL {}".format(nsr_id, vld))
+ self.log.error("NSR {} create VL {}".format(nsr_id, vld))
nsr = self._nsrs[nsr_id]
if nsr.state != NetworkServiceRecordState.RUNNING:
raise NsrVlUpdateError("Cannot perform VL instantiate if NSR is not in running state")
@@ -3766,7 +4390,8 @@
# 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, key_pairs=None,restart_mode=False):
+ @asyncio.coroutine
+ def create_nsr(self, nsr_msg, config_xact, key_pairs=None,restart_mode=False):
""" Create an NSR instance """
self._log.debug("NSRMSG %s", nsr_msg)
if nsr_msg.id in self._nsrs:
@@ -3774,12 +4399,18 @@
self._log.error(msg)
raise NetworkServiceRecordError(msg)
- self._log.info("Create NetworkServiceRecord nsr id %s from nsd_id %s",
+ self._log.debug("Create NetworkServiceRecord nsr id %s from nsd_id %s",
nsr_msg.id,
nsr_msg.nsd.id)
- nsm_plugin = self._ro_plugin_selector.ro_plugin
- sdn_account_name = self._cloud_account_handler.get_cloud_account_sdn_name(nsr_msg.cloud_account)
+ nsm_plugin = self._ro_plugin_selector.get_ro_plugin(nsr_msg.resource_orchestrator)
+ #Work Around - openmano expects datacenter id instead of datacenter name
+ if isinstance(nsm_plugin, openmano_nsm.OpenmanoNsPlugin):
+ for uuid, name in nsm_plugin._cli_api.datacenter_list():
+ if name == nsr_msg.datacenter:
+ nsr_msg.datacenter = uuid
+
+ sdn_account_name = self._cloud_account_handler.get_cloud_account_sdn_name(nsr_msg.datacenter)
nsr = NetworkServiceRecord(self._dts,
self._log,
@@ -3789,11 +4420,26 @@
nsr_msg,
sdn_account_name,
key_pairs,
+ self._project,
restart_mode=restart_mode,
- vlr_handler=self._ro_plugin_selector._records_publisher._vlr_pub_hdlr
+ vlr_handler=self._vlr_pub_handler
)
self._nsrs[nsr_msg.id] = nsr
- nsm_plugin.create_nsr(nsr_msg, nsr_msg.nsd, key_pairs)
+
+ try:
+ # Generate ssh key pair if required
+ nsr.generate_ssh_key_pair(config_xact)
+ except Exception as e:
+ self._log.exception("SSH key: {}".format(e))
+
+ self._log.debug("NSR {}: SSh key generated: {}".format(nsr_msg.name,
+ nsr.public_key))
+
+ ssh_key = {'private_key': nsr.private_key,
+ 'public_key': nsr.public_key
+ }
+
+ nsm_plugin.create_nsr(nsr_msg, nsr_msg.nsd, key_pairs, ssh_key=ssh_key)
return nsr
@@ -3813,7 +4459,11 @@
raise NetworkServiceRecordError(err)
nsr = self._nsrs[nsr_id]
- yield from nsr.nsm_plugin.instantiate_ns(nsr, config_xact)
+ try:
+ yield from nsr.nsm_plugin.instantiate_ns(nsr, config_xact)
+ except Exception as e:
+ self._log.exception("NS instantiate: {}".format(e))
+ raise e
@asyncio.coroutine
def update_vnfr(self, vnfr):
@@ -3821,10 +4471,18 @@
vnfr_state = self._vnfrs[vnfr.id].state
self._log.debug("Updating VNFR with state %s: vnfr %s", vnfr_state, vnfr)
-
+
+ no_of_active_vms = 0
+ for vdur in vnfr.vdur:
+ if vdur.operational_status == 'running':
+ no_of_active_vms += 1
+
+ self._vnfrs[vnfr.id]._active_vdus = no_of_active_vms
yield from self._vnfrs[vnfr.id].update_state(vnfr)
nsr = self.find_nsr_for_vnfr(vnfr.id)
- yield from nsr.update_state()
+ if nsr is not None:
+ nsr._vnf_inst_started = False
+ yield from nsr.update_state()
def find_nsr_for_vnfr(self, vnfr_id):
""" Find the NSR which )has the passed vnfr id"""
@@ -3840,7 +4498,7 @@
@asyncio.coroutine
def get_nsr_config(self, nsd_id):
- xpath = "C,/nsr:ns-instance-config"
+ xpath = self._project.add_project("C,/nsr:ns-instance-config")
results = yield from self._dts.query_read(xpath, rwdts.XactFlag.MERGE)
for result in results:
@@ -3976,6 +4634,9 @@
Terminate network service for the given NSR Id
"""
+ if nsr_id not in self._nsrs:
+ return
+
# Terminate the instances/networks assocaited with this nw service
self._log.debug("Terminating the network service %s", nsr_id)
try :
@@ -3983,64 +4644,96 @@
except Exception as e:
self.log.exception("Failed to terminate NSR[id=%s]", nsr_id)
- # Unpublish the NSR record
- self._log.debug("Unpublishing the network service %s", nsr_id)
- yield from self._nsrs[nsr_id].unpublish(xact)
+ def vlr_event(self, vlr, action):
+ self._log.debug("Received VLR %s with action:%s", vlr, action)
+ # Find the NS and see if we can proceed
+ nsr = self.find_nsr_for_vlr_id(vlr.id)
+ if nsr is None:
+ self._log.error("VLR %s:%s received for NSR, state:%s",
+ vlr.id, vlr.name, vlr.operational_status)
+ return
+ nsr.vlr_event(vlr, action)
- # Finaly delete the NS instance from this NS Manager
- self._log.debug("Deletng the network service %s", nsr_id)
- self.delete_nsr(nsr_id)
+ def add_vlr_id_nsr_map(self, vlr_id, nsr):
+ """ Add a mapping for vlr_id into NSR """
+ self._nsr_for_vlr[vlr_id] = nsr
+
+ def remove_vlr_id_nsr_map(self, vlr_id):
+ """ Remove a mapping for vlr_id into NSR """
+ if vlr_id in self._nsr_for_vlr:
+ del self._nsr_for_vlr[vlr_id]
+
+ def find_nsr_for_vlr_id(self, vlr_id):
+ """ Find NSR for VLR id """
+ nsr = None
+ if vlr_id in self._nsr_for_vlr:
+ nsr = self._nsr_for_vlr[vlr_id]
+ return nsr
class NsmRecordsPublisherProxy(object):
""" This class provides a publisher interface that allows plugin objects
to publish NSR/VNFR/VLR"""
- def __init__(self, dts, log, loop, nsr_pub_hdlr, vnfr_pub_hdlr, vlr_pub_hdlr):
+ def __init__(self, dts, log, loop, project, nsr_pub_hdlr,
+ vnfr_pub_hdlr, vlr_pub_hdlr,):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
self._nsr_pub_hdlr = nsr_pub_hdlr
self._vlr_pub_hdlr = vlr_pub_hdlr
self._vnfr_pub_hdlr = vnfr_pub_hdlr
@asyncio.coroutine
+ def publish_nsr_opdata(self, xact, nsr):
+ """ Publish an NSR """
+ path = ("D,/nsr:ns-instance-opdata" + "/nsr:nsr[nsr:ns-instance-config-ref={}]"
+ ).format(quoted_key(nsr.ns_instance_config_ref))
+ return (yield from self._nsr_pub_hdlr.update(xact, path, nsr))
+
+ @asyncio.coroutine
def publish_nsr(self, xact, nsr):
""" Publish an NSR """
- path = NetworkServiceRecord.xpath_from_nsr(nsr)
+ path = self._project.add_project(NetworkServiceRecord.xpath_from_nsr(nsr))
return (yield from self._nsr_pub_hdlr.update(xact, path, nsr))
@asyncio.coroutine
def unpublish_nsr(self, xact, nsr):
""" Unpublish an NSR """
- path = NetworkServiceRecord.xpath_from_nsr(nsr)
+ path = self._project.add_project(NetworkServiceRecord.xpath_from_nsr(nsr))
return (yield from self._nsr_pub_hdlr.delete(xact, path))
@asyncio.coroutine
def publish_vnfr(self, xact, vnfr):
""" Publish an VNFR """
- path = VirtualNetworkFunctionRecord.vnfr_xpath(vnfr)
+ path = self._project.add_project(VirtualNetworkFunctionRecord.vnfr_xpath(vnfr))
return (yield from self._vnfr_pub_hdlr.update(xact, path, vnfr))
@asyncio.coroutine
def unpublish_vnfr(self, xact, vnfr):
""" Unpublish a VNFR """
- path = VirtualNetworkFunctionRecord.vnfr_xpath(vnfr)
- return (yield from self._vnfr_pub_hdlr.delete(xact, path))
+ path = self._project.add_project(VirtualNetworkFunctionRecord.vnfr_xpath(vnfr))
+ yield from self._vnfr_pub_hdlr.delete(xact, path)
+ # NOTE: The regh delete does not send the on_prepare to VNFM tasklet as well
+ # as remove all the VNFR elements. So need to send this additional delete block.
+ with self._dts.transaction(flags = 0) as xact:
+ block = xact.block_create()
+ block.add_query_delete(path)
+ yield from block.execute(flags=0, now=True)
@asyncio.coroutine
def publish_vlr(self, xact, vlr):
""" Publish a VLR """
- path = VirtualLinkRecord.vlr_xpath(vlr)
+ path = self._project.add_project(VirtualLinkRecord.vlr_xpath(vlr))
return (yield from self._vlr_pub_hdlr.update(xact, path, vlr))
@asyncio.coroutine
def unpublish_vlr(self, xact, vlr):
""" Unpublish a VLR """
- path = VirtualLinkRecord.vlr_xpath(vlr)
+ path = self._project.add_project(VirtualLinkRecord.vlr_xpath(vlr))
return (yield from self._vlr_pub_hdlr.delete(xact, path))
-
class ScalingRpcHandler(mano_dts.DtsHandler):
""" The Network service Monitor DTS handler """
SCALE_IN_INPUT_XPATH = "I,/nsr:exec-scale-in"
@@ -4051,22 +4744,48 @@
ACTION = Enum('ACTION', 'SCALE_IN SCALE_OUT')
- def __init__(self, log, dts, loop, callback=None):
- super().__init__(log, dts, loop)
+ def __init__(self, log, dts, loop, nsm, callback=None):
+ super().__init__(log, dts, loop, nsm._project)
+ self._nsm = nsm
self.callback = callback
self.last_instance_id = defaultdict(int)
+ self._reg_in = None
+ self._reg_out = None
+
@asyncio.coroutine
def register(self):
+ def send_err_msg(err_msg, xact_info, ks_path, e=False):
+ xpath = ks_path.to_xpath(NsrYang.get_schema())
+ if e:
+ self._log.exception(err_msg)
+ else:
+ self._log.error(err_msg)
+ xact_info.send_error_xpath(RwTypes.RwStatus.FAILURE,
+ xpath,
+ err_msg)
+ xact_info.respond_xpath(rwdts.XactRspCode.NACK)
+
@asyncio.coroutine
def on_scale_in_prepare(xact_info, action, ks_path, msg):
assert action == rwdts.QueryAction.RPC
+ self._log.debug("Scale in called: {}".format(msg.as_dict()))
+ if not self.project.rpc_check(msg, xact_info):
+ return
+
try:
rpc_op = NsrYang.YangOutput_Nsr_ExecScaleIn.from_dict({
"instance_id": msg.instance_id})
+ nsr = self._nsm.nsrs[msg.nsr_id_ref]
+ if nsr.state != NetworkServiceRecordState.RUNNING:
+ errmsg = ("Unable to perform scaling action when NS {}({}) not in running state".
+ format(nsr.name, nsr.id))
+ send_err_msg(errmsg, xact_info, ks_path)
+ return
+
xact_info.respond_xpath(
rwdts.XactRspCode.ACK,
self.__class__.SCALE_IN_OUTPUT_XPATH,
@@ -4074,16 +4793,20 @@
if self.callback:
self.callback(xact_info.xact, msg, self.ACTION.SCALE_IN)
+
except Exception as e:
- self.log.exception(e)
- xact_info.respond_xpath(
- rwdts.XactRspCode.NACK,
- self.__class__.SCALE_IN_OUTPUT_XPATH)
+ errmsg = ("Exception doing scale in using {}: {}".
+ format(msg, e))
+ send_err_msg(errmsg, xact_info, ks_path, e=True)
@asyncio.coroutine
def on_scale_out_prepare(xact_info, action, ks_path, msg):
assert action == rwdts.QueryAction.RPC
+ self._log.debug("Scale out called: {}".format(msg.as_dict()))
+ if not self.project.rpc_check(msg, xact_info):
+ return
+
try:
scaling_group = msg.scaling_group_name_ref
if not msg.instance_id:
@@ -4091,6 +4814,13 @@
msg.instance_id = last_instance_id + 1
self.last_instance_id[scale_group] += 1
+ nsr = self._nsm.nsrs[msg.nsr_id_ref]
+ if nsr.state != NetworkServiceRecordState.RUNNING:
+ errmsg = ("Unable to perform scaling action when NS {}({}) not in running state".
+ format(nsr.name, nsr.id))
+ send_err_msg(errmsg, xact_info, ks_path)
+ return
+
rpc_op = NsrYang.YangOutput_Nsr_ExecScaleOut.from_dict({
"instance_id": msg.instance_id})
@@ -4101,26 +4831,158 @@
if self.callback:
self.callback(xact_info.xact, msg, self.ACTION.SCALE_OUT)
+
except Exception as e:
- self.log.exception(e)
- xact_info.respond_xpath(
- rwdts.XactRspCode.NACK,
- self.__class__.SCALE_OUT_OUTPUT_XPATH)
+ errmsg = ("Exception doing scale in using {}: {}".
+ format(msg, e))
+ send_err_msg(errmsg, xact_info, ks_path, e=True)
- scale_in_hdl = rift.tasklets.DTS.RegistrationHandler(
- on_prepare=on_scale_in_prepare)
- scale_out_hdl = rift.tasklets.DTS.RegistrationHandler(
- on_prepare=on_scale_out_prepare)
+ self._reg_in = yield from self.dts.register(
+ xpath=self.__class__.SCALE_IN_INPUT_XPATH,
+ handler=rift.tasklets.DTS.RegistrationHandler(
+ on_prepare=on_scale_in_prepare),
+ flags=rwdts.Flag.PUBLISHER)
- with self.dts.group_create() as group:
- group.register(
- 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)
+ self._reg_out = yield from self.dts.register(
+ xpath=self.__class__.SCALE_OUT_INPUT_XPATH,
+ handler=rift.tasklets.DTS.RegistrationHandler(
+ on_prepare=on_scale_out_prepare),
+ flags=rwdts.Flag.PUBLISHER)
+
+ def deregister(self):
+ if self._reg_in:
+ self._reg_in.deregister()
+ self._reg_in = None
+
+ if self._reg_out:
+ self._reg_out.deregister()
+ self._reg_out = None
+
+
+class NsmProject(ManoProject):
+
+ def __init__(self, name, tasklet, **kw):
+ super(NsmProject, self).__init__(tasklet.log, name)
+ self.update(tasklet)
+ self._nsm = None
+
+ self._ro_plugin_selector = None
+ self._vnffgmgr = None
+
+ self._nsr_pub_handler = None
+ self._vnfr_pub_handler = None
+ self._vlr_pub_handler = None
+ self._vnfd_pub_handler = None
+ self._scale_cfg_handler = None
+
+ self._records_publisher_proxy = None
+
+ def vlr_event(self, vlr, action):
+ """ VLR Event callback """
+ self.log.debug("VLR Event received for VLR %s with action %s", vlr, action)
+ self._nsm.vlr_event(vlr, action)
+
+ @asyncio.coroutine
+ def register(self):
+ self.log.debug("Register NsmProject for {}".format(self.name))
+
+ self._nsr_pub_handler = publisher.NsrOpDataDtsHandler(
+ self._dts, self.log, self.loop, self)
+ yield from self._nsr_pub_handler.register()
+
+ self._vnfr_pub_handler = publisher.VnfrPublisherDtsHandler(
+ self._dts, self.log, self.loop, self)
+ yield from self._vnfr_pub_handler.register()
+
+ self._vlr_pub_handler = publisher.VlrPublisherDtsHandler(
+ self._dts, self.log, self.loop, self)
+ yield from self._vlr_pub_handler.register()
+
+ self._vlr_sub_handler = subscriber.VlrSubscriberDtsHandler(self.log,
+ self._dts,
+ self.loop,
+ self,
+ self.vlr_event,
+ )
+ yield from self._vlr_sub_handler.register()
+
+ manifest = self._tasklet.tasklet_info.get_pb_manifest()
+ use_ssl = manifest.bootstrap_phase.rwsecurity.use_ssl
+ ssl_cert = manifest.bootstrap_phase.rwsecurity.cert
+ ssl_key = manifest.bootstrap_phase.rwsecurity.key
+
+ self._vnfd_pub_handler = publisher.VnfdPublisher(
+ use_ssl, ssl_cert, ssl_key, self.loop, self)
+
+ self._records_publisher_proxy = NsmRecordsPublisherProxy(
+ self._dts,
+ self.log,
+ self.loop,
+ self,
+ 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.ROAccountConfigSubscriber(
+ self._dts,
+ self.log,
+ self.loop,
+ self,
+ 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,
+ )
+
+ yield from self._cloud_account_handler.register()
+
+ self._vnffgmgr = rwvnffgmgr.VnffgMgr(self._dts, self.log, self.log_hdl, self.loop,
+ self, self._cloud_account_handler)
+ yield from self._vnffgmgr.register()
+
+ self._nsm = NsManager(
+ self._dts,
+ self.log,
+ self.loop,
+ self,
+ 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()
+ self.log.debug("Register NsmProject for {} complete".format(self.name))
+
+ def deregister(self):
+ self._log.debug("Project {} de-register".format(self.name))
+ self._nsm.deregister()
+ self._vnffgmgr.deregister()
+ self._cloud_account_handler.deregister()
+ self._ro_plugin_selector.deregister()
+ self._nsr_pub_handler.deregister()
+ self._vnfr_pub_handler.deregister()
+ self._vlr_pub_handler.deregister()
+ self._vlr_sub_handler.deregister()
+ self._nsm = None
+
+ @asyncio.coroutine
+ def delete_prepare(self):
+ if self._nsm and self._nsm._nsrs:
+ delete_msg = "Project has NSR associated with it. Delete all Project NSR and try again."
+ return False, delete_msg
+ return True, "True"
class NsmTasklet(rift.tasklets.Tasklet):
@@ -4133,18 +4995,12 @@
self.rwlog.set_subcategory("nsm")
self._dts = None
- self._nsm = None
+ self.project_handler = None
+ self.projects = {}
- self._ro_plugin_selector = None
- self._vnffgmgr = None
-
- self._nsr_handler = None
- self._vnfr_pub_handler = None
- self._vlr_pub_handler = None
- self._vnfd_pub_handler = None
- self._scale_cfg_handler = None
-
- self._records_publisher_proxy = None
+ @property
+ def dts(self):
+ return self._dts
def start(self):
""" The task start callback """
@@ -4175,67 +5031,11 @@
""" Task init callback """
self.log.debug("Got instance started callback")
- self.log.debug("creating config account handler")
+ self.log.debug("creating project handler")
+ self.project_handler = ProjectHandler(self, NsmProject)
+ self.project_handler.register()
- self._nsr_pub_handler = publisher.NsrOpDataDtsHandler(self._dts, self.log, self.loop)
- yield from self._nsr_pub_handler.register()
- self._vnfr_pub_handler = publisher.VnfrPublisherDtsHandler(self._dts, self.log, self.loop)
- yield from self._vnfr_pub_handler.register()
-
- self._vlr_pub_handler = publisher.VlrPublisherDtsHandler(self._dts, self.log, self.loop)
- yield from self._vlr_pub_handler.register()
-
- manifest = self.tasklet_info.get_pb_manifest()
- use_ssl = manifest.bootstrap_phase.rwsecurity.use_ssl
- ssl_cert = manifest.bootstrap_phase.rwsecurity.cert
- ssl_key = manifest.bootstrap_phase.rwsecurity.key
-
- 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,
- )
-
- # 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,
- )
- yield from self._ro_plugin_selector.register()
-
- self._cloud_account_handler = cloud.CloudAccountConfigSubscriber(
- self._log,
- self._dts,
- self.log_hdl)
-
- yield from self._cloud_account_handler.register()
-
- self._vnffgmgr = rwvnffgmgr.VnffgMgr(self._dts, self.log, self.log_hdl, self.loop)
- 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
- )
-
- yield from self._nsm.register()
@asyncio.coroutine
def run(self):
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwvnffgmgr.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwvnffgmgr.py
index 4d6cde4..67deeb5 100755
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwvnffgmgr.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/rwvnffgmgr.py
@@ -1,6 +1,6 @@
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -61,25 +61,32 @@
class VnffgMgr(object):
""" Implements the interface to backend plugins to fetch topology """
- def __init__(self, dts, log, log_hdl, loop):
+ def __init__(self, dts, log, log_hdl, loop, project, cloud_account_handler):
self._account = {}
self._dts = dts
self._log = log
self._log_hdl = log_hdl
self._loop = loop
+ self._cloud_account_handler = cloud_account_handler
+ self._project = project
self._sdn = {}
- self._sdn_handler = SDNAccountDtsHandler(self._dts,self._log,self)
+ self._sdn_handler = SDNAccountDtsHandler(self._dts, self._log, self)
self._vnffgr_list = {}
@asyncio.coroutine
def register(self):
yield from self._sdn_handler.register()
+ def deregister(self):
+ self._log.debug("Project {} de-register vnffgmgr".
+ format(self._project.name))
+ self._sdn_handler.deregister()
+
def set_sdn_account(self,account):
if (account.name in self._account):
self._log.error("SDN Account is already set")
else:
- sdn_account = RwsdnalYang.SDNAccount()
+ sdn_account = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
sdn_account.from_dict(account.as_dict())
sdn_account.name = account.name
self._account[account.name] = sdn_account
@@ -102,7 +109,7 @@
def get_sdn_account(self, name):
"""
- Creates an object for class RwsdnalYang.SdnAccount()
+ Creates an object for class RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
"""
if (name in self._account):
return self._account[name]
@@ -137,7 +144,10 @@
self._log.error("VNFFGR with id %s not present in VNFFGMgr", vnffgr_id)
msg = "VNFFGR with id {} not present in VNFFGMgr".format(vnffgr_id)
raise VnffgrDoesNotExist(msg)
- self.update_vnffgrs(self._vnffgr_list[vnffgr_id].sdn_account)
+ sdn_acct = self.get_sdn_account(self._vnffgr_list[vnffgr_id].sdn_account)
+ self._log.debug("SDN account received during vnffg update is %s",sdn_acct)
+ if sdn_acct.account_type != 'openstack':
+ self.update_vnffgrs(self._vnffgr_list[vnffgr_id].sdn_account)
vnffgr = self._vnffgr_list[vnffgr_id].deep_copy()
self._log.debug("VNFFGR for id %s is %s",vnffgr_id,vnffgr)
return vnffgr
@@ -172,7 +182,7 @@
sdn_plugin = self.get_sdn_plugin(sdn_acct_name)
for rsp in vnffgr.rsp:
- vnffg = RwsdnalYang.VNFFGChain()
+ vnffg = RwsdnalYang.YangData_RwProject_Project_Vnffgs_VnffgChain()
vnffg.name = rsp.name
vnffg.classifier_name = rsp.classifier_name
@@ -212,7 +222,7 @@
vnffgr.operational_status = 'failed'
msg = "Instantiation of VNFFGR with id {} failed".format(vnffgr.id)
raise VnffgrCreationFailed(msg)
-
+ rsp.rsp_id = rs
self._log.info("VNFFG chain created successfully for rsp with id %s",rsp.id)
@@ -227,12 +237,15 @@
vnffgr_cl = [_classifier for _classifier in vnffgr.classifier if classifier.id == _classifier.id]
if len(vnffgr_cl) > 0:
cl_rsp_name = vnffgr_cl[0].rsp_name
+ rsp_ids = [rsp.rsp_id for rsp in vnffgr.rsp if rsp.name == cl_rsp_name]
+ self._log.debug("Received RSP id for Cl is %s",rsp_ids)
else:
self._log.error("No RSP wiht name %s found; Skipping classifier %s creation",classifier.rsp_id_ref,classifier.name)
continue
- vnffgcl = RwsdnalYang.VNFFGClassifier()
+ vnffgcl = RwsdnalYang.YangData_RwProject_Project_VnffgClassifiers_VnffgClassifier()
vnffgcl.name = classifier.name
vnffgcl.rsp_name = cl_rsp_name
+ vnffgcl.rsp_id = rsp_ids[0]
vnffgcl.port_id = vnffgr_cl[0].port_id
vnffgcl.vm_id = vnffgr_cl[0].vm_id
# Get the symmetric classifier endpoint ip and set it in nsh ctx1
@@ -248,9 +261,11 @@
#acl.name = vnffgcl.name + str(index)
acl.name = match_rule.id
acl.ip_proto = match_rule.ip_proto
- acl.source_ip_address = match_rule.source_ip_address + '/32'
+ if match_rule.source_ip_address:
+ acl.source_ip_address = match_rule.source_ip_address + '/32'
acl.source_port = match_rule.source_port
- acl.destination_ip_address = match_rule.destination_ip_address + '/32'
+ if match_rule.destination_ip_address:
+ acl.destination_ip_address = match_rule.destination_ip_address + '/32'
acl.destination_port = match_rule.destination_port
self._log.debug(" Creating VNFFG Classifier Classifier %s for RSP: %s",vnffgcl.name,vnffgcl.rsp_name)
@@ -260,9 +275,14 @@
#vnffgr.operational_status = 'failed'
#msg = "Instantiation of VNFFGR with id {} failed".format(vnffgr.id)
#raise VnffgrCreationFailed(msg)
+ else:
+ vnffgr_cl[0].classifier_id = rs
vnffgr.operational_status = 'running'
- self.update_vnffgrs(vnffgr.sdn_account)
+ sdn_acct = self.get_sdn_account(vnffgr.sdn_account)
+ self._log.debug("SDN account received during vnffg update is %s",sdn_acct)
+ if sdn_acct.account_type != 'openstack':
+ self.update_vnffgrs(vnffgr.sdn_account)
return vnffgr
def update_vnffgrs(self,sdn_acct_name):
@@ -318,8 +338,17 @@
sdn_account = [sdn_account.name for _,sdn_account in self._account.items()]
sdn_account_name = sdn_account[0]
sdn_plugin = self.get_sdn_plugin(sdn_account_name)
- sdn_plugin.terminate_vnffg_chain(self._account[sdn_account_name],vnffgr_id)
- sdn_plugin.terminate_vnffg_classifier(self._account[sdn_account_name],vnffgr_id)
+ vnffgr = self._vnffgr_list[vnffgr_id]
+ sdn_acct = self.get_sdn_account(vnffgr.sdn_account)
+ self._log.debug("SDN account received during vnffg update is %s",sdn_acct)
+ if sdn_acct.account_type == 'openstack':
+ for rsp in vnffgr.rsp:
+ sdn_plugin.terminate_vnffg_chain(self._account[sdn_account_name],rsp.rsp_id)
+ for classifier in vnffgr.classifier:
+ sdn_plugin.terminate_vnffg_classifier(self._account[sdn_account_name],classifier.classifier_id)
+ else:
+ sdn_plugin.terminate_vnffg_chain(self._account[sdn_account_name],vnffgr_id)
+ sdn_plugin.terminate_vnffg_classifier(self._account[sdn_account_name],vnffgr_id)
del self._vnffgr_list[vnffgr_id]
class SDNAccountDtsHandler(object):
@@ -329,8 +358,10 @@
self._dts = dts
self._log = log
self._parent = parent
+ self._project = self._parent._project
self._sdn_account = {}
+ self._reg = None
def _set_sdn_account(self, account):
self._log.info("Setting sdn account: {}".format(account))
@@ -355,8 +386,15 @@
def register(self):
def apply_config(dts, acg, xact, action, _):
self._log.debug("Got sdn account apply config (xact: %s) (action: %s)", xact, action)
- if action == rwdts.AppconfAction.INSTALL and xact.id is None:
- self._log.debug("No xact handle. Skipping apply config")
+ if xact.id is None:
+ if action == rwdts.AppconfAction.INSTALL:
+ curr_cfg = self._reg.elements
+ for cfg in curr_cfg:
+ self._log.info("Config Agent Account {} being re-added after restart.".
+ format(cfg.name))
+ self._set_sdn_account(cfg)
+ else:
+ self._log.debug("No xact handle. Skipping apply config")
return RwTypes.RwStatus.SUCCESS
return RwTypes.RwStatus.SUCCESS
@@ -380,9 +418,11 @@
if msg.has_field("account_type"):
errmsg = "Cannot update SDN account's account-type."
self._log.error(errmsg)
- xact_info.send_error_xpath(RwTypes.RwStatus.FAILURE,
- SDNAccountDtsHandler.XPATH,
- errmsg)
+ xact_info.send_error_xpath(
+ RwTypes.RwStatus.FAILURE,
+ self._project.add_project(SDNAccountDtsHandler.XPATH),
+ errmsg
+ )
raise SdnAccountError(errmsg)
# Update the sdn account record
@@ -392,9 +432,11 @@
if not msg.has_field('account_type'):
errmsg = "New SDN account must contain account-type field."
self._log.error(errmsg)
- xact_info.send_error_xpath(RwTypes.RwStatus.FAILURE,
- SDNAccountDtsHandler.XPATH,
- errmsg)
+ xact_info.send_error_xpath(
+ RwTypes.RwStatus.FAILURE,
+ self._project.add_project(SDNAccountDtsHandler.XPATH),
+ errmsg
+ )
raise SdnAccountError(errmsg)
# Set the sdn account record
@@ -403,20 +445,23 @@
xact_info.respond_xpath(rwdts.XactRspCode.ACK)
- self._log.debug("Registering for Sdn Account config using xpath: %s",
- SDNAccountDtsHandler.XPATH,
- )
+ xpath = self._project.add_project(SDNAccountDtsHandler.XPATH)
+ self._log.debug("Registering for Sdn Account config using xpath: {}".
+ format(xpath))
acg_handler = rift.tasklets.AppConfGroup.Handler(
on_apply=apply_config,
)
with self._dts.appconf_group_create(acg_handler) as acg:
- acg.register(
- xpath=SDNAccountDtsHandler.XPATH,
- flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY,
- on_prepare=on_prepare
- )
+ self._reg = acg.register(
+ xpath=xpath,
+ flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY,
+ on_prepare=on_prepare
+ )
-
-
+ def deregister(self):
+ self._log.debug("De-register SDN Account handler in vnffg for project".
+ format(self._project.name))
+ self._reg.deregister()
+ self._reg = None
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/scale_group.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/scale_group.py
index 8bbf894..e53223f 100644
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/scale_group.py
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/scale_group.py
@@ -1,6 +1,6 @@
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -19,7 +19,15 @@
from enum import Enum
-from gi.repository import NsdYang, NsrYang
+import gi
+gi.require_version('NsdBaseYang', '1.0')
+gi.require_version('ProjectNsdYang', '1.0')
+gi.require_version('NsrYang', '1.0')
+from gi.repository import (
+ NsdBaseYang,
+ ProjectNsdYang as NsdYang,
+ NsrYang
+ )
class ScalingGroupIndexExists(Exception):
@@ -104,7 +112,7 @@
def create_record_msg(self):
""" Returns a NSR Scaling group record """
- msg = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_ScalingGroupRecord(
+ msg = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_ScalingGroupRecord(
scaling_group_name_ref=self.name,
)
@@ -151,10 +159,10 @@
def trigger_map(self, trigger):
trig_map = {
- NsdYang.ScalingTrigger.PRE_SCALE_IN : 'pre_scale_in',
- NsdYang.ScalingTrigger.POST_SCALE_IN : 'post_scale_in',
- NsdYang.ScalingTrigger.PRE_SCALE_OUT : 'pre_scale_out',
- NsdYang.ScalingTrigger.POST_SCALE_OUT : 'post_scale_out',
+ NsdBaseYang.ScalingTrigger.PRE_SCALE_IN : 'pre_scale_in',
+ NsdBaseYang.ScalingTrigger.POST_SCALE_IN : 'post_scale_in',
+ NsdBaseYang.ScalingTrigger.PRE_SCALE_OUT : 'pre_scale_out',
+ NsdBaseYang.ScalingTrigger.POST_SCALE_OUT : 'post_scale_out',
}
try:
@@ -259,7 +267,7 @@
return self._vnfrs.values()
def create_record_msg(self):
- msg = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr_ScalingGroupRecord_Instance(
+ msg = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr_ScalingGroupRecord_Instance(
instance_id=self._instance_id,
create_time=self._create_time,
op_status=self._op_status,
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/so_endpoint_cfg.xml b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/so_endpoint_cfg.xml
deleted file mode 100644
index ef09f1e..0000000
--- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/so_endpoint_cfg.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" message-id="1">
- <data>
- <cm-config xmlns="http://riftio.com/ns/riftware-1.0/rw-conman">
- <initiate-nsr-cfg></initiate-nsr-cfg>
- </cm-config>
- </data>
-</rpc-reply>
diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/subscriber.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/subscriber.py
new file mode 100644
index 0000000..8b0da85
--- /dev/null
+++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/subscriber.py
@@ -0,0 +1,39 @@
+#
+# Copyright 2016 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import rift.mano.dts as mano_dts
+import asyncio
+
+from gi.repository import (
+ RwDts as rwdts,
+ RwTypes,
+ RwVlrYang,
+ RwYang
+ )
+import rift.tasklets
+
+import requests
+
+
+class VlrSubscriberDtsHandler(mano_dts.AbstractOpdataSubscriber):
+ """ VLR DTS handler """
+ XPATH = "D,/vlr:vlr-catalog/vlr:vlr"
+
+ def __init__(self, log, dts, loop, project, callback=None):
+ super().__init__(log, dts, loop, project, callback)
+
+ def get_xpath(self):
+ return ("D,/vlr:vlr-catalog/vlr:vlr")
diff --git a/rwlaunchpad/plugins/rwpkgmgr/CMakeLists.txt b/rwlaunchpad/plugins/rwpkgmgr/CMakeLists.txt
index eca40c2..b08174e 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwpkgmgr/CMakeLists.txt
@@ -24,7 +24,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
# anything not in a site-packages directory so we have to
@@ -46,7 +46,7 @@
rift/tasklets/${TASKLET_NAME}/publisher/copy_status.py
rift/tasklets/${TASKLET_NAME}/subscriber/__init__.py
rift/tasklets/${TASKLET_NAME}/subscriber/download_status.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
rift_add_subdirs(test)
diff --git a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/copy.py b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/copy.py
index c64a3f5..671501d 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/copy.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/copy.py
@@ -16,12 +16,13 @@
# Author(s): Nandan Sinha
#
-import os
-import uuid
-import shutil
import enum
-
import gi
+import json
+import os
+import shutil
+import uuid
+
gi.require_version('RwVnfdYang', '1.0')
gi.require_version('RwNsdYang', '1.0')
from gi.repository import (
@@ -34,6 +35,7 @@
)
import rift.package.icon as icon
+import rift.tasklets.rwlaunchpad.onboard as onboard
class PackageCopyError(Exception):
pass
@@ -69,12 +71,35 @@
return self.__dict__
def to_yang(self):
- job = RwPkgMgmtYang.CopyJob.from_dict({
+ job = RwPkgMgmtYang.YangData_RwProject_Project_CopyJobs_Job.from_dict({
"transaction_id": self.transaction_id,
"status": CopyMeta.STATUS_MAP[self.state]
})
return job
+class CopyManifest:
+ """ Utility class to hold manifest information."""
+ def __init__(self, project, log):
+ self.tasklet_info = project.tasklet.tasklet_info
+ self.manifest = self.tasklet_info.get_pb_manifest()
+ self.use_ssl = self.manifest.bootstrap_phase.rwsecurity.use_ssl
+ self.ssl_cert, self.ssl_key = None, None
+ if self.use_ssl:
+ self.ssl_cert = self.manifest.bootstrap_phase.rwsecurity.cert
+ self.ssl_key = self.manifest.bootstrap_phase.rwsecurity.key
+ self.onboarder = None
+ self.log = log
+
+ def ssl_manifest(self):
+ return (self.use_ssl, self.ssl_cert, self.ssl_key)
+
+ def get_onboarder(self, host="127.0.0.1", port="8008"):
+ if not self.onboarder:
+ self.onboarder = onboard.DescriptorOnboarder(self.log,
+ host, port, *self.ssl_manifest())
+ return self.onboarder
+
+
class PackageFileCopier:
DESCRIPTOR_MAP = {
"vnfd": (RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd, 'vnfd rw-vnfd'),
@@ -82,11 +107,13 @@
}
@classmethod
- def from_rpc_input(cls, rpc_input, proxy, log=None):
+ def from_rpc_input(cls, rpc_input, project, proxy, log=None):
return cls(
rpc_input.package_id,
rpc_input.package_type,
rpc_input.package_name,
+ rpc_input.project_name,
+ project = project,
proxy = proxy,
log=log)
@@ -94,11 +121,15 @@
pkg_id,
pkg_type,
pkg_name,
+ proj_name,
+ project,
proxy,
log):
self.src_package_id = pkg_id
self.package_type = pkg_type.lower()
self.dest_package_name = pkg_name
+ self.project_name = proj_name
+ self.manifest = CopyManifest(project, log)
self.dest_package_id = str(uuid.uuid4())
self.transaction_id = str(uuid.uuid4())
self.proxy = proxy
@@ -107,17 +138,27 @@
self.src_package = None
self.dest_desc_msg = None
+ @property
+ def onboarder(self):
+ """ Onboarder object to invoke REST endpoint calls."""
+ return self.manifest.get_onboarder()
+
+ @property
+ def progress(self):
+ """ Current status of operations."""
+ return self.meta.to_yang()
+
+ @property
+ def descriptor_msg(self):
+ """ Descriptor message of the generated copied descriptor."""
+ return self.dest_desc_msg
+
# Start of delegate calls
def call_delegate(self, event):
if not self.delegate:
return
- # Send out the descriptor message to be posted on success
- # Otherwise send out the CopyJob yang conversion from meta object.
- if event == "on_download_succeeded":
- getattr(self.delegate, event)(self.dest_desc_msg)
- else:
- getattr(self.delegate, event)(self.meta.to_yang())
+ getattr(self.delegate, event)(self)
def _copy_tree(self):
"""
@@ -127,12 +168,13 @@
"""
self.copy_progress()
- store = self.proxy._get_store(self.package_type)
+ store = self.proxy._get_store(self.package_type, \
+ self.project_name if self.project_name else None)
src_path = store._get_package_dir(self.src_package_id)
self.src_package = store.get_package(self.src_package_id)
self.dest_copy_path = os.path.join(
- store.DEFAULT_ROOT_DIR,
+ store.root_dir,
self.dest_package_id)
self.log.debug("Copying contents from {src} to {dest}".
format(src=src_path, dest=self.dest_copy_path))
@@ -154,29 +196,43 @@
def _create_descriptor_file(self):
""" Update descriptor file for the newly copied descriptor catalog.
- Use the existing descriptor file to create a descriptor proto gi object,
- change some identifiers, and create a new descriptor yaml file from it.
-
+ Get descriptor contents from REST endpoint, change some identifiers
+ and create a new descriptor yaml file from it.
"""
- src_desc_file = self.src_package.descriptor_file
- src_desc_contents = self.src_package.descriptor_msg.as_dict()
- src_desc_contents.update(
+ # API call for the updated descriptor contents
+ src_desc_contents = self.onboarder.get_updated_descriptor(self.src_package.descriptor_msg, self.project_name)
+
+ # To generate the pb object, extract subtree in dict from "project-nsd:nsd" and root it
+ # under "nsd:nsd-catalog" (or vnfd)
+ root_element = "{0}:{0}-catalog".format(self.package_type)
+ extract_sub_element = "project-{0}:{0}".format(self.package_type, self.package_type)
+ src_desc_contents[extract_sub_element].update(
id =self.dest_package_id,
name = self.dest_package_name,
short_name = self.dest_package_name
)
+ D = {}
+ D[root_element] = {self.package_type : src_desc_contents[extract_sub_element]}
+ # Build the proto-buf gi object from generated JSON
+ json_desc_msg = json.dumps(D)
+ self.log.debug("*** JSON contents: {}".format(json_desc_msg))
desc_cls, modules = PackageFileCopier.DESCRIPTOR_MAP[self.package_type]
- self.dest_desc_msg = desc_cls.from_dict(src_desc_contents)
- dest_desc_path = os.path.join(self.dest_copy_path,
- "{pkg_name}_{pkg_type}.yaml".format(pkg_name=self.dest_package_name, pkg_type=self.package_type))
- model = RwYang.Model.create_libncx()
+
+ model = RwYang.Model.create_libyang()
for module in modules.split():
model.load_module(module)
+ self.dest_desc_msg = desc_cls.from_json(model, json_desc_msg, strict=False)
+
+ # Write to yaml desc file
+ dest_desc_path = os.path.join(self.dest_copy_path,
+ "{pkg_name}_{pkg_type}.yaml".format(pkg_name=self.dest_package_name, pkg_type=self.package_type))
with open(dest_desc_path, "w") as fh:
fh.write(self.dest_desc_msg.to_yaml(model))
+ # Remove copied .yaml, if present
+ src_desc_file = self.src_package.descriptor_file
copied_desc_file = os.path.join(self.dest_copy_path, os.path.basename(src_desc_file))
if os.path.exists(copied_desc_file):
self.log.debug("Deleting copied yaml from old source %s" % (copied_desc_file))
diff --git a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py
index 6c49323..e708012 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/downloader/url.py
@@ -13,6 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+import gi
+
import rift.downloader as downloader
from gi.repository import RwPkgMgmtYang
@@ -30,7 +33,7 @@
}
@classmethod
- def from_rpc_input(cls, rpc_input, file_obj, proxy, log=None, auth=None):
+ def from_rpc_input(cls, rpc_input, file_obj, proxy, log=None, auth=None, project=None):
"""Convenience class to set up an instance form RPC data
"""
url_downloader = cls(
@@ -43,7 +46,8 @@
auth=auth,
proxy=proxy,
file_obj=file_obj,
- log=log)
+ log=log,
+ project=project)
return url_downloader
@@ -59,7 +63,8 @@
delete_on_fail=True,
decompress_on_fly=False,
auth=None,
- log=None):
+ log=None,
+ project=None):
super().__init__(
url,
file_obj=file_obj,
@@ -74,10 +79,11 @@
self.package_file_type = vnfd_file_type.lower() \
if package_type == 'VNFD' else nsd_file_type.lower()
self.proxy = proxy
+ self.project = project
def convert_to_yang(self):
- job = RwPkgMgmtYang.DownloadJob.from_dict({
+ job = RwPkgMgmtYang.YangData_RwProject_Project_DownloadJobs_Job.from_dict({
"url": self.meta.url,
"download_id": self.meta.download_id,
"package_id": self.package_id,
@@ -113,11 +119,12 @@
self.package_type,
self.package_id,
self.package_path,
- self.package_file_type)
+ self.package_file_type,
+ self.project)
except Exception as e:
self.log.exception(e)
- self.job.detail = str(e)
+ self.meta.detail = str(e)
self.download_failed()
return
diff --git a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/proxy/filesystem.py b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/proxy/filesystem.py
index cc89889..907815e 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/proxy/filesystem.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/proxy/filesystem.py
@@ -23,9 +23,10 @@
import rift.package.store as store
import rift.package.package
import rift.package.icon as icon
+import rift.package.checksums as checksums
from .base import AbstractPackageManagerProxy
-
+from rift.tasklets.rwlaunchpad import image
class UnknownPackageType(Exception):
pass
@@ -40,35 +41,38 @@
# Refer: https://confluence.riftio.com/display/ATG/Launchpad+package+formats
SCHEMA = {
"nsd": ["icons", "ns_config", "scripts", "vnf_config"],
- "vnfd": ["charms", "cloud_init", "icons", "images", "scripts", "readme"]
+ "vnfd": ["charms", "cloud_init", "icons", "images", "scripts", "readme", "test", "doc"]
}
SCHEMA_TO_PERMS = {'scripts': 0o777}
- def __init__(self, loop, log):
+ def __init__(self, loop, log, dts):
self.loop = loop
self.log = log
+ self.dts = dts
self.store_cache = {}
+ self.uploader = image.ImageUploader(self.log, self.loop, self.dts)
- def _get_store(self, package_type):
+ def _get_store(self, package_type, project_name = None):
store_cls = self.PACKAGE_TYPE_MAP[package_type]
- store = self.store_cache.setdefault(package_type, store_cls(self.log))
+ self.store_cache[package_type] = store_cls(self.log, project=project_name)
+ store = self.store_cache[package_type]
return store
@asyncio.coroutine
- def endpoint(self, package_type, package_id):
+ def endpoint(self, package_type, package_id, project_name=None):
package_type = package_type.lower()
if package_type not in self.PACKAGE_TYPE_MAP:
raise UnknownPackageType()
-
- store = self._get_store(package_type)
+
+ store = self._get_store(package_type, project_name)
package = store._get_package_dir(package_id)
- rel_path = os.path.relpath(package, start=store.root_dir)
+ rel_path = os.path.relpath(package, start=os.path.dirname(store.root_dir))
- url = "https://127.0.0.1:4567/api/package/{}/{}".format(package_type, rel_path)
-
+ url = "https://127.0.0.1:8008/mano/api/package/{}/{}".format(package_type, rel_path)
+
return url
@asyncio.coroutine
@@ -79,15 +83,17 @@
return self.SCHEMA[package_type]
- def package_file_add(self, new_file, package_type, package_id, package_path, package_file_type):
+ def package_file_add(self, new_file, package_type, package_id, package_path, package_file_type, project_name):
# Get the schema from thr package path
# the first part will always be the vnfd/nsd name
mode = 0o664
# for files other than README, create the package path from the asset type, e.g. icons/icon1.png
# for README files, strip off any leading '/'
+ file_name = package_path
package_path = package_file_type + "/" + package_path \
if package_file_type != "readme" else package_path.strip('/')
+
components = package_path.split("/")
if len(components) > 2:
schema = components[1]
@@ -95,7 +101,7 @@
# Fetch the package object
package_type = package_type.lower()
- store = self._get_store(package_type)
+ store = self._get_store(package_type, project_name)
package = store.get_package(package_id)
# Construct abs path of the destination obj
@@ -105,12 +111,22 @@
# Insert (by copy) the file in the package location. For icons,
# insert also in UI location for UI to pickup
try:
+ self.log.debug("Inserting file {} in the destination {} - {} ".format(dest_file, package_path, dest_file))
package.insert_file(new_file, dest_file, package_path, mode=mode)
if package_file_type == 'icons':
icon_extract = icon.PackageIconExtractor(self.log)
icon_extract.extract_icons(package)
+ if package_file_type == 'images':
+ image_hdl = package.open(package_path)
+ image_checksum = checksums.checksum(image_hdl)
+
+ try:
+ self.uploader.upload_image(file_name, image_checksum, image_hdl, {})
+ self.uploader.upload_image_to_cloud_accounts(file_name, image_checksum, project_name)
+ finally:
+ _ = image_hdl.close()
except rift.package.package.PackageAppendError as e:
self.log.exception(e)
return False
@@ -118,9 +134,9 @@
self.log.debug("File insertion complete at {}".format(dest_file))
return True
- def package_file_delete(self, package_type, package_id, package_path, package_file_type):
+ def package_file_delete(self, package_type, package_id, package_path, package_file_type, project_name):
package_type = package_type.lower()
- store = self._get_store(package_type)
+ store = self._get_store(package_type, project_name)
package = store.get_package(package_id)
# for files other than README, create the relative package path from the asset type
diff --git a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/publisher/copy_status.py b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/publisher/copy_status.py
index 927331c..ffec4f0 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/publisher/copy_status.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/publisher/copy_status.py
@@ -16,17 +16,20 @@
# Author(s): Nandan Sinha
#
-import sys
-import asyncio
-import uuid
import abc
+import asyncio
import functools
+import gi
+import sys
+import uuid
from concurrent.futures import Future
from gi.repository import (RwDts as rwdts)
import rift.mano.dts as mano_dts
import rift.downloader as url_downloader
import rift.tasklets.rwlaunchpad.onboard as onboard
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
if sys.version_info < (3, 4, 4):
asyncio.ensure_future = asyncio.async
@@ -34,16 +37,16 @@
class CopyStatusPublisher(mano_dts.DtsHandler, url_downloader.DownloaderProtocol):
- def __init__(self, log, dts, loop, tasklet_info):
- super().__init__(log, dts, loop)
- self.tasks = {}
- self.tasklet_info = tasklet_info
+ def __init__(self, log, dts, loop, project):
+ super().__init__(log, dts, loop, project)
+ self.tasks = {}
+ self.tasklet_info = project.tasklet.tasklet_info
def xpath(self, transaction_id=None):
- return ("D,/rw-pkg-mgmt:copy-jobs/rw-pkg-mgmt:job" +
- ("[transaction-id='{}']".format(transaction_id) if transaction_id else ""))
+ return self.project.add_project("D,/rw-pkg-mgmt:copy-jobs/rw-pkg-mgmt:job" +
+ ("[transaction-id={}]".format(quoted_key(transaction_id)) if transaction_id else ""))
pass
-
+
@asyncio.coroutine
def register(self):
self.reg = yield from self.dts.register(xpath=self.xpath(),
@@ -51,6 +54,11 @@
assert self.reg is not None
+ def deregister(self):
+ if self.reg:
+ self.reg.deregister()
+ self.reg = None
+
@asyncio.coroutine
def register_copier(self, copier):
copier.delegate = self
@@ -89,7 +97,7 @@
def on_download_progress(self, job_msg):
"""callback that triggers update.
"""
- return self._schedule_dts_work(job_msg)
+ return self._schedule_dts_work(job_msg.progress)
def on_download_finished(self, job_msg):
"""callback that triggers update.
@@ -99,24 +107,15 @@
if key in self.tasks:
del self.tasks[key]
- return self._schedule_dts_work(job_msg)
+ return self._schedule_dts_work(job_msg.progress)
def on_download_succeeded(self, job_msg):
"""Post the catalog descriptor object to the http endpoint.
- Argument: job_msg (proto-gi descriptor_msg of the copied descriptor)
+ Argument: job_msg (of type PackageFileCopier)
"""
- manifest = self.tasklet_info.get_pb_manifest()
- use_ssl = manifest.bootstrap_phase.rwsecurity.use_ssl
- ssl_cert, ssl_key = None, None
- if use_ssl:
- ssl_cert = manifest.bootstrap_phase.rwsecurity.cert
- ssl_key = manifest.bootstrap_phase.rwsecurity.key
-
- onboarder = onboard.DescriptorOnboarder(self.log,
- "127.0.0.1", 8008, use_ssl, ssl_cert, ssl_key)
try:
- onboarder.onboard(job_msg)
+ job_msg.onboarder.onboard(job_msg.descriptor_msg, project=self._project.name)
except onboard.OnboardError as e:
self.log.error("Onboard exception triggered while posting copied catalog descriptor %s", e)
raise
diff --git a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/publisher/download_status.py b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/publisher/download_status.py
index d8c6ade..05062c1 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/publisher/download_status.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/publisher/download_status.py
@@ -18,12 +18,15 @@
#
import asyncio
+import gi
import sys
from gi.repository import (RwDts as rwdts)
import rift.mano.dts as mano_dts
import rift.downloader as url_downloader
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
import functools
import concurrent
@@ -33,14 +36,15 @@
class DownloadStatusPublisher(mano_dts.DtsHandler, url_downloader.DownloaderProtocol):
- def __init__(self, log, dts, loop):
- super().__init__(log, dts, loop)
+ def __init__(self, log, dts, loop, project):
+ super().__init__(log, dts, loop, project)
self.tasks = {}
def xpath(self, download_id=None):
- return ("D,/rw-pkg-mgmt:download-jobs/rw-pkg-mgmt:job" +
- ("[download-id='{}']".format(download_id) if download_id else ""))
+ return self._project.add_project("D,/rw-pkg-mgmt:download-jobs/rw-pkg-mgmt:job" +
+ ("[download-id={}]".
+ format(quoted_key(download_id)) if download_id else ""))
@asyncio.coroutine
def _dts_publisher(self, job):
@@ -54,6 +58,13 @@
flags=rwdts.Flag.PUBLISHER|rwdts.Flag.CACHE|rwdts.Flag.NO_PREP_READ)
assert self.reg is not None
+
+ def dergister(self):
+ self._log.debug("De-registering download status for project {}".
+ format(self.project.name))
+ if self.reg:
+ self.reg.deregister()
+ self.reg = None
@staticmethod
def _async_func(func, fut):
diff --git a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
index 5c3303f..fa8f8cb 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rpc.py
@@ -19,6 +19,7 @@
import abc
import asyncio
+import gi
import tempfile
from gi.repository import (
@@ -59,7 +60,8 @@
url = yield from self.proxy.endpoint(
msg.package_type if msg.has_field('package_type') else "",
- msg.package_id)
+ msg.package_id,
+ msg.project_name if msg.has_field('project_name') else None)
rpc_op = RPC_PKG_ENDPOINT.from_dict({"endpoint": url})
@@ -104,22 +106,36 @@
3. Return a tracking ID for the client to monitor the entire status
"""
- def __init__(self, log, dts, loop, proxy, publisher):
+ def __init__(self, log, dts, loop, proxy, tasklet):
"""
Args:
proxy: Any impl of .proxy.AbstractPackageManagerProxy
- publisher: Instance of DownloadStatusPublisher
+ publisher: Instance of tasklet to find the DownloadStatusPublisher
+ for a specific project
"""
super().__init__(log, dts, loop)
self.proxy = proxy
- self.publisher = publisher
+ self.tasklet = tasklet
@property
def xpath(self):
return "/rw-pkg-mgmt:package-file-add"
+ def get_publisher(self, msg):
+ try:
+ proj = self.tasklet.projects[msg.project_name]
+ except Exception as e:
+ err = "Project or project name not found {}: {}". \
+ format(msg.as_dict(), e)
+ self.log.error (err)
+ raise Exception (err)
+
+ return proj.job_handler
+
@asyncio.coroutine
def callback(self, ks_path, msg):
+ publisher = self.get_publisher(msg)
+
if not msg.external_url:
# For now we will only support External URL download
raise Exception ("No download URL provided")
@@ -138,22 +154,23 @@
auth=auth,
file_obj=filename,
proxy=self.proxy,
- log=self.log)
+ log=self.log,
+ project=msg.project_name)
- download_id = yield from self.publisher.register_downloader(url_downloader)
+ download_id = yield from publisher.register_downloader(url_downloader)
rpc_op = RPC_PACKAGE_ADD_ENDPOINT.from_dict({"task_id": download_id})
return rpc_op
class PackageCopyOperationsRpcHandler(mano_dts.AbstractRpcHandler):
- def __init__(self, log, dts, loop, proxy, publisher):
+ def __init__(self, log, dts, loop, project, proxy, publisher):
"""
Args:
proxy: Any impl of .proxy.AbstractPackageManagerProxy
publisher: CopyStatusPublisher object
"""
- super().__init__(log, dts, loop)
+ super().__init__(log, dts, loop, project)
self.proxy = proxy
self.publisher = publisher
@@ -164,7 +181,7 @@
@asyncio.coroutine
def callback(self, ks_path, msg):
import uuid
- copier = pkg_downloader.PackageFileCopier.from_rpc_input(msg, proxy=self.proxy, log=self.log)
+ copier = pkg_downloader.PackageFileCopier.from_rpc_input(msg, self.project, proxy=self.proxy, log=self.log)
transaction_id, dest_package_id = yield from self.publisher.register_copier(copier)
rpc_op = RPC_PACKAGE_COPY_ENDPOINT.from_dict({
@@ -199,7 +216,9 @@
msg.package_type,
msg.package_id,
msg.package_path,
- package_file_type)
+ package_file_type,
+ msg.project_name,
+ )
except Exception as e:
self.log.exception(e)
rpc_op.status = str(False)
diff --git a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rwpkgmgr.py b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rwpkgmgr.py
index 5773b0e..a2a32ad 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rwpkgmgr.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/rwpkgmgr.py
@@ -22,22 +22,66 @@
"""
import asyncio
-
import gi
+
gi.require_version('RwDts', '1.0')
-gi.require_version('RwPkgMgmtYang', '1.0')
+gi.require_version('RwLaunchpadYang', '1.0')
from gi.repository import (
RwDts as rwdts,
- RwPkgMgmtYang)
-import rift.tasklets
+ RwLaunchpadYang)
+import rift.tasklets
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectHandler,
+)
from . import rpc
from .proxy import filesystem
from . import publisher as pkg_publisher
-from . import subscriber
+from . import subscriber
+
+class PackageManagerProject(ManoProject):
+
+ def __init__(self, name, tasklet, **kw):
+ super(PackageManagerProject, self).__init__(tasklet.log, name)
+ self.update(tasklet)
+ proxy = kw["proxy"]
+
+ args = [self.log, self.dts, self.loop, self]
+
+ # create catalog publishers
+ self.job_handler = pkg_publisher.DownloadStatusPublisher(*args)
+ self.copy_publisher = pkg_publisher.CopyStatusPublisher(*args)
+
+ # create catalog subscribers
+ self.vnfd_catalog_sub = subscriber.VnfdStatusSubscriber(*args)
+ self.nsd_catalog_sub = subscriber.NsdStatusSubscriber(*args)
+
+ args.append(proxy)
+ self.copy_rpc = rpc.PackageCopyOperationsRpcHandler(*(args + [self.copy_publisher]))
+
+ @asyncio.coroutine
+ def register (self):
+ try:
+ yield from self.vnfd_catalog_sub.register()
+ yield from self.nsd_catalog_sub.register()
+ yield from self.copy_rpc.register()
+ yield from self.copy_publisher.register()
+ yield from self.job_handler.register()
+ except Exception as e:
+ self.log.exception("Exception registering project {}: {}".
+ format(self.name, e))
+
+ def deregister (self):
+ self.job_handler.deregister()
+ self.copy_rpc.deregister()
+ self.copy_publisher.deregister()
+ self.vnfd_catalog_sub.deregister()
+ self.nsd_catalog_sub.deregister()
+
class PackageManagerTasklet(rift.tasklets.Tasklet):
def __init__(self, *args, **kwargs):
@@ -46,6 +90,10 @@
self.rwlog.set_category("rw-mano-log")
self.endpoint_rpc = None
self.schema_rpc = None
+
+ self._project_handler = None
+ self.projects = {}
+
except Exception as e:
self.log.exception(e)
@@ -55,35 +103,29 @@
try:
super().start()
+
self.dts = rift.tasklets.DTS(
self.tasklet_info,
- RwPkgMgmtYang.get_schema(),
+ RwLaunchpadYang.get_schema(),
self.loop,
self.on_dts_state_change
)
-
- proxy = filesystem.FileSystemProxy(self.loop, self.log)
+
+ proxy = filesystem.FileSystemProxy(self.loop, self.log, self.dts)
args = [self.log, self.dts, self.loop]
- # create catalog publishers
- self.job_handler = pkg_publisher.DownloadStatusPublisher(*args)
- self.copy_publisher = pkg_publisher.CopyStatusPublisher(*args +[self.tasklet_info])
-
- # create catalog subscribers
- self.vnfd_catalog_sub = subscriber.VnfdStatusSubscriber(*args)
- self.nsd_catalog_sub = subscriber.NsdStatusSubscriber(*args)
-
args.append(proxy)
self.endpoint_rpc = rpc.EndpointDiscoveryRpcHandler(*args)
self.schema_rpc = rpc.SchemaRpcHandler(*args)
self.delete_rpc = rpc.PackageDeleteOperationsRpcHandler(*args)
- self.copy_rpc = rpc.PackageCopyOperationsRpcHandler(*(args + [self.copy_publisher]))
- args.append(self.job_handler)
+ args.append(self)
self.pkg_op = rpc.PackageOperationsRpcHandler(*args)
+ self.project_handler = ProjectHandler(self, PackageManagerProject,
+ proxy=proxy,)
except Exception as e:
- self.log.error("Exception caught rwpkgmgr start: %s", str(e))
+ self.log.exception("Exception caught rwpkgmgr start: %s", str(e))
else:
self.log.debug("rwpkgmgr started successfully!")
@@ -99,12 +141,10 @@
yield from self.endpoint_rpc.register()
yield from self.schema_rpc.register()
yield from self.pkg_op.register()
- yield from self.job_handler.register()
yield from self.delete_rpc.register()
- yield from self.copy_rpc.register()
- yield from self.copy_publisher.register()
- yield from self.vnfd_catalog_sub.register()
- yield from self.nsd_catalog_sub.register()
+
+ self.log.debug("creating project handler")
+ self.project_handler.register()
except Exception as e:
self.log.error("Exception caught rwpkgmgr init %s", str(e))
diff --git a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/subscriber/download_status.py b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/subscriber/download_status.py
index 042efa6..50c8d7f 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/subscriber/download_status.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/rift/tasklets/rwpkgmgr/subscriber/download_status.py
@@ -1,5 +1,5 @@
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,101 +15,91 @@
#
# Author(s): Varun Prasad
# Creation Date: 09/25/2016
-#
+#
+import gi
import os
-import io
-import shutil
import rift.mano.dts as mano_dts
-import rift.package.package as package
-import rift.package.store as store
-import rift.package.convert as convert
+import rift.package.store as store
+from rift.package.convert import (
+ RwVnfdSerializer,
+ RwNsdSerializer,
+)
from gi.repository import (
RwYang,
- NsdYang,
- RwNsdYang,
- VnfdYang,
- RwVnfdYang,
RwDts
)
class DownloadStatusSubscriber(mano_dts.AbstractOpdataSubscriber):
+ def __init__(self, log, dts, loop, project, callback):
+ super().__init__(log, dts, loop, project, callback)
- def __init__(self, log, dts, loop, callback):
- super().__init__(log, dts, loop, callback)
-
- def get_xpath(self):
- return ("D,/rw-pkg-mgmt:download-jobs/rw-pkg-mgmt:job")
+ def get_xpath(self):
+ return self._project.add_project(
+ "D,/rw-pkg-mgmt:download-jobs/rw-pkg-mgmt:job")
-class VnfdStatusSubscriber(DownloadStatusSubscriber):
+
+class VnfdStatusSubscriber(mano_dts.VnfdCatalogSubscriber):
DOWNLOAD_DIR = store.VnfdPackageFilesystemStore.DEFAULT_ROOT_DIR
- MODULE_DESC = 'vnfd rw-vnfd'.split()
DESC_TYPE = 'vnfd'
-
- def __init__(self, log, dts, loop):
- super().__init__(log, dts, loop, self.on_change)
- self.subscriber = mano_dts.VnfdCatalogSubscriber(log, dts, loop)
+ SERIALIZER = RwVnfdSerializer()
- def on_change(self, msg, action):
- log_msg = "1. Vnfd called w/ msg attributes: {} id {} name {} action: {}".format(repr(msg), msg.id, msg.name, repr(action))
+ def __init__(self, log, dts, loop, project):
+ super().__init__(log, dts, loop, project, callback=self.on_change)
+
+ def on_change(self, msg, action):
+ log_msg = "1. Vnfd called w/ msg attributes: {} id {} name {} action: {}". \
+ format(repr(msg), msg.id, msg.name, repr(action))
self.log.debug(log_msg)
- if action == RwDts.QueryAction.UPDATE:
- actionCreate(self, msg)
+ if action == RwDts.QueryAction.UPDATE or action == RwDts.QueryAction.CREATE:
+ actionCreate(self, msg, self.project.name)
else:
self.log.debug("VnfdStatusSubscriber: No action for {}".format(repr(action)))
pass
- def get_xpath(self):
- return self.subscriber.get_xpath()
-
-class NsdStatusSubscriber(DownloadStatusSubscriber):
+class NsdStatusSubscriber(mano_dts.NsdCatalogSubscriber):
DOWNLOAD_DIR = store.NsdPackageFilesystemStore.DEFAULT_ROOT_DIR
- MODULE_DESC = 'nsd rw-nsd'.split()
DESC_TYPE = 'nsd'
-
- def __init__(self, log, dts, loop):
- super().__init__(log, dts, loop, self.on_change)
- self.subscriber = mano_dts.NsdCatalogSubscriber(log, dts, loop)
+ SERIALIZER = RwNsdSerializer()
- def on_change(self, msg, action):
- log_msg = "1. Nsd called w/ msg attributes: {} id {} name {} action: {}".format(repr(msg), msg.id, msg.name, repr(action))
+ def __init__(self, log, dts, loop, project):
+ super().__init__(log, dts, loop, project, callback=self.on_change)
+
+ def on_change(self, msg, action):
+ log_msg = "1. Nsd called w/ msg attributes: {} id {} name {} action: {}". \
+ format(repr(msg), msg.id, msg.name, repr(action))
self.log.debug(log_msg)
- if action == RwDts.QueryAction.UPDATE:
- actionCreate(self, msg)
+ if action == RwDts.QueryAction.UPDATE or action == RwDts.QueryAction.CREATE:
+ actionCreate(self, msg, self.project.name)
else:
self.log.debug("NsdStatusSubscriber: No action for {}".format(repr(action)))
pass
- def get_xpath(self):
- return self.subscriber.get_xpath()
-
-def actionCreate(descriptor, msg):
- ''' Create folder structure if it doesn't exist: id/vnf name OR id/nsd name
+def actionCreate(descriptor, msg, project_name=None):
+ ''' Create folder structure if it doesn't exist: id/vnf name OR id/nsd name
Serialize the Vnfd/Nsd object to yaml and store yaml file in the created folder.
'''
- desc_name = msg.name if msg.name else ""
- download_dir = os.path.join(descriptor.DOWNLOAD_DIR, msg.id)
+ download_dir = os.path.join(
+ descriptor.DOWNLOAD_DIR,
+ project_name if project_name else "",
+ msg.id)
- # If a download dir is present with contents, then we know it has been created in the
- # upload path.
+ # If a download dir is present with contents, then we know it has been created in the
+ # upload path.
if os.path.exists(download_dir) and os.listdir(download_dir):
descriptor.log.debug("Skpping folder creation, {} already present".format(download_dir))
return
- else:
+ else:
# Folder structure is based on top-level package-id directory
if not os.path.exists(download_dir):
os.makedirs(download_dir)
descriptor.log.debug("Created directory {}".format(download_dir))
-
- model = RwYang.Model.create_libncx()
- for module in descriptor.MODULE_DESC: model.load_module(module)
-
- yaml_path = "{base}/{name}_{type}.yaml".format(base=download_dir, name=msg.name, type=descriptor.DESC_TYPE)
- with open(yaml_path,"w") as fh:
- fh.write(msg.to_yaml(model))
-
+ yaml_path = "{base}/{name}_{type}.yaml". \
+ format(base=download_dir, name=msg.name[0:50], type=descriptor.DESC_TYPE)
+ with open(yaml_path,"w") as fh:
+ fh.write(descriptor.SERIALIZER.to_yaml_string(msg))
diff --git a/rwlaunchpad/plugins/rwpkgmgr/test/CMakeLists.txt b/rwlaunchpad/plugins/rwpkgmgr/test/CMakeLists.txt
index 8f090a2..912968c 100644
--- a/rwlaunchpad/plugins/rwpkgmgr/test/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwpkgmgr/test/CMakeLists.txt
@@ -18,48 +18,48 @@
#
##
-# utest_subscriber_dts
+# utest_pkgmgr_subscriber_dts
##
-rift_py3test(utest_subscriber_dts.py
+rift_py3test(utest_pkgmgr_subscriber_dts.py
TEST_ARGS
- ${CMAKE_CURRENT_SOURCE_DIR}/utest_subscriber_dts.py
+ ${CMAKE_CURRENT_SOURCE_DIR}/utest_pkgmgr_subscriber_dts.py
)
##
-# utest_publisher_dts
+# utest_pkgmgr_publisher_dts
##
-rift_py3test(utest_publisher_dts.test_download_publisher
+rift_py3test(utest_pkgmgr_publisher_dts.test_download_publisher
TEST_ARGS
- ${CMAKE_CURRENT_SOURCE_DIR}/utest_publisher_dts.py TestCase.test_download_publisher
+ ${CMAKE_CURRENT_SOURCE_DIR}/utest_pkgmgr_publisher_dts.py TestCase.test_download_publisher
)
-rift_py3test(utest_publisher_dts.test_publish
+rift_py3test(utest_pkgmgr_publisher_dts.test_publish
TEST_ARGS
- ${CMAKE_CURRENT_SOURCE_DIR}/utest_publisher_dts.py TestCase.test_publish
+ ${CMAKE_CURRENT_SOURCE_DIR}/utest_pkgmgr_publisher_dts.py TestCase.test_publish
)
-rift_py3test(utest_publisher_dts.test_url_download
+rift_py3test(utest_pkgmgr_publisher_dts.test_url_download
TEST_ARGS
- ${CMAKE_CURRENT_SOURCE_DIR}/utest_publisher_dts.py TestCase.test_url_download
+ ${CMAKE_CURRENT_SOURCE_DIR}/utest_pkgmgr_publisher_dts.py TestCase.test_url_download
)
-rift_py3test(utest_publisher_dts.test_url_download_unreachable_ip
+rift_py3test(utest_pkgmgr_publisher_dts.test_url_download_unreachable_ip
TEST_ARGS
- ${CMAKE_CURRENT_SOURCE_DIR}/utest_publisher_dts.py TestCase.test_url_download_unreachable_ip
+ ${CMAKE_CURRENT_SOURCE_DIR}/utest_pkgmgr_publisher_dts.py TestCase.test_url_download_unreachable_ip
)
-rift_py3test(utest_publisher_dts.test_cancelled
+rift_py3test(utest_pkgmgr_publisher_dts.test_cancelled
TEST_ARGS
- ${CMAKE_CURRENT_SOURCE_DIR}/utest_publisher_dts.py TestCase.test_cancelled
+ ${CMAKE_CURRENT_SOURCE_DIR}/utest_pkgmgr_publisher_dts.py TestCase.test_cancelled
)
-add_custom_target(utest_publisher_dts.py
+add_custom_target(utest_pkgmgr_publisher_dts.py
DEPENDS
- utest_publisher_dts.test_download_publisher
- utest_publisher_dts.test_publish
- utest_publisher_dts.test_url_download
- utest_publisher_dts.test_url_download_unreachable_ip
- utest_publisher_dts.test_cancelled
+ utest_pkgmgr_publisher_dts.test_download_publisher
+ utest_pkgmgr_publisher_dts.test_publish
+ utest_pkgmgr_publisher_dts.test_url_download
+ utest_pkgmgr_publisher_dts.test_url_download_unreachable_ip
+ utest_pkgmgr_publisher_dts.test_cancelled
)
##
@@ -102,6 +102,6 @@
add_custom_target(rwpkgmgmt_test
DEPENDS
utest_filesystem_proxy_dts.py
- utest_publisher_dts.py
- utest_subscriber_dts.py
+ utest_pkgmgr_publisher_dts.py
+ utest_pkgmgr_subscriber_dts.py
)
diff --git a/rwlaunchpad/plugins/rwpkgmgr/test/utest_filesystem_proxy_dts.py b/rwlaunchpad/plugins/rwpkgmgr/test/utest_filesystem_proxy_dts.py
index 6bc5bd4..f26cf8d 100755
--- a/rwlaunchpad/plugins/rwpkgmgr/test/utest_filesystem_proxy_dts.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/test/utest_filesystem_proxy_dts.py
@@ -27,6 +27,10 @@
import uuid
import xmlrunner
+# Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
import gi
gi.require_version('RwDts', '1.0')
gi.require_version('RwPkgMgmtYang', '1.0')
@@ -39,9 +43,36 @@
import rift.tasklets.rwpkgmgr.publisher as pkg_publisher
import rift.tasklets.rwpkgmgr.rpc as rpc
import rift.test.dts
+from rift.mano.utils.project import ManoProject, DEFAULT_PROJECT
TEST_STRING = "foobar"
+
+class MockPublisher(object):
+ def __init__(self, uid):
+ self.assert_uid = uid
+
+ @asyncio.coroutine
+ def register_downloader(self, *args):
+ return self.assert_uid
+
+
+class MockProject(ManoProject):
+ def __init__(self, log, uid=None):
+ super().__init__(log, name=DEFAULT_PROJECT)
+ self.job_handler = MockPublisher(uid)
+
+
+class MockTasklet:
+ def __init__(self, log, uid=None):
+ self.log = log
+ self.projects = {}
+ project = MockProject(self.log,
+ uid=uid)
+ project.publisher = None
+ self.projects[project.name] = project
+
+
class TestCase(rift.test.dts.AbstractDTSTest):
@classmethod
def configure_schema(cls):
@@ -59,11 +90,12 @@
def tearDown(self):
super().tearDown()
- def create_mock_package(self):
+ def create_mock_package(self, project):
uid = str(uuid.uuid4())
path = os.path.join(
- os.getenv('RIFT_ARTIFACTS'),
+ os.getenv('RIFT_VAR_ROOT'),
"launchpad/packages/vnfd",
+ project,
uid)
asset_path = os.path.join(path, "icons")
@@ -80,13 +112,14 @@
Verifies the following:
The endpoint RPC returns a URL
"""
- proxy = filesystem.FileSystemProxy(self.loop, self.log)
+ proxy = filesystem.FileSystemProxy(self.loop, self.log, self.dts)
endpoint = rpc.EndpointDiscoveryRpcHandler(self.log, self.dts, self.loop, proxy)
yield from endpoint.register()
ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_GetPackageEndpoint.from_dict({
"package_type": "VNFD",
- "package_id": "BLAHID"})
+ "package_id": "BLAHID",
+ "project_name": DEFAULT_PROJECT})
rpc_out = yield from self.dts.query_rpc(
"I,/get-package-endpoint",
@@ -95,7 +128,7 @@
for itr in rpc_out:
result = yield from itr
- assert result.result.endpoint == 'https://127.0.0.1:4567/api/package/vnfd/BLAHID'
+ assert result.result.endpoint == 'https://127.0.0.1:8008/mano/api/package/vnfd/{}/BLAHID'.format(DEFAULT_PROJECT)
@rift.test.dts.async_test
def test_schema_rpc(self):
@@ -103,12 +136,13 @@
Verifies the following:
The schema RPC return the schema structure
"""
- proxy = filesystem.FileSystemProxy(self.loop, self.log)
+ proxy = filesystem.FileSystemProxy(self.loop, self.log, self.dts)
endpoint = rpc.SchemaRpcHandler(self.log, self.dts, self.loop, proxy)
yield from endpoint.register()
ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_GetPackageSchema.from_dict({
- "package_type": "VNFD"})
+ "package_type": "VNFD",
+ "project_name": DEFAULT_PROJECT})
rpc_out = yield from self.dts.query_rpc(
"I,/get-package-schema",
@@ -125,27 +159,24 @@
1. The file RPC returns a valid UUID thro' DTS
"""
assert_uid = str(uuid.uuid4())
- class MockPublisher:
- @asyncio.coroutine
- def register_downloader(self, *args):
- return assert_uid
- uid, path = self.create_mock_package()
+ uid, path = self.create_mock_package(DEFAULT_PROJECT)
- proxy = filesystem.FileSystemProxy(self.loop, self.log)
+ proxy = filesystem.FileSystemProxy(self.loop, self.log, self.dts)
endpoint = rpc.PackageOperationsRpcHandler(
self.log,
self.dts,
self.loop,
proxy,
- MockPublisher())
+ MockTasklet(self.log, uid=assert_uid))
yield from endpoint.register()
ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageFileAdd.from_dict({
"package_type": "VNFD",
"package_id": uid,
"external_url": "https://raw.githubusercontent.com/RIFTIO/RIFT.ware/master/rift-shell",
- "package_path": "script/rift-shell"})
+ "package_path": "script/rift-shell",
+ "project_name": DEFAULT_PROJECT})
rpc_out = yield from self.dts.query_rpc(
"I,/rw-pkg-mgmt:package-file-add",
@@ -164,16 +195,19 @@
Integration test:
1. Verify the end to end flow of package ADD (NO MOCKS)
"""
- uid, path = self.create_mock_package()
+ uid, path = self.create_mock_package(DEFAULT_PROJECT)
- proxy = filesystem.FileSystemProxy(self.loop, self.log)
- publisher = pkg_publisher.DownloadStatusPublisher(self.log, self.dts, self.loop)
+ proxy = filesystem.FileSystemProxy(self.loop, self.log, self.dts)
+ tasklet = MockTasklet(self.log, uid=uid)
+ project = tasklet.projects[DEFAULT_PROJECT]
+ publisher = pkg_publisher.DownloadStatusPublisher(self.log, self.dts, self.loop, project)
+ project.job_handler = publisher
endpoint = rpc.PackageOperationsRpcHandler(
self.log,
self.dts,
self.loop,
proxy,
- publisher)
+ tasklet)
yield from publisher.register()
yield from endpoint.register()
@@ -182,6 +216,7 @@
"package_type": "VNFD",
"package_id": uid,
"external_url": "https://raw.githubusercontent.com/RIFTIO/RIFT.ware/master/rift-shell",
+ "project_name": DEFAULT_PROJECT,
"vnfd_file_type": "ICONS",
"package_path": "rift-shell"})
@@ -192,6 +227,7 @@
yield from asyncio.sleep(5, loop=self.loop)
filepath = os.path.join(path, ip.vnfd_file_type.lower(), ip.package_path)
+ self.log.debug("Filepath: {}".format(filepath))
assert os.path.isfile(filepath)
mode = oct(os.stat(filepath)[stat.ST_MODE])
assert str(mode) == "0o100664"
@@ -205,9 +241,9 @@
Integration test:
1. Verify the end to end flow of package ADD (NO MOCKS)
"""
- uid, path = self.create_mock_package()
+ uid, path = self.create_mock_package(DEFAULT_PROJECT)
- proxy = filesystem.FileSystemProxy(self.loop, self.log)
+ proxy = filesystem.FileSystemProxy(self.loop, self.log, self.dts)
endpoint = rpc.PackageDeleteOperationsRpcHandler(
self.log,
self.dts,
@@ -219,8 +255,9 @@
ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageFileDelete.from_dict({
"package_type": "VNFD",
"package_id": uid,
+ "package_path": "logo.png",
"vnfd_file_type": "ICONS",
- "package_path": "logo.png"})
+ "project_name": DEFAULT_PROJECT})
assert os.path.isfile(os.path.join(path, ip.vnfd_file_type.lower(), ip.package_path))
diff --git a/rwlaunchpad/plugins/rwpkgmgr/test/utest_publisher_dts.py b/rwlaunchpad/plugins/rwpkgmgr/test/utest_pkgmgr_publisher_dts.py
similarity index 77%
rename from rwlaunchpad/plugins/rwpkgmgr/test/utest_publisher_dts.py
rename to rwlaunchpad/plugins/rwpkgmgr/test/utest_pkgmgr_publisher_dts.py
index 6ec89d8..ca6f90c 100755
--- a/rwlaunchpad/plugins/rwpkgmgr/test/utest_publisher_dts.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/test/utest_pkgmgr_publisher_dts.py
@@ -18,6 +18,7 @@
import argparse
import asyncio
+import gi
import logging
import mock
import os
@@ -26,7 +27,10 @@
import uuid
import xmlrunner
-import gi
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
gi.require_version('RwDts', '1.0')
gi.require_version('RwPkgMgmtYang', '1.0')
from gi.repository import (
@@ -36,7 +40,10 @@
import rift.tasklets.rwpkgmgr.downloader as downloader
import rift.tasklets.rwpkgmgr.publisher as pkg_publisher
import rift.test.dts
+from rift.mano.utils.project import ManoProject, DEFAULT_PROJECT
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
class TestCase(rift.test.dts.AbstractDTSTest):
@classmethod
@@ -51,8 +58,10 @@
self.log.debug("STARTING - %s", test_id)
self.tinfo = self.new_tinfo(str(test_id))
self.dts = rift.tasklets.DTS(self.tinfo, self.schema, self.loop)
+ self.project = ManoProject(self.log, name=DEFAULT_PROJECT)
- self.job_handler = pkg_publisher.DownloadStatusPublisher(self.log, self.dts, self.loop)
+ self.job_handler = pkg_publisher.DownloadStatusPublisher(self.log, self.dts,
+ self.loop, self.project)
def tearDown(self):
super().tearDown()
@@ -94,7 +103,7 @@
"""
yield from self.job_handler.register()
- mock_msg = RwPkgMgmtYang.DownloadJob.from_dict({
+ mock_msg = RwPkgMgmtYang.YangData_RwProject_Project_DownloadJobs_Job.from_dict({
"url": "http://foo/bar",
"package_id": "123",
"download_id": str(uuid.uuid4())})
@@ -102,24 +111,24 @@
yield from self.job_handler._dts_publisher(mock_msg)
yield from asyncio.sleep(5, loop=self.loop)
- itr = yield from self.dts.query_read("/download-jobs/job[download-id='{}']".format(
- mock_msg.download_id))
+ xpath = self.project.add_project("/download-jobs/job[download-id={}]".
+ format(quoted_key(mock_msg.download_id)))
+ itr = yield from self.dts.query_read(xpath)
result = None
for fut in itr:
result = yield from fut
result = result.result
- print ("Mock ", mock_msg)
+ self.log.debug("Mock msg: {}".format(mock_msg))
assert result == mock_msg
# Modify the msg
mock_msg.url = "http://bar/foo"
yield from self.job_handler._dts_publisher(mock_msg)
yield from asyncio.sleep(5, loop=self.loop)
-
- itr = yield from self.dts.query_read("/download-jobs/job[download-id='{}']".format(
- mock_msg.download_id))
+
+ itr = yield from self.dts.query_read(xpath)
result = None
for fut in itr:
@@ -138,7 +147,7 @@
proxy = mock.MagicMock()
- url = "http://boson.eng.riftio.com/common/unittests/plantuml.jar"
+ url = "http://sharedfiles/common/unittests/plantuml.jar"
url_downloader = downloader.PackageFileDownloader(url, "1", "/", "VNFD", "SCRIPTS", "VNF_CONFIG", proxy)
download_id = yield from self.job_handler.register_downloader(url_downloader)
@@ -146,8 +155,8 @@
# Waiting for 5 secs to be sure that the file is downloaded
yield from asyncio.sleep(10, loop=self.loop)
- xpath = "/download-jobs/job[download-id='{}']".format(
- download_id)
+ xpath = self.project.add_project("/download-jobs/job[download-id={}]".format(
+ quoted_key(download_id)))
result = yield from self.read_xpath(xpath)
self.log.debug("Test result before complete check - %s", result)
assert result.status == "COMPLETED"
@@ -166,14 +175,16 @@
# Here, we are assuming that there is no HTTP server at 10.1.2.3
url = "http://10.1.2.3/common/unittests/plantuml.jar"
url_downloader = downloader.PackageFileDownloader(url, "1", "/", "VNFD", "SCRIPTS", "VNF_CONFIG", proxy)
+ self.log.debug("Downloader url: {}".format(url_downloader))
download_id = yield from self.job_handler.register_downloader(url_downloader)
+ self.log.debug("Download id: {}".format(download_id))
assert download_id is not None
-
- # Waiting for 10 secs to be sure all reconnect attempts have been exhausted
- yield from asyncio.sleep(10, loop=self.loop)
- xpath = "/download-jobs/job[download-id='{}']".format(
- download_id)
+
+ # Waiting for 60 secs to be sure all reconnect attempts have been exhausted
+ yield from asyncio.sleep(60, loop=self.loop)
+ xpath = self.project.add_project("/download-jobs/job[download-id={}]".
+ format(quoted_key(download_id)))
result = yield from self.read_xpath(xpath)
self.log.debug("Test result before complete check - %s", result)
assert result.status == "FAILED"
@@ -190,19 +201,20 @@
yield from self.job_handler.register()
proxy = mock.MagicMock()
- url = "http://boson.eng.riftio.com/common/unittests/Fedora-x86_64-20-20131211.1-sda-ping.qcow2"
+ url = "http://sharedfiles/common/unittests/Fedora-x86_64-20-20131211.1-sda-ping.qcow2"
url_downloader = downloader.PackageFileDownloader(url, "1", "/", "VNFD", "SCRIPTS", "VNF_CONFIG", proxy)
download_id = yield from self.job_handler.register_downloader(url_downloader)
assert download_id is not None
- xpath = "/download-jobs/job[download-id='{}']".format(
- download_id)
+ xpath = self.project.add_project("/download-jobs/job[download-id={}]".
+ format(quoted_key(download_id)))
- yield from asyncio.sleep(1, loop=self.loop)
+ # wait long enough to have the state be in IN_PROGRESS
+ yield from asyncio.sleep(0.2, loop=self.loop)
result = yield from self.read_xpath(xpath)
self.log.debug("Test result before in_progress check - %s", result)
- assert result.status == "IN_PROGRESS"
+ assert result.status == "IN_PROGRESS"
yield from self.job_handler.cancel_download(download_id)
yield from asyncio.sleep(3, loop=self.loop)
@@ -210,7 +222,7 @@
self.log.debug("Test result before cancel check - %s", result)
assert result.status == "CANCELLED"
assert len(self.job_handler.tasks) == 0
-
+
def main():
runner = xmlrunner.XMLTestRunner(output=os.environ["RIFT_MODULE_TEST"])
diff --git a/rwlaunchpad/plugins/rwpkgmgr/test/utest_subscriber_dts.py b/rwlaunchpad/plugins/rwpkgmgr/test/utest_pkgmgr_subscriber_dts.py
similarity index 84%
rename from rwlaunchpad/plugins/rwpkgmgr/test/utest_subscriber_dts.py
rename to rwlaunchpad/plugins/rwpkgmgr/test/utest_pkgmgr_subscriber_dts.py
index 4281e11..6ae3a0a 100755
--- a/rwlaunchpad/plugins/rwpkgmgr/test/utest_subscriber_dts.py
+++ b/rwlaunchpad/plugins/rwpkgmgr/test/utest_pkgmgr_subscriber_dts.py
@@ -16,12 +16,17 @@
#
import asyncio
+import gi
import sys
import unittest
import uuid
+import os
-import gi
-gi.require_version('RwDtsYang', '1.0')
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
+gi.require_version('RwDts', '1.0')
gi.require_version('RwPkgMgmtYang', '1.0')
from gi.repository import (
RwPkgMgmtYang,
@@ -29,6 +34,10 @@
)
import rift.tasklets.rwpkgmgr.subscriber as pkg_subscriber
import rift.test.dts
+from rift.mano.utils.project import ManoProject, DEFAULT_PROJECT
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
class DescriptorPublisher(object):
@@ -88,6 +97,7 @@
self.tinfo = self.new_tinfo(str(test_id))
self.dts = rift.tasklets.DTS(self.tinfo, self.schema, self.loop)
self.publisher = DescriptorPublisher(self.log, self.dts, self.loop)
+ self.project = ManoProject(self.log, name=DEFAULT_PROJECT)
def tearDown(self):
super().tearDown()
@@ -95,13 +105,13 @@
@rift.test.dts.async_test
def test_download_status_handler(self):
- mock_msg = RwPkgMgmtYang.DownloadJob.from_dict({
+ mock_msg = RwPkgMgmtYang.YangData_RwProject_Project_DownloadJobs_Job.from_dict({
"url": "http://foo/bar",
"package_id": "123",
"download_id": str(uuid.uuid4())})
- w_xpath = "D,/rw-pkg-mgmt:download-jobs/rw-pkg-mgmt:job"
- xpath = "{}[download-id='{}']".format(w_xpath, mock_msg.download_id)
+ w_xpath = self.project.add_project("D,/rw-pkg-mgmt:download-jobs/rw-pkg-mgmt:job")
+ xpath = "{}[download-id={}]".format(w_xpath, quoted_key(mock_msg.download_id))
mock_called = False
def mock_cb(msg, status):
@@ -113,6 +123,7 @@
self.log,
self.dts,
self.loop,
+ self.project,
callback=mock_cb)
yield from sub.register()
@@ -120,7 +131,7 @@
yield from self.publisher.publish(w_xpath, xpath, mock_msg)
yield from asyncio.sleep(1, loop=self.loop)
-
+
assert mock_called is True
@@ -135,4 +146,4 @@
)
if __name__ == '__main__':
- main()
\ No newline at end of file
+ main()
diff --git a/rwlaunchpad/plugins/rwresmgr/CMakeLists.txt b/rwlaunchpad/plugins/rwresmgr/CMakeLists.txt
index e757e43..fdeea7b 100644
--- a/rwlaunchpad/plugins/rwresmgr/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwresmgr/CMakeLists.txt
@@ -24,7 +24,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
# anything not in a site-packages directory so we have to
@@ -37,5 +37,5 @@
rift/tasklets/${TASKLET_NAME}/rwresmgr_config.py
rift/tasklets/${TASKLET_NAME}/rwresmgr_core.py
rift/tasklets/${TASKLET_NAME}/rwresmgr_events.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
diff --git a/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_config.py b/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_config.py
index 5035b18..8f1a19c 100644
--- a/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_config.py
+++ b/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_config.py
@@ -1,6 +1,6 @@
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -51,12 +51,27 @@
self._parent = parent
self._cloud_sub = None
+ self._res_sub = None
+ self._project = parent._project
@asyncio.coroutine
def register(self):
yield from self.register_resource_pool_operational_data()
- self.register_cloud_account_config()
+ yield from self.register_cloud_account_config()
+ def deregister(self):
+ self._log.debug("De-register for project {}".format(self._project.name))
+ if self._cloud_sub:
+ self._cloud_sub.deregister()
+ self._cloud_sub = None
+
+ if self._res_sub:
+ self._res_sub.delete_element(
+ self._project.add_project(ResourceMgrConfig.XPATH_POOL_OPER_DATA))
+ self._res_sub.deregister()
+ self._res_sub = None
+
+ @asyncio.coroutine
def register_cloud_account_config(self):
def on_add_cloud_account_apply(account):
self._log.debug("Received on_add_cloud_account: %s", account)
@@ -78,16 +93,17 @@
)
self._cloud_sub = rift.mano.cloud.CloudAccountConfigSubscriber(
- self._dts, self._log, self._rwlog_hdl, cloud_callbacks
- )
- self._cloud_sub.register()
+ self._dts, self._log, self._rwlog_hdl,
+ self._project, cloud_callbacks
+ )
+ yield from self._cloud_sub.register()
@asyncio.coroutine
def register_resource_pool_operational_data(self):
@asyncio.coroutine
def on_prepare(xact_info, action, ks_path, msg):
self._log.debug("ResourceMgr providing resource-pool information")
- msg = RwResourceMgrYang.ResourcePoolRecords()
+ msg = RwResourceMgrYang.YangData_RwProject_Project_ResourcePoolRecords()
cloud_accounts = self._parent.get_cloud_account_names()
for cloud_account_name in cloud_accounts:
@@ -102,14 +118,14 @@
cloud_account_msg.records.append(pool_info)
xact_info.respond_xpath(rwdts.XactRspCode.ACK,
- ResourceMgrConfig.XPATH_POOL_OPER_DATA,
+ self._project.add_project(ResourceMgrConfig.XPATH_POOL_OPER_DATA),
msg=msg,)
- self._log.debug("Registering for Resource Mgr resource-pool-record using xpath: %s",
- ResourceMgrConfig.XPATH_POOL_OPER_DATA)
+ xpath = self._project.add_project(ResourceMgrConfig.XPATH_POOL_OPER_DATA)
+ self._log.debug("Registering for Resource Mgr resource-pool-record using xpath: {}".
+ format(xpath))
handler=rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare)
- response = yield from self._dts.register(xpath=ResourceMgrConfig.XPATH_POOL_OPER_DATA,
- handler=handler,
- flags=rwdts.Flag.PUBLISHER)
-
+ self._res_sub = yield from self._dts.register(xpath=xpath,
+ handler=handler,
+ flags=rwdts.Flag.PUBLISHER)
diff --git a/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_core.py b/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_core.py
index ccdd631..3dbd7b0 100644
--- a/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_core.py
+++ b/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_core.py
@@ -1,4 +1,4 @@
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -103,8 +103,29 @@
"19.0.0.0/24",
"20.0.0.0/24",
"21.0.0.0/24",
- "22.0.0.0/24",]
+ "22.0.0.0/24",
+ "23.0.0.0/24",
+ "24.0.0.0/24",
+ "25.0.0.0/24",
+ "26.0.0.0/24",
+ "27.0.0.0/24",
+ "28.0.0.0/24",
+ "29.0.0.0/24",
+ "30.0.0.0/24",
+ "31.0.0.0/24",
+ "32.0.0.0/24",
+ "33.0.0.0/24",
+ "34.0.0.0/24",
+ "35.0.0.0/24",
+ "36.0.0.0/24",
+ "37.0.0.0/24",
+ "38.0.0.0/24"]
self._subnet_ptr = 0
+ self._boot_cache = {'compute': []}
+ self._lock = asyncio.Lock(loop=self._loop)
+
+ def get_cloud_account(self):
+ return self._account
def _select_link_subnet(self):
subnet = self._subnets[self._subnet_ptr]
@@ -115,30 +136,25 @@
@asyncio.coroutine
def create_virtual_network(self, req_params):
- #rc, rsp = self._rwcal.get_virtual_link_list(self._account)
- self._log.debug("Calling get_virtual_link_list API")
- rc, rsp = yield from self._loop.run_in_executor(self._executor,
- self._rwcal.get_virtual_link_list,
- self._account)
-
- assert rc == RwStatus.SUCCESS
-
- links = [vlink for vlink in rsp.virtual_link_info_list if vlink.name == req_params.name]
- if links:
- self._log.debug("Found existing virtual-network with matching name in cloud. Reusing the virtual-network with id: %s" %(links[0].virtual_link_id))
+ rc, link = yield from self._loop.run_in_executor(self._executor,
+ self._rwcal.get_virtual_link_by_name,
+ self._account,
+ req_params.name)
+ if link:
+ self._log.debug("Found existing virtual-network with matching name in cloud. Reusing the virtual-network with id: %s" %(link.virtual_link_id))
if req_params.vim_network_name:
resource_type = 'precreated'
else:
# This is case of realloc
resource_type = 'dynamic'
- return (resource_type, links[0].virtual_link_id)
+ return (resource_type, link.virtual_link_id)
elif req_params.vim_network_name:
self._log.error("Virtual-network-allocate operation failed for cloud account: %s Vim Network with name %s does not pre-exist",
self._account.name, req_params.vim_network_name)
raise ResMgrCALOperationFailure("Virtual-network allocate operation failed for cloud account: %s Vim Network with name %s does not pre-exist"
%(self._account.name, req_params.vim_network_name))
- params = RwcalYang.VirtualLinkReqParams()
+ params = RwcalYang.YangData_RwProject_Project_VirtualLinkReqParams()
params.from_dict(req_params.as_dict())
params.subnet = self._select_link_subnet()
#rc, rs = self._rwcal.create_virtual_link(self._account, params)
@@ -169,7 +185,7 @@
network_id)
raise ResMgrCALOperationFailure("Virtual-network release operation failed for cloud account: %s. ResourceId: %s" %(self._account.name, network_id))
- @asyncio.coroutine
+ @asyncio.coroutine
def get_virtual_network_info(self, network_id):
#rc, rs = self._rwcal.get_virtual_link(self._account, network_id)
self._log.debug("Calling get_virtual_link_info API with id: %s" %(network_id))
@@ -186,26 +202,39 @@
@asyncio.coroutine
def create_virtual_compute(self, req_params):
- #rc, rsp = self._rwcal.get_vdu_list(self._account)
- self._log.debug("Calling get_vdu_list API")
+ if not self._boot_cache['compute']:
+ self._log.debug("Calling get_vdu_list API")
+ yield from self._lock.acquire()
+ try:
+ self._log.debug("Populating compute cache ")
+ rc, rsp = yield from self._loop.run_in_executor(self._executor,
+ self._rwcal.get_vdu_list,
+ self._account)
- rc, rsp = yield from self._loop.run_in_executor(self._executor,
- self._rwcal.get_vdu_list,
- self._account)
- assert rc == RwStatus.SUCCESS
- vdus = [vm for vm in rsp.vdu_info_list if vm.name == req_params.name]
+ if rc.status != RwStatus.SUCCESS:
+ self._log.error("Virtual-compute-info operation failed for cloud account: %s - error_msg: %s, Traceback: %s",
+ self._account.name, rc.error_msg, rc.traceback)
+ raise ResMgrCALOperationFailure("Virtual-compute-info operation failed for cloud account: %s, Error (%s)"
+ % (self._account.name, rc.error_msg))
+ self._boot_cache['compute'] = rsp.vdu_info_list
+ finally:
+ self._lock.release()
+ else:
+ self._log.debug("!!!!!!!! Found compute cache ")
+
+ vdus = [vm for vm in self._boot_cache['compute'] if vm.name == req_params.name]
+
if vdus:
self._log.debug("Found existing virtual-compute with matching name in cloud. Reusing the virtual-compute element with id: %s" %(vdus[0].vdu_id))
return vdus[0].vdu_id
- params = RwcalYang.VDUInitParams()
+ params = RwcalYang.YangData_RwProject_Project_VduInitParams()
params.from_dict(req_params.as_dict())
if 'image_name' in req_params:
image_checksum = req_params.image_checksum if req_params.has_field("image_checksum") else None
params.image_id = yield from self.get_image_id_from_image_info(req_params.image_name, image_checksum)
- #rc, rs = self._rwcal.create_vdu(self._account, params)
self._log.debug("Calling create_vdu API with params %s" %(str(params)))
rc, rs = yield from self._loop.run_in_executor(self._executor,
self._rwcal.create_vdu,
@@ -232,10 +261,13 @@
self._log.error("Virtual-compute-modify operation failed for cloud account: %s", self._account.name)
raise ResMgrCALOperationFailure("Virtual-compute-modify operation failed for cloud account: %s" %(self._account.name))
- @asyncio.coroutine
+ @asyncio.coroutine
def delete_virtual_compute(self, compute_id):
#rc = self._rwcal.delete_vdu(self._account, compute_id)
self._log.debug("Calling delete_vdu API with id: %s" %(compute_id))
+ # Delete the cache
+ self._boot_cache['compute'] = list()
+
rc = yield from self._loop.run_in_executor(self._executor,
self._rwcal.delete_vdu,
self._account,
@@ -246,19 +278,20 @@
compute_id)
raise ResMgrCALOperationFailure("Virtual-compute-release operation failed for cloud account: %s. ResourceID: %s" %(self._account.name, compute_id))
- @asyncio.coroutine
- def get_virtual_compute_info(self, compute_id):
- #rc, rs = self._rwcal.get_vdu(self._account, compute_id)
+ @asyncio.coroutine
+ def get_virtual_compute_info(self, compute_id, mgmt_network=""):
+ #rc, rs = self._rwcal.get_vdu(self._account, compute_id, None)
self._log.debug("Calling get_vdu API with id: %s" %(compute_id))
rc, rs = yield from self._loop.run_in_executor(self._executor,
self._rwcal.get_vdu,
self._account,
- compute_id)
- if rc != RwStatus.SUCCESS:
- self._log.error("Virtual-compute-info operation failed for cloud account: %s. ResourceID: %s",
- self._account.name,
- compute_id)
- raise ResMgrCALOperationFailure("Virtual-compute-info operation failed for cloud account: %s. ResourceID: %s" %(self._account.name, compute_id))
+ compute_id,
+ mgmt_network)
+ if rc.status != RwStatus.SUCCESS:
+ self._log.error("Virtual-compute-info operation failed for cloud account: %s - error_msg: %s, Traceback: %s",
+ self._account.name, rc.error_msg, rc.traceback)
+ raise ResMgrCALOperationFailure("Virtual-compute-info operation failed for cloud account: %s, ResourceID: %s, Error (%s)"
+ %(self._account.name, compute_id, rc.error_msg))
return rs
@asyncio.coroutine
@@ -276,7 +309,7 @@
@asyncio.coroutine
def create_compute_flavor(self, request):
- flavor = RwcalYang.FlavorInfoItem()
+ flavor = RwcalYang.YangData_RwProject_Project_VimResources_FlavorinfoList()
flavor.name = str(uuid.uuid4())
epa_types = ['vm_flavor', 'guest_epa', 'host_epa', 'host_aggregate']
epa_dict = {k: v for k, v in request.as_dict().items() if k in epa_types}
@@ -516,7 +549,7 @@
return resource_info
def get_pool_info(self):
- info = RwResourceMgrYang.ResourceRecordInfo()
+ info = RwResourceMgrYang.YangData_RwProject_Project_ResourcePoolRecords_CloudAccount_Records()
self._log.info("Providing info for pool: %s", self.name)
info.name = self.name
if self.pool_type:
@@ -621,9 +654,10 @@
@asyncio.coroutine
def allocate_dynamic_resource(self, request):
resource_type, resource_id = yield from self._cal.create_virtual_network(request)
- if resource_id in self._all_resources:
- self._log.error("Resource with id %s name %s of type %s is already used", resource_id, request.name, resource_type)
- raise ResMgrNoResourcesAvailable("Resource with name %s of type network is already used" %(resource_id))
+ # Removing the following check (RIFT-15144 MANO fails to attach to existing VIM network)
+ #if resource_id in self._all_resources:
+ # self._log.error("Resource with id %s name %s of type %s is already used", resource_id, request.name, resource_type)
+ # raise ResMgrNoResourcesAvailable("Resource with name %s of type network is already used" %(resource_id))
resource = self._resource_class(resource_id, resource_type, request)
self._all_resources[resource_id] = resource
self._allocated_resources[resource_id] = resource
@@ -649,7 +683,7 @@
info = yield from self._cal.get_virtual_network_info(resource.resource_id)
self._log.info("Successfully retrieved virtual-network information from CAL with resource-id: %s. Info: %s",
resource.resource_id, str(info))
- response = RwResourceMgrYang.VirtualLinkEventData_ResourceInfo()
+ response = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_ResourceInfo()
response.from_dict(info.as_dict())
response.pool_name = self.name
response.resource_state = 'active'
@@ -743,7 +777,7 @@
if resource is None:
raise ResMgrNoResourcesAvailable("No matching resource available for allocation from pool: %s" %(self.name))
- requested_params = RwcalYang.VDUInitParams()
+ requested_params = RwcalYang.YangData_RwProject_Project_VduInitParams()
requested_params.from_dict(request.as_dict())
resource.requested_params = requested_params
return resource
@@ -772,11 +806,14 @@
@asyncio.coroutine
def get_resource_info(self, resource):
- info = yield from self._cal.get_virtual_compute_info(resource.resource_id)
+ mgmt_network = ""
+ if resource.request.mgmt_network is not None:
+ mgmt_network = resource.request.mgmt_network
+ info = yield from self._cal.get_virtual_compute_info(resource.resource_id, mgmt_network=mgmt_network)
self._log.info("Successfully retrieved virtual-compute information from CAL with resource-id: %s. Info: %s",
resource.resource_id, str(info))
- response = RwResourceMgrYang.VDUEventData_ResourceInfo()
+ response = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_ResourceInfo()
response.from_dict(info.as_dict())
response.pool_name = self.name
response.resource_state = self._get_resource_state(info, resource.requested_params)
@@ -787,7 +824,7 @@
info = yield from self._cal.get_virtual_compute_info(resource_id)
self._log.info("Successfully retrieved virtual-compute information from CAL with resource-id: %s. Info: %s",
resource_id, str(info))
- return info
+ return info
def _get_resource_state(self, resource_info, requested_params):
@@ -806,6 +843,7 @@
if resource_info.state == 'failed':
self._log.error("<Compute-Resource: %s> Reached failed state.",
resource_info.name)
+ self._log.error("<Compute-Resource: {}> info at the time of failure: {}".format(resource_info.name, str(resource_info)))
return 'failed'
if resource_info.state != 'active':
@@ -819,10 +857,10 @@
return 'pending'
if (requested_params.has_field('allocate_public_address')) and (requested_params.allocate_public_address == True):
- if not resource_info.has_field('public_ip'):
- self._log.warning("<Compute-Resource: %s> Management IP not assigned- waiting for public ip, %s",
- resource_info.name, requested_params)
- return 'pending'
+ if not resource_info.has_field('public_ip'):
+ self._log.warning("<Compute-Resource: %s> Management IP not assigned- waiting for public ip, %s",
+ resource_info.name, requested_params)
+ return 'pending'
if not conn_pts_len_equal():
self._log.warning("<Compute-Resource: %s> Waiting for requested number of ports to be assigned to virtual-compute, requested: %d, assigned: %d",
@@ -917,8 +955,8 @@
elif available.has_field('pcie_device'):
self._log.debug("Rejecting available flavor because pcie_device not required but available")
return False
-
-
+
+
if required.has_field('mempage_size'):
self._log.debug("Matching mempage_size")
if available.has_field('mempage_size') == False:
@@ -931,7 +969,7 @@
elif available.has_field('mempage_size'):
self._log.debug("Rejecting available flavor because mempage_size not required but available")
return False
-
+
if required.has_field('cpu_pinning_policy'):
self._log.debug("Matching cpu_pinning_policy")
if required.cpu_pinning_policy != 'ANY':
@@ -945,7 +983,7 @@
elif available.has_field('cpu_pinning_policy'):
self._log.debug("Rejecting available flavor because cpu_pinning_policy not required but available")
return False
-
+
if required.has_field('cpu_thread_pinning_policy'):
self._log.debug("Matching cpu_thread_pinning_policy")
if available.has_field('cpu_thread_pinning_policy') == False:
@@ -972,7 +1010,7 @@
elif available.has_field('trusted_execution'):
self._log.debug("Rejecting available flavor because trusted_execution not required but available")
return False
-
+
if required.has_field('numa_node_policy'):
self._log.debug("Matching numa_node_policy")
if available.has_field('numa_node_policy') == False:
@@ -991,7 +1029,7 @@
elif available.numa_node_policy.has_field('node_cnt'):
self._log.debug("Rejecting available flavor because numa node count not required but available")
return False
-
+
if required.numa_node_policy.has_field('mem_policy'):
self._log.debug("Matching numa_node_policy mem_policy")
if available.numa_node_policy.has_field('mem_policy') == False:
@@ -1058,7 +1096,7 @@
elif available.has_field('cpu_model'):
self._log.debug("Rejecting available flavor because cpu_model not required but available")
return False
-
+
if required.has_field('cpu_arch'):
self._log.debug("Matching CPU architecture")
if available.has_field('cpu_arch') == False:
@@ -1072,7 +1110,7 @@
elif available.has_field('cpu_arch'):
self._log.debug("Rejecting available flavor because cpu_arch not required but available")
return False
-
+
if required.has_field('cpu_vendor'):
self._log.debug("Matching CPU vendor")
if available.has_field('cpu_vendor') == False:
@@ -1099,7 +1137,7 @@
elif available.has_field('cpu_socket_count'):
self._log.debug("Rejecting available flavor because cpu_socket_count not required but available")
return False
-
+
if required.has_field('cpu_core_count'):
self._log.debug("Matching CPU core count")
if available.has_field('cpu_core_count') == False:
@@ -1112,7 +1150,7 @@
elif available.has_field('cpu_core_count'):
self._log.debug("Rejecting available flavor because cpu_core_count not required but available")
return False
-
+
if required.has_field('cpu_core_thread_count'):
self._log.debug("Matching CPU core thread count")
if available.has_field('cpu_core_thread_count') == False:
@@ -1125,7 +1163,7 @@
elif available.has_field('cpu_core_thread_count'):
self._log.debug("Rejecting available flavor because cpu_core_thread_count not required but available")
return False
-
+
if required.has_field('cpu_feature'):
self._log.debug("Matching CPU feature list")
if available.has_field('cpu_feature') == False:
@@ -1139,13 +1177,13 @@
elif available.has_field('cpu_feature'):
self._log.debug("Rejecting available flavor because cpu_feature not required but available")
return False
- self._log.info("Successful match for Host EPA attributes")
+ self._log.info("Successful match for Host EPA attributes")
return True
def _match_placement_group_inputs(self, required, available):
self._log.info("Matching Host aggregate attributes")
-
+
if not required and not available:
# Host aggregate not required and not available => success
self._log.info("Successful match for Host Aggregate attributes")
@@ -1166,8 +1204,8 @@
# - Host aggregate not required but available
self._log.debug("Rejecting available flavor because host Aggregate mismatch. Required: %s, Available: %s ", required, available)
return False
-
-
+
+
def match_image_params(self, resource_info, request_params):
return True
@@ -1208,13 +1246,13 @@
if result == False:
self._log.debug("Host Aggregate mismatched")
return False
-
+
return True
@asyncio.coroutine
def initialize_resource_in_cal(self, resource, request):
self._log.info("Initializing the compute-resource with id: %s in RW.CAL", resource.resource_id)
- modify_params = RwcalYang.VDUModifyParams()
+ modify_params = RwcalYang.YangData_RwProject_Project_VduModifyParams()
modify_params.vdu_id = resource.resource_id
modify_params.image_id = request.image_id
@@ -1226,10 +1264,10 @@
point.virtual_link_id = c_point.virtual_link_id
yield from self._cal.modify_virtual_compute(modify_params)
- @asyncio.coroutine
+ @asyncio.coroutine
def uninitialize_resource_in_cal(self, resource):
self._log.info("Un-initializing the compute-resource with id: %s in RW.CAL", resource.resource_id)
- modify_params = RwcalYang.VDUModifyParams()
+ modify_params = RwcalYang.YangData_RwProject_Project_VduModifyParams()
modify_params.vdu_id = resource.resource_id
resource_info = yield from self.get_resource_info(resource)
for c_point in resource_info.connection_points:
@@ -1302,6 +1340,11 @@
""" Returns a list of configured cloud account names """
return self._cloud_cals.keys()
+ def get_cloud_account_detail(self, account_name):
+ """ Returns the cloud detail message"""
+ cloud_account = self._cloud_cals[account_name]
+ return cloud_account.get_cloud_account()
+
def add_cloud_account(self, account):
self._log.debug("Received CAL account. Account Name: %s, Account Type: %s",
account.name, account.account_type)
@@ -1425,7 +1468,7 @@
self._log.info("Selected pool %s for resource allocation", pool.name)
r_id, r_info = yield from pool.allocate_resource(request)
-
+
self._resource_table[event_id] = (r_id, cloud_account_name, pool.name)
return r_info
@@ -1466,7 +1509,7 @@
self._resource_table[event_id] = (r_id, cloud_account_name, resource.pool_name)
new_resource = pool._resource_class(r_id, 'dynamic', request)
if resource_type == 'compute':
- requested_params = RwcalYang.VDUInitParams()
+ requested_params = RwcalYang.YangData_RwProject_Project_VduInitParams()
requested_params.from_dict(request.as_dict())
new_resource.requested_params = requested_params
pool._all_resources[r_id] = new_resource
diff --git a/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_events.py b/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_events.py
index c80925c..d2f9709 100755
--- a/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_events.py
+++ b/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgr_events.py
@@ -16,9 +16,9 @@
#
import asyncio
+import gi
import sys
-import gi
gi.require_version('RwDts', '1.0')
gi.require_version('RwYang', '1.0')
gi.require_version('RwResourceMgrYang', '1.0')
@@ -31,6 +31,8 @@
RwLaunchpadYang,
RwcalYang,
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
from gi.repository.RwTypes import RwStatus
import rift.tasklets
@@ -48,6 +50,7 @@
self._dts = dts
self._loop = loop
self._parent = parent
+ self._project = parent._project
self._vdu_reg = None
self._link_reg = None
@@ -60,22 +63,34 @@
yield from asyncio.wait([self._link_reg_event.wait(), self._vdu_reg_event.wait()],
timeout=timeout, loop=self._loop)
- def create_record_dts(self, regh, xact, path, msg):
+ def _add_config_flag(self, xpath, config=False):
+ if xpath[0] == '/':
+ if config:
+ return 'C,' + xpath
+ else:
+ return 'D,' + xpath
+
+ return xpath
+
+ def create_record_dts(self, regh, xact, xpath, msg):
"""
Create a record in DTS with path and message
"""
+ path = self._add_config_flag(self._project.add_project(xpath))
self._log.debug("Creating Resource Record xact = %s, %s:%s",
xact, path, msg)
regh.create_element(path, msg)
- def delete_record_dts(self, regh, xact, path):
+ def delete_record_dts(self, regh, xact, xpath):
"""
Delete a VNFR record in DTS with path and message
"""
+ path = self._add_config_flag(self._project.add_project(xpath))
self._log.debug("Deleting Resource Record xact = %s, %s",
xact, path)
regh.delete_element(path)
+
@asyncio.coroutine
def register(self):
@asyncio.coroutine
@@ -90,15 +105,27 @@
"""
# wait for 3 seconds
yield from asyncio.sleep(3, loop=self._loop)
+
+ try:
+ response_info = yield from self._parent.reallocate_virtual_network(
+ link.event_id,
+ link.cloud_account,
+ link.request_info, link.resource_info,
+ )
+ except Exception as e:
+ self._log.error("Encoutered exception in reallocate_virtual_network")
+ self._log.exception(e)
- response_info = yield from self._parent.reallocate_virtual_network(link.event_id,
- link.cloud_account,
- link.request_info, link.resource_info,
- )
+
if (xact_event == rwdts.MemberEvent.INSTALL):
link_cfg = self._link_reg.elements
+ self._log.debug("onlink_event INSTALL event: {}".format(link_cfg))
+
for link in link_cfg:
self._loop.create_task(instantiate_realloc_vn(link))
+
+ self._log.debug("onlink_event INSTALL event complete")
+
return rwdts.MemberRspCode.ACTION_OK
@asyncio.coroutine
@@ -114,82 +141,135 @@
# wait for 3 seconds
yield from asyncio.sleep(3, loop=self._loop)
- response_info = yield from self._parent.allocate_virtual_compute(vdu.event_id,
- vdu.cloud_account,
- vdu.request_info
- )
- if (xact_event == rwdts.MemberEvent.INSTALL):
- vdu_cfg = self._vdu_reg.elements
- for vdu in vdu_cfg:
- self._loop.create_task(instantiate_realloc_vdu(vdu))
- return rwdts.MemberRspCode.ACTION_OK
+ try:
+ response_info = yield from self._parent.allocate_virtual_compute(
+ vdu.event_id,
+ vdu.cloud_account,
+ vdu.request_info
+ )
+ except Exception as e:
+ self._log.error("Encoutered exception in allocate_virtual_network")
+ self._log.exception(e)
+ raise e
- def on_link_request_commit(xact_info):
- """ The transaction has been committed """
- self._log.debug("Received link request commit (xact_info: %s)", xact_info)
+ response_xpath = "/rw-resource-mgr:resource-mgmt/rw-resource-mgr:vdu-event/rw-resource-mgr:vdu-event-data[rw-resource-mgr:event-id={}]/resource-info".format(
+ quoted_key(vdu.event_id.strip()))
+
+ cloud_account = self._parent.get_cloud_account_detail(cloud_account)
+ asyncio.ensure_future(monitor_vdu_state(response_xpath, vdu.event_id, cloud_account.vdu_instance_timeout), loop=self._loop)
+
+ if (xact_event == rwdts.MemberEvent.INSTALL):
+ vdu_cfg = self._vdu_reg.elements
+ self._log.debug("onvdu_event INSTALL event: {}".format(vdu_cfg))
+
+ for vdu in vdu_cfg:
+ self._loop.create_task(instantiate_realloc_vdu(vdu))
+
+ self._log.debug("onvdu_event INSTALL event complete")
+
return rwdts.MemberRspCode.ACTION_OK
@asyncio.coroutine
+ def allocate_vlink_task(ks_path, event_id, cloud_account, request_info):
+ response_xpath = ks_path.to_xpath(RwResourceMgrYang.get_schema()) + "/resource-info"
+ schema = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData().schema()
+ pathentry = schema.keyspec_to_entry(ks_path)
+ try:
+ response_info = yield from self._parent.allocate_virtual_network(pathentry.key00.event_id,
+ cloud_account,
+ request_info)
+ except Exception as e:
+ self._log.error("Encountered exception: %s while creating virtual network", str(e))
+ self._log.exception(e)
+ response_info = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_ResourceInfo()
+ response_info.resource_state = 'failed'
+ response_info.resource_errors = str(e)
+ yield from self._dts.query_update(response_xpath,
+ rwdts.XactFlag.ADVISE,
+ response_info)
+ else:
+ yield from self._dts.query_update(response_xpath,
+ rwdts.XactFlag.ADVISE,
+ response_info)
+
+
+ @asyncio.coroutine
def on_link_request_prepare(xact_info, action, ks_path, request_msg):
- self._log.debug("Received virtual-link on_prepare callback (xact_info: %s, action: %s): %s",
+ self._log.debug(
+ "Received virtual-link on_prepare callback (xact_info: %s, action: %s): %s",
xact_info, action, request_msg)
response_info = None
response_xpath = ks_path.to_xpath(RwResourceMgrYang.get_schema()) + "/resource-info"
- schema = RwResourceMgrYang.VirtualLinkEventData().schema()
+ schema = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData().schema()
pathentry = schema.keyspec_to_entry(ks_path)
if action == rwdts.QueryAction.CREATE:
try:
- response_info = yield from self._parent.allocate_virtual_network(pathentry.key00.event_id,
- request_msg.cloud_account,
- request_msg.request_info)
+ response_info = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_ResourceInfo()
+ response_info.resource_state = 'pending'
+ request_msg.resource_info = response_info
+ self.create_record_dts(self._link_reg,
+ None,
+ ks_path.to_xpath(RwResourceMgrYang.get_schema()),
+ request_msg)
+
+ asyncio.ensure_future(allocate_vlink_task(ks_path,
+ pathentry.key00.event_id,
+ request_msg.cloud_account,
+ request_msg.request_info),
+ loop = self._loop)
except Exception as e:
- self._log.error("Encountered exception: %s while creating virtual network", str(e))
+ self._log.error(
+ "Encountered exception: %s while creating virtual network", str(e))
self._log.exception(e)
- response_info = RwResourceMgrYang.VirtualLinkEventData_ResourceInfo()
+ response_info = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_ResourceInfo()
response_info.resource_state = 'failed'
response_info.resource_errors = str(e)
yield from self._dts.query_update(response_xpath,
rwdts.XactFlag.ADVISE,
response_info)
- else:
- request_msg.resource_info = response_info
- self.create_record_dts(self._link_reg, None, ks_path.to_xpath(RwResourceMgrYang.get_schema()), request_msg)
elif action == rwdts.QueryAction.DELETE:
yield from self._parent.release_virtual_network(pathentry.key00.event_id)
- self.delete_record_dts(self._link_reg, None, ks_path.to_xpath(RwResourceMgrYang.get_schema()))
- elif action == rwdts.QueryAction.READ:
- response_info = yield from self._parent.read_virtual_network_info(pathentry.key00.event_id)
- else:
- raise ValueError("Only read/create/delete actions available. Received action: %s" %(action))
+ self.delete_record_dts(self._link_reg, None,
+ ks_path.to_xpath(RwResourceMgrYang.get_schema()))
- self._log.debug("Responding with VirtualLinkInfo at xpath %s: %s.",
- response_xpath, response_info)
+ elif action == rwdts.QueryAction.READ:
+ # TODO: Check why we are getting null event id request
+ if pathentry.key00.event_id:
+ response_info = yield from self._parent.read_virtual_network_info(pathentry.key00.event_id)
+ else:
+ xact_info.respond_xpath(rwdts.XactRspCode.NA)
+ return
+ else:
+ raise ValueError(
+ "Only read/create/delete actions available. Received action: %s" %(action))
+
+ self._log.info("Responding with VirtualLinkInfo at xpath %s: %s.",
+ response_xpath, response_info)
xact_info.respond_xpath(rwdts.XactRspCode.ACK, response_xpath, response_info)
- def on_vdu_request_commit(xact_info):
- """ The transaction has been committed """
- self._log.debug("Received vdu request commit (xact_info: %s)", xact_info)
- return rwdts.MemberRspCode.ACTION_OK
- def monitor_vdu_state(response_xpath, pathentry):
+ def monitor_vdu_state(response_xpath, event_id, vdu_timeout):
self._log.info("Initiating VDU state monitoring for xpath: %s ", response_xpath)
- time_to_wait = 300
sleep_time = 2
- loop_cnt = int(time_to_wait/sleep_time)
+ loop_cnt = int(vdu_timeout/sleep_time)
+
for i in range(loop_cnt):
- self._log.debug("VDU state monitoring for xpath: %s. Sleeping for 2 second", response_xpath)
+ self._log.debug(
+ "VDU state monitoring for xpath: %s. Sleeping for 2 second", response_xpath)
yield from asyncio.sleep(2, loop = self._loop)
+
try:
- response_info = yield from self._parent.read_virtual_compute_info(pathentry.key00.event_id)
+ response_info = yield from self._parent.read_virtual_compute_info(event_id)
except Exception as e:
- self._log.info("VDU state monitoring: Received exception %s in VDU state monitoring for %s. Aborting monitoring",
- str(e),response_xpath)
- response_info = RwResourceMgrYang.VDUEventData_ResourceInfo()
+ self._log.info(
+ "VDU state monitoring: Received exception %s in VDU state monitoring for %s. Aborting monitoring", str(e),response_xpath)
+
+ response_info = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_ResourceInfo()
response_info.resource_state = 'failed'
response_info.resource_errors = str(e)
yield from self._dts.query_update(response_xpath,
@@ -197,7 +277,8 @@
response_info)
else:
if response_info.resource_state == 'active' or response_info.resource_state == 'failed':
- self._log.info("VDU state monitoring: VDU reached terminal state. Publishing VDU info: %s at path: %s",
+ self._log.info("VDU state monitoring: VDU reached terminal state. " +
+ "Publishing VDU info: %s at path: %s",
response_info, response_xpath)
yield from self._dts.query_update(response_xpath,
rwdts.XactFlag.ADVISE,
@@ -205,9 +286,11 @@
return
else:
### End of loop. This is only possible if VDU did not reach active state
- err_msg = "VDU state monitoring: VDU at xpath :{} did not reached active state in {} seconds. Aborting monitoring".format(response_xpath, time_to_wait)
+ err_msg = ("VDU state monitoring: VDU at xpath :{} did not reached active " +
+ "state in {} seconds. Aborting monitoring".
+ format(response_xpath, time_to_wait))
self._log.info(err_msg)
- response_info = RwResourceMgrYang.VDUEventData_ResourceInfo()
+ response_info = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_ResourceInfo()
response_info.resource_state = 'failed'
response_info.resource_errors = err_msg
yield from self._dts.query_update(response_xpath,
@@ -217,7 +300,8 @@
def allocate_vdu_task(ks_path, event_id, cloud_account, request_msg):
response_xpath = ks_path.to_xpath(RwResourceMgrYang.get_schema()) + "/resource-info"
- schema = RwResourceMgrYang.VDUEventData().schema()
+ response_xpath = self._add_config_flag(response_xpath)
+ schema = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData().schema()
pathentry = schema.keyspec_to_entry(ks_path)
try:
response_info = yield from self._parent.allocate_virtual_compute(event_id,
@@ -225,34 +309,42 @@
request_msg,)
except Exception as e:
self._log.error("Encountered exception : %s while creating virtual compute", str(e))
- response_info = RwResourceMgrYang.VDUEventData_ResourceInfo()
+ response_info = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_ResourceInfo()
response_info.resource_state = 'failed'
response_info.resource_errors = str(e)
yield from self._dts.query_update(response_xpath,
rwdts.XactFlag.ADVISE,
response_info)
else:
+ cloud_account = self._parent.get_cloud_account_detail(cloud_account)
+ #RIFT-17719 - Set the resource state to active if no floating ip pool specified and is waiting for public ip.
+ if response_info.resource_state == 'pending' and cloud_account.has_field('openstack') \
+ and not (cloud_account.openstack.has_field('floating_ip_pool')) :
+ if (request_msg.has_field('allocate_public_address')) and (request_msg.allocate_public_address == True):
+ if not response_info.has_field('public_ip'):
+ response_info.resource_state = 'active'
+
if response_info.resource_state == 'failed' or response_info.resource_state == 'active' :
- self._log.info("Virtual compute create task completed. Publishing VDU info: %s at path: %s",
- response_info, response_xpath)
+ self._log.debug("Virtual compute create task completed. Publishing VDU info: %s at path: %s",
+ response_info, response_xpath)
yield from self._dts.query_update(response_xpath,
rwdts.XactFlag.ADVISE,
response_info)
else:
- asyncio.ensure_future(monitor_vdu_state(response_xpath, pathentry),
+ asyncio.ensure_future(monitor_vdu_state(response_xpath, pathentry.key00.event_id, cloud_account.vdu_instance_timeout),
loop = self._loop)
-
@asyncio.coroutine
def on_vdu_request_prepare(xact_info, action, ks_path, request_msg):
self._log.debug("Received vdu on_prepare callback (xact_info: %s, action: %s): %s",
xact_info, action, request_msg)
response_xpath = ks_path.to_xpath(RwResourceMgrYang.get_schema()) + "/resource-info"
- schema = RwResourceMgrYang.VDUEventData().schema()
+ response_xpath = self._add_config_flag(response_xpath)
+ schema = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData().schema()
pathentry = schema.keyspec_to_entry(ks_path)
if action == rwdts.QueryAction.CREATE:
- response_info = RwResourceMgrYang.VDUEventData_ResourceInfo()
+ response_info = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_ResourceInfo()
response_info.resource_state = 'pending'
request_msg.resource_info = response_info
self.create_record_dts(self._vdu_reg,
@@ -269,7 +361,12 @@
yield from self._parent.release_virtual_compute(pathentry.key00.event_id)
self.delete_record_dts(self._vdu_reg, None, ks_path.to_xpath(RwResourceMgrYang.get_schema()))
elif action == rwdts.QueryAction.READ:
- response_info = yield from self._parent.read_virtual_compute_info(pathentry.key00.event_id)
+ # TODO: Check why we are getting null event id request
+ if pathentry.key00.event_id:
+ response_info = yield from self._parent.read_virtual_compute_info(pathentry.key00.event_id)
+ else:
+ xact_info.respond_xpath(rwdts.XactRspCode.NA)
+ return
else:
raise ValueError("Only create/delete actions available. Received action: %s" %(action))
@@ -293,24 +390,35 @@
link_handlers = rift.tasklets.Group.Handler(on_event=onlink_event,)
with self._dts.group_create(handler=link_handlers) as link_group:
- self._log.debug("Registering for Link Resource Request using xpath: %s",
- ResourceMgrEvent.VLINK_REQUEST_XPATH)
+ xpath = self._project.add_project(ResourceMgrEvent.VLINK_REQUEST_XPATH)
+ self._log.debug("Registering for Link Resource Request using xpath: {}".
+ format(xpath))
- self._link_reg = link_group.register(xpath=ResourceMgrEvent.VLINK_REQUEST_XPATH,
- handler=rift.tasklets.DTS.RegistrationHandler(on_ready=on_request_ready,
- on_commit=on_link_request_commit,
- on_prepare=on_link_request_prepare),
- flags=rwdts.Flag.PUBLISHER | rwdts.Flag.DATASTORE,)
-
+ self._link_reg = link_group.register(xpath=xpath,
+ handler=rift.tasklets.DTS.RegistrationHandler(on_ready=on_request_ready,
+ on_prepare=on_link_request_prepare),
+ flags=rwdts.Flag.PUBLISHER | rwdts.Flag.DATASTORE,)
+
vdu_handlers = rift.tasklets.Group.Handler(on_event=onvdu_event, )
with self._dts.group_create(handler=vdu_handlers) as vdu_group:
+
+ xpath = self._project.add_project(ResourceMgrEvent.VDU_REQUEST_XPATH)
+ self._log.debug("Registering for VDU Resource Request using xpath: {}".
+ format(xpath))
- self._log.debug("Registering for VDU Resource Request using xpath: %s",
- ResourceMgrEvent.VDU_REQUEST_XPATH)
+ self._vdu_reg = vdu_group.register(xpath=xpath,
+ handler=rift.tasklets.DTS.RegistrationHandler(on_ready=on_request_ready,
+ on_prepare=on_vdu_request_prepare),
+ flags=rwdts.Flag.PUBLISHER | rwdts.Flag.DATASTORE,)
- self._vdu_reg = vdu_group.register(xpath=ResourceMgrEvent.VDU_REQUEST_XPATH,
- handler=rift.tasklets.DTS.RegistrationHandler(on_ready=on_request_ready,
- on_commit=on_vdu_request_commit,
- on_prepare=on_vdu_request_prepare),
- flags=rwdts.Flag.PUBLISHER | rwdts.Flag.DATASTORE,)
+ def deregister(self):
+ self._log.debug("De-register for project {}".format(self._project.name))
+
+ if self._vdu_reg:
+ self._vdu_reg.deregister()
+ self._vdu_reg = None
+
+ if self._link_reg:
+ self._link_reg.deregister()
+ self._link_reg = None
diff --git a/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgrtasklet.py b/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgrtasklet.py
index 44e7938..e609ef2 100755
--- a/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgrtasklet.py
+++ b/rwlaunchpad/plugins/rwresmgr/rift/tasklets/rwresmgrtasklet/rwresmgrtasklet.py
@@ -34,6 +34,10 @@
)
import rift.tasklets
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectHandler,
+)
from . import rwresmgr_core as Core
from . import rwresmgr_config as Config
@@ -41,11 +45,13 @@
class ResourceManager(object):
- def __init__(self, log, log_hdl, loop, dts):
+ def __init__(self, log, log_hdl, loop, dts, project):
self._log = log
self._log_hdl = log_hdl
self._loop = loop
self._dts = dts
+ self._project = project
+
self.config_handler = Config.ResourceMgrConfig(self._dts, self._log, self._log_hdl, self._loop, self)
self.event_handler = Event.ResourceMgrEvent(self._dts, self._log, self._loop, self)
self.core = Core.ResourceMgrCore(self._dts, self._log, self._log_hdl, self._loop, self)
@@ -55,6 +61,10 @@
yield from self.config_handler.register()
yield from self.event_handler.register()
+ def deregister(self):
+ self.event_handler.deregister()
+ self.config_handler.deregister()
+
def add_cloud_account_config(self, account):
self._log.debug("Received Cloud-Account add config event for account: %s", account.name)
self.core.add_cloud_account(account)
@@ -72,6 +82,9 @@
cloud_account_names = self.core.get_cloud_account_names()
return cloud_account_names
+ def get_cloud_account_detail(self, account_name):
+ return self.core.get_cloud_account_detail(account_name)
+
def pool_add(self, cloud_account_name, pool):
self._log.debug("Received Pool add event for cloud account %s pool: %s",
cloud_account_name, pool.name)
@@ -160,16 +173,45 @@
return info
+class ResMgrProject(ManoProject):
+
+ def __init__(self, name, tasklet, **kw):
+ super(ResMgrProject, self).__init__(tasklet.log, name)
+ self.update(tasklet)
+
+ self._resource_manager = None
+
+ @asyncio.coroutine
+ def register (self):
+ self._log.debug("Initializing the Resource Manager tasklet for project {}".
+ format(self.name))
+ self._resource_manager = ResourceManager(self._log,
+ self._log_hdl,
+ self._loop,
+ self._dts,
+ self,)
+ yield from self._resource_manager.register()
+
+ def deregister(self):
+ self._log.debug("De-registering project {}".format(self.name))
+ self._resource_manager.deregister()
+
+
class ResMgrTasklet(rift.tasklets.Tasklet):
def __init__(self, *args, **kwargs):
super(ResMgrTasklet, self).__init__(*args, **kwargs)
self.rwlog.set_category("rw-resource-mgr-log")
self._dts = None
- self._resource_manager = None
+ self._project_handler = None
+ self.projects = {}
+
+ @property
+ def dts(self):
+ return self._dts
def start(self):
super(ResMgrTasklet, self).start()
- self.log.info("Starting ResMgrTasklet")
+ self.log.debug("Starting ResMgrTasklet")
self.log.debug("Registering with dts")
@@ -192,12 +234,9 @@
@asyncio.coroutine
def init(self):
- self._log.info("Initializing the Resource Manager tasklet")
- self._resource_manager = ResourceManager(self.log,
- self.log_hdl,
- self.loop,
- self._dts)
- yield from self._resource_manager.register()
+ self.log.debug("creating project handler")
+ self.project_handler = ProjectHandler(self, ResMgrProject)
+ self.project_handler.register()
@asyncio.coroutine
def run(self):
diff --git a/rwlaunchpad/plugins/rwresmgr/test/rmmgr_test.py b/rwlaunchpad/plugins/rwresmgr/test/rmmgr_test.py
index 87d11a2..4a063cb 100755
--- a/rwlaunchpad/plugins/rwresmgr/test/rmmgr_test.py
+++ b/rwlaunchpad/plugins/rwresmgr/test/rmmgr_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,19 +16,17 @@
# limitations under the License.
#
-
import asyncio
+import gi
import logging
import os
+import random
import sys
import types
import unittest
import uuid
-import random
-
import xmlrunner
-import gi
gi.require_version('CF', '1.0')
gi.require_version('RwDts', '1.0')
gi.require_version('RwMain', '1.0')
@@ -38,6 +36,8 @@
gi.require_version('RwTypes', '1.0')
gi.require_version('RwCal', '1.0')
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
import gi.repository.CF as cf
import gi.repository.RwDts as rwdts
@@ -72,7 +72,7 @@
resource_requests = {'compute': {}, 'network': {}}
###### mycompute-0
- msg = rmgryang.VDUEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_RequestInfo()
msg.image_id = str(uuid.uuid3(uuid.NAMESPACE_DNS, 'image-0'))
msg.vm_flavor.vcpu_count = 4
msg.vm_flavor.memory_mb = 8192
@@ -80,7 +80,7 @@
resource_requests['compute']['mycompute-0'] = msg
###### mycompute-1
- msg = rmgryang.VDUEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_RequestInfo()
msg.image_id = str(uuid.uuid3(uuid.NAMESPACE_DNS, 'image-1'))
msg.vm_flavor.vcpu_count = 2
msg.vm_flavor.memory_mb = 8192
@@ -88,11 +88,11 @@
resource_requests['compute']['mycompute-1'] = msg
####### mynet-0
- msg = rmgryang.VirtualLinkEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_RequestInfo()
resource_requests['network']['mynet-0'] = msg
####### mynet-1
- msg = rmgryang.VirtualLinkEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_RequestInfo()
resource_requests['network']['mynet-1'] = msg
return resource_requests
@@ -103,7 +103,7 @@
resource_requests = {'compute': {}, 'network': {}}
###### mycompute-0
- msg = rmgryang.VDUEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_RequestInfo()
msg.image_id = "1"
msg.vm_flavor.vcpu_count = 4
msg.vm_flavor.memory_mb = 8192
@@ -111,7 +111,7 @@
resource_requests['compute']['mycompute-0'] = msg
###### mycompute-1
- msg = rmgryang.VDUEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_RequestInfo()
msg.image_id = "1"
msg.vm_flavor.vcpu_count = 2
msg.vm_flavor.memory_mb = 8192
@@ -119,11 +119,11 @@
resource_requests['compute']['mycompute-1'] = msg
####### mynet-0
- msg = rmgryang.VirtualLinkEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_RequestInfo()
resource_requests['network']['mynet-0'] = msg
####### mynet-1
- msg = rmgryang.VirtualLinkEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_RequestInfo()
resource_requests['network']['mynet-1'] = msg
return resource_requests
@@ -133,7 +133,7 @@
resource_requests = {'compute': {}, 'network': {}}
###### mycompute-0
- msg = rmgryang.VDUEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_RequestInfo()
msg.image_id = str(uuid.uuid3(uuid.NAMESPACE_DNS, 'image-0'))
msg.vm_flavor.vcpu_count = 4
msg.vm_flavor.memory_mb = 8192
@@ -141,7 +141,7 @@
resource_requests['compute']['mycompute-0'] = msg
###### mycompute-1
- msg = rmgryang.VDUEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_RequestInfo()
msg.image_id = str(uuid.uuid3(uuid.NAMESPACE_DNS, 'image-1'))
msg.vm_flavor.vcpu_count = 2
msg.vm_flavor.memory_mb = 8192
@@ -149,11 +149,11 @@
resource_requests['compute']['mycompute-1'] = msg
####### mynet-0
- msg = rmgryang.VirtualLinkEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_RequestInfo()
resource_requests['network']['mynet-0'] = msg
####### mynet-1
- msg = rmgryang.VirtualLinkEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_RequestInfo()
resource_requests['network']['mynet-1'] = msg
return resource_requests
@@ -164,7 +164,7 @@
resource_requests = {'compute': {}, 'network': {}}
###### mycompute-0
- msg = rmgryang.VDUEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_RequestInfo()
msg.image_id = openstack_info['image_id']
msg.vm_flavor.vcpu_count = 4
msg.vm_flavor.memory_mb = 8192
@@ -172,7 +172,7 @@
resource_requests['compute']['mycompute-0'] = msg
###### mycompute-1
- msg = rmgryang.VDUEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_RequestInfo()
msg.image_id = openstack_info['image_id']
msg.vm_flavor.vcpu_count = 2
msg.vm_flavor.memory_mb = 4096
@@ -180,14 +180,14 @@
resource_requests['compute']['mycompute-1'] = msg
####### mynet-0
- msg = rmgryang.VirtualLinkEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_RequestInfo()
msg.provider_network.physical_network = 'PHYSNET1'
msg.provider_network.overlay_type = 'VLAN'
msg.provider_network.segmentation_id = 17
resource_requests['network']['mynet-0'] = msg
####### mynet-1
- msg = rmgryang.VirtualLinkEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_RequestInfo()
msg.provider_network.physical_network = 'PHYSNET1'
msg.provider_network.overlay_type = 'VLAN'
msg.provider_network.segmentation_id = 18
@@ -201,7 +201,7 @@
resource_requests = {'compute': {}, 'network': {}}
###### mycompute-0
- msg = rmgryang.VDUEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_RequestInfo()
msg.image_id = openstack_info['image_id']
msg.vm_flavor.vcpu_count = 2
msg.vm_flavor.memory_mb = 4096
@@ -213,7 +213,7 @@
resource_requests['compute']['mycompute-0'] = msg
###### mycompute-1
- msg = rmgryang.VDUEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_RequestInfo()
msg.image_id = openstack_info['image_id']
msg.vm_flavor.vcpu_count = 4
msg.vm_flavor.memory_mb = 8192
@@ -225,14 +225,14 @@
resource_requests['compute']['mycompute-1'] = msg
####### mynet-0
- msg = rmgryang.VirtualLinkEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_RequestInfo()
#msg.provider_network.overlay_type = 'VXLAN'
#msg.provider_network.segmentation_id = 71
resource_requests['network']['mynet-0'] = msg
####### mynet-1
- msg = rmgryang.VirtualLinkEventData_RequestInfo()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData_RequestInfo()
#msg.provider_network.overlay_type = 'VXLAN'
#msg.provider_network.segmentation_id = 73
resource_requests['network']['mynet-1'] = msg
@@ -252,9 +252,9 @@
def get_cal_account(account_type):
"""
- Creates an object for class RwcalYang.CloudAccount()
+ Creates an object for class RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList()
"""
- account = RwcalYang.CloudAccount()
+ account = RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList()
if account_type == 'mock':
account.name = 'mock_account'
account.account_type = "mock"
@@ -314,14 +314,14 @@
return 360
def get_cloud_account_msg(self, acct_type):
- cloud_account = RwCloudYang.CloudAccount()
+ cloud_account = RwCloudYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList()
acct = get_cal_account(acct_type)
cloud_account.from_dict(acct.as_dict())
cloud_account.name = acct.name
return cloud_account
def get_compute_pool_msg(self, name, pool_type, cloud_type):
- pool_config = rmgryang.ResourcePools()
+ pool_config = rmgryang.YangData_RwProject_Project_ResourceMgrConfig_ResourcePools()
pool = pool_config.pools.add()
pool.name = name
pool.resource_type = "compute"
@@ -350,7 +350,7 @@
return pool_config
def get_network_pool_msg(self, name, pool_type, cloud_type):
- pool_config = rmgryang.ResourcePools()
+ pool_config = rmgryang.YangData_RwProject_Project_ResourceMgrConfig_ResourcePools()
pool = pool_config.pools.add()
pool.name = name
pool.resource_type = "network"
@@ -380,7 +380,7 @@
def get_network_reserve_msg(self, name, cloud_type, xpath):
event_id = str(uuid.uuid4())
- msg = rmgryang.VirtualLinkEventData()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData()
msg.event_id = event_id
msg.request_info.name = name
attributes = ['physical_network', 'name', 'overlay_type', 'segmentation_id']
@@ -391,11 +391,11 @@
setattr(msg.request_info.provider_network, attr,
getattr(resource_requests[cloud_type]['network'][name].provider_network ,attr))
- return msg, xpath.format(event_id)
+ return msg, xpath.format(quoted_key(event_id))
def get_compute_reserve_msg(self, name, cloud_type, xpath, vlinks):
event_id = str(uuid.uuid4())
- msg = rmgryang.VDUEventData()
+ msg = rmgryang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData()
msg.event_id = event_id
msg.request_info.name = name
msg.request_info.image_id = resource_requests[cloud_type]['compute'][name].image_id
@@ -428,11 +428,11 @@
c1.virtual_link_id = link
self.log.info("Sending message :%s", msg)
- return msg, xpath.format(event_id)
+ return msg, xpath.format(quoted_key(event_id))
@asyncio.coroutine
def configure_cloud_account(self, dts, acct_type):
- account_xpath = "C,/rw-cloud:cloud/account"
+ account_xpath = "C,/rw-project:project/rw-cloud:cloud/account"
msg = self.get_cloud_account_msg(acct_type)
self.log.info("Configuring cloud-account: %s",msg)
yield from dts.query_create(account_xpath,
@@ -441,7 +441,7 @@
@asyncio.coroutine
def configure_compute_resource_pools(self, dts, resource_type, cloud_type):
- pool_xpath = "C,/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools"
+ pool_xpath = "C,/rw-project:project/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools"
msg = self.get_compute_pool_msg("virtual-compute", resource_type, cloud_type)
self.log.info("Configuring compute-resource-pool: %s",msg)
yield from dts.query_create(pool_xpath,
@@ -451,7 +451,7 @@
@asyncio.coroutine
def configure_network_resource_pools(self, dts, resource_type, cloud_type):
- pool_xpath = "C,/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools"
+ pool_xpath = "C,/rw-project:project/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools"
msg = self.get_network_pool_msg("virtual-network", resource_type, cloud_type)
self.log.info("Configuring network-resource-pool: %s",msg)
yield from dts.query_create(pool_xpath,
@@ -460,7 +460,7 @@
@asyncio.coroutine
def verify_resource_pools_config(self, dts):
- pool_records_xpath = "D,/rw-resource-mgr:resource-pool-records"
+ pool_records_xpath = "D,/rw-project:project/rw-resource-mgr:resource-pool-records"
self.log.debug("Verifying test_create_resource_pools results")
res_iter = yield from dts.query_read(pool_records_xpath,)
for result in res_iter:
@@ -491,7 +491,7 @@
@asyncio.coroutine
def reserve_network_resources(self, name, dts, cloud_type):
- network_xpath = "D,/rw-resource-mgr:resource-mgmt/vlink-event/vlink-event-data[event-id='{}']"
+ network_xpath = "D,/rw-project:project/rw-resource-mgr:resource-mgmt/vlink-event/vlink-event-data[event-id={}]"
msg,xpath = self.get_network_reserve_msg(name, cloud_type, network_xpath)
self.log.debug("Sending create event to network-event xpath %s with msg: %s" % (xpath, msg))
yield from dts.query_create(xpath, 0, msg)
@@ -500,7 +500,7 @@
@asyncio.coroutine
def reserve_compute_resources(self, name, dts, cloud_type, vlinks = []):
- compute_xpath = "D,/rw-resource-mgr:resource-mgmt/vdu-event/vdu-event-data[event-id='{}']"
+ compute_xpath = "D,/rw-project:project/rw-resource-mgr:resource-mgmt/vdu-event/vdu-event-data[event-id={}]"
msg,xpath = self.get_compute_reserve_msg(name, cloud_type, compute_xpath, vlinks)
self.log.debug("Sending create event to compute-event xpath %s with msg: %s" % (xpath, msg))
yield from dts.query_create(xpath, 0, msg)
diff --git a/rwlaunchpad/plugins/rwstagingmgr/CMakeLists.txt b/rwlaunchpad/plugins/rwstagingmgr/CMakeLists.txt
index 71f0704..55c5c8f 100644
--- a/rwlaunchpad/plugins/rwstagingmgr/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwstagingmgr/CMakeLists.txt
@@ -24,7 +24,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
@@ -46,7 +46,7 @@
rift/tasklets/${TASKLET_NAME}/store/file_store.py
rift/tasklets/${TASKLET_NAME}/model/__init__.py
rift/tasklets/${TASKLET_NAME}/model/staging_area.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
-rift_add_subdirs(test)
\ No newline at end of file
+rift_add_subdirs(test)
diff --git a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/model/staging_area.py b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/model/staging_area.py
index 473999f..f54cfd8 100644
--- a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/model/staging_area.py
+++ b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/model/staging_area.py
@@ -33,7 +33,7 @@
def __init__(self, model=None):
self._model = model
if not self._model:
- self._model = RwStagingMgmtYang.StagingArea.from_dict({})
+ self._model = RwStagingMgmtYang.YangData_RwProject_Project_StagingAreas_StagingArea.from_dict({})
@property
def area_id(self):
@@ -44,6 +44,10 @@
return self._model
@property
+ def project_name(self):
+ return self._model.project_name
+
+ @property
def has_expired(self):
current_time = time.time()
expiry_time = self.model.created_time + self.model.validity_time
diff --git a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/publisher/staging_status.py b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/publisher/staging_status.py
index 82e2da5..a2ab8fc 100644
--- a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/publisher/staging_status.py
+++ b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/publisher/staging_status.py
@@ -18,23 +18,26 @@
#
import asyncio
+import gi
import uuid
from gi.repository import (RwDts as rwdts)
import rift.mano.dts as mano_dts
import rift.tasklets
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
from ..protocol import StagingStoreProtocol
class StagingStorePublisher(mano_dts.DtsHandler, StagingStoreProtocol):
- def __init__(self, log, dts, loop):
- super().__init__(log, dts, loop)
+ def __init__(self, project):
+ super().__init__(project.log, project.dts, project.loop, project)
self.delegate = None
def xpath(self, area_id=None):
- return ("D,/rw-staging-mgmt:staging-areas/rw-staging-mgmt:staging-area" +
- ("[area-id='{}']".format(area_id) if area_id else ""))
+ return self.project.add_project("D,/rw-staging-mgmt:staging-areas/rw-staging-mgmt:staging-area" +
+ ("[area-id={}]".format(quoted_key(area_id)) if area_id else ""))
@asyncio.coroutine
def register(self):
@@ -59,6 +62,12 @@
assert self.reg is not None
+ def deregister(self):
+ self._log.debug("Project {}: de-register staging store handler".
+ format(self._project.name))
+ if self.reg:
+ self.reg.deregister()
+
def on_staging_area_create(self, store):
self.reg.update_element(self.xpath(store.area_id), store)
diff --git a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/rwstagingmgr.py b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/rwstagingmgr.py
index 04a7cae..16ac7ce 100644
--- a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/rwstagingmgr.py
+++ b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/rwstagingmgr.py
@@ -32,10 +32,17 @@
import gi
gi.require_version('RwDts', '1.0')
gi.require_version('RwStagingMgmtYang', '1.0')
+gi.require_version('rwlib', '1.0')
+
from gi.repository import (
RwDts as rwdts,
RwStagingMgmtYang)
import rift.tasklets
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectHandler,
+)
+import gi.repository.rwlib as rwlib
from . import rpc
from . import store
@@ -43,14 +50,36 @@
from .publisher import StagingStorePublisher
+class StagingManagerProject(ManoProject):
+
+ def __init__(self, name, tasklet, **kw):
+ super(StagingManagerProject, self).__init__(tasklet.log, name)
+ self.update(tasklet)
+
+ self.publisher = StagingStorePublisher(self)
+ # For recovery
+ self.publisher.delegate = tasklet.store
+
+ @asyncio.coroutine
+ def register (self):
+ yield from self.publisher.register()
+
+ def deregister(self):
+ self.publisher.deregister()
+
+
class StagingManagerTasklet(rift.tasklets.Tasklet):
"""Tasklet to handle all staging related operations
"""
def __init__(self, *args, **kwargs):
try:
super().__init__(*args, **kwargs)
+ self._project_handler = None
+ self.projects = {}
+
except Exception as e:
- self.log.exception(e)
+ self.log.exception("Staging Manager tasklet init: {}".
+ format(e))
def start(self):
super().start()
@@ -72,17 +101,10 @@
@asyncio.coroutine
def init(self):
- self.store = store.StagingFileStore(log=self.log)
- self.publisher = StagingStorePublisher(self.log, self.dts, self.loop)
- # Fore recovery
- self.publisher.delegate = self.store
- # For create and delete events
- self.store.delegate = self.publisher
- yield from self.publisher.register()
-
+ self.store = store.StagingFileStore(self)
io_loop = rift.tasklets.tornado.TaskletAsyncIOLoop(asyncio_loop=self.loop)
- self.app = StagingApplication(self.store)
+ self.app = StagingApplication(self.store, self.loop)
manifest = self.tasklet_info.get_pb_manifest()
ssl_cert = manifest.bootstrap_phase.rwsecurity.cert
@@ -107,12 +129,19 @@
self.dts,
self.loop,
self.store)
-
yield from self.create_stg_rpc.register()
+ self.log.debug("creating project handler")
+ self.project_handler = ProjectHandler(self, StagingManagerProject)
+ self.project_handler.register()
+
@asyncio.coroutine
def run(self):
- self.server.listen(self.app.PORT)
+ address = rwlib.getenv("RWVM_INTERNAL_IPADDR")
+ if (address is None):
+ address=""
+ self.server.listen(self.app.PORT, address=address)
+ self.server.listen(self.app.PORT, address="127.0.0.1")
@asyncio.coroutine
def on_dts_state_change(self, state):
diff --git a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/server/app.py b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/server/app.py
index 41bbc59..78c1c0e 100644
--- a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/server/app.py
+++ b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/server/app.py
@@ -51,11 +51,14 @@
MAX_BODY_SIZE = 1 * MB # Max. size loaded into memory!
PORT = 4568
- def __init__(self, store, cleanup_interval=60):
+ def __init__(self, store, loop, cleanup_interval=60):
self.store = store
+ self.loop = loop
- self.cleaner = CleanupThread(self.store, cleanup_interval=cleanup_interval)
+ assert self.loop is not None
+
+ self.cleaner = CleanupThread(self.store, loop=self.loop, cleanup_interval=cleanup_interval)
self.cleaner.start()
super(StagingApplication, self).__init__([
@@ -92,24 +95,28 @@
class CleanupThread(threading.Thread):
"""Daemon thread that clean up the staging area
"""
- def __init__(self, store, log=None, cleanup_interval=60):
+ def __init__(self, store, loop, log=None, cleanup_interval=60):
"""
Args:
- store : A compatible store object
+ store: A compatible store object
log (None, optional): Log handle
cleanup_interval (int, optional): Cleanup interval in secs
+ loop: Tasklet main loop
"""
super().__init__()
- self.log = log or logging.getLogger()
- self.store = store
+ self.log = log or logging.getLogger()
+ self.store = store
self._cleaner = CleanUpStaging(store, log)
self.cleanup_interval = cleanup_interval
- self.daemon = True
+ self.daemon = True
+ self.loop = loop
+
+ assert self.loop is not None
def run(self):
try:
while True:
- self._cleaner.cleanup()
+ self.loop.call_soon_threadsafe(self._cleaner.cleanup, )
time.sleep(self.cleanup_interval)
except Exception as e:
diff --git a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/server/handler.py b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/server/handler.py
index ce26e06..6d7b5a8 100644
--- a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/server/handler.py
+++ b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/server/handler.py
@@ -48,7 +48,7 @@
class StoreStreamerPart(multipart_streamer.MultiPartStreamer):
"""
Create a Part streamer with a custom temp directory. Using the default
- tmp directory and trying to move the file to $RIFT_ARTIFACTS occasionally
+ tmp directory and trying to move the file to $RIFT_VAR_ROOT occasionally
causes link errors. So create a temp directory within the staging area.
"""
def __init__(self, store, *args, **kwargs):
@@ -56,6 +56,9 @@
self.store = store
def create_part(self, headers):
+ #RIFT-18071: tmp directory was not getting created - throwing an error in the system test cases in HA failover.
+ if not os.path.exists(self.store.tmp_dir):
+ os.makedirs(self.store.tmp_dir)
return multipart_streamer.TemporaryFileStreamedPart(self, headers, tmp_dir=self.store.tmp_dir)
diff --git a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/store/file_store.py b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/store/file_store.py
index aec4180..9adce9a 100644
--- a/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/store/file_store.py
+++ b/rwlaunchpad/plugins/rwstagingmgr/rift/tasklets/rwstagingmgr/store/file_store.py
@@ -33,6 +33,7 @@
gi.require_version("RwStagingMgmtYang", "1.0")
from gi.repository import RwStagingMgmtYang
import rift.mano.dts as mano_dts
+from rift.mano.utils.project import DEFAULT_PROJECT
from .. import model
from ..protocol import StagingStorePublisherProtocol
@@ -53,9 +54,9 @@
META_YAML = "meta.yaml"
DEFAULT_EXPIRY = 60 * 60
- def __init__(self, log=None, root_dir=None):
+ def __init__(self, tasklet, root_dir=None):
default_path = os.path.join(
- os.getenv('RIFT_ARTIFACTS'),
+ os.getenv('RIFT_VAR_ROOT'),
"launchpad/staging")
self.root_dir = root_dir or default_path
@@ -63,11 +64,11 @@
if not os.path.isdir(self.root_dir):
os.makedirs(self.root_dir)
- self.log = log or logging.getLogger()
+ self.log = tasklet.log
self.tmp_dir = tempfile.mkdtemp(dir=self.root_dir)
self._cache = {}
- self.delegate = None
+ self.tasklet = tasklet
def on_recovery(self, staging_areas):
for area in staging_areas:
@@ -82,6 +83,20 @@
return self._cache[area_id]
+ def get_delegate(self, project_name):
+ if not project_name:
+ project_name = DEFAULT_PROJECT
+
+ try:
+ proj = self.tasklet.projects[project_name]
+ except Exception as e:
+ err = "Project or project name not found {}: {}". \
+ format(msg.as_dict(), e)
+ self.log.error (err)
+ raise Exception (err)
+
+ return proj.publisher
+
def create_staging_area(self, staging_area_config):
"""Create the staging area
Args:
@@ -93,6 +108,8 @@
Raises:
StagingAreaExists: if the staging area already exists
"""
+ delegate = self.get_delegate(staging_area_config.project_name)
+
area_id = str(uuid.uuid4())
container_path = os.path.join(self.root_dir, str(area_id))
@@ -112,16 +129,16 @@
"path": container_path
})
- staging_area = RwStagingMgmtYang.StagingArea.from_dict(config_dict)
+ staging_area = RwStagingMgmtYang.YangData_RwProject_Project_StagingAreas_StagingArea.from_dict(config_dict)
staging_area = model.StagingArea(staging_area)
self._cache[area_id] = staging_area
try:
- if self.delegate:
- self.delegate.on_staging_area_create(staging_area.model)
+ if delegate:
+ delegate.on_staging_area_create(staging_area.model)
except Exception as e:
- self.log.exception(str(e))
+ self.log.exception(e)
return staging_area
@@ -134,13 +151,15 @@
if type(staging_area) is str:
staging_area = self.get_staging_area(staging_area)
+ delegate = self.get_delegate(staging_area.project_name)
+
if os.path.isdir(staging_area.model.path):
shutil.rmtree(staging_area.model.path)
staging_area.model.status = "EXPIRED"
try:
- if self.delegate:
- self.delegate.on_staging_area_delete(staging_area.model)
+ if delegate:
+ delegate.on_staging_area_delete(staging_area.model)
except Exception as e:
- self.log.exception(str(e))
+ self.log.exception(e)
diff --git a/rwlaunchpad/plugins/rwstagingmgr/test/utest_publisher_dts.py b/rwlaunchpad/plugins/rwstagingmgr/test/utest_publisher_dts.py
index 585a0d9..d88a0e2 100755
--- a/rwlaunchpad/plugins/rwstagingmgr/test/utest_publisher_dts.py
+++ b/rwlaunchpad/plugins/rwstagingmgr/test/utest_publisher_dts.py
@@ -18,6 +18,7 @@
import argparse
import asyncio
+import gi
import logging
import os
import sys
@@ -25,7 +26,6 @@
import uuid
import xmlrunner
-import gi
gi.require_version('RwDts', '1.0')
gi.require_version('RwStagingMgmtYang', '1.0')
from gi.repository import (
@@ -34,6 +34,15 @@
)
import rift.tasklets.rwstagingmgr.publisher as publisher
import rift.test.dts
+from rift.mano.utils.project import ManoProject
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+class TestProject(ManoProject):
+ def __init__(self, log, dts, loop):
+ super().__init__(log)
+ self._dts = dts
+ self._loop = loop
class TestCase(rift.test.dts.AbstractDTSTest):
@@ -49,8 +58,9 @@
self.log.debug("STARTING - %s", test_id)
self.tinfo = self.new_tinfo(str(test_id))
self.dts = rift.tasklets.DTS(self.tinfo, self.schema, self.loop)
+ self.project = TestProject(self.log, self.dts, self.loop)
- self.job_handler = publisher.StagingStorePublisher(self.log, self.dts, self.loop)
+ self.job_handler = publisher.StagingStorePublisher(self.project)
def tearDown(self):
super().tearDown()
@@ -82,6 +92,7 @@
yield from asyncio.sleep(2, loop=self.loop)
published_xpaths = yield from self.get_published_xpaths()
assert self.job_handler.xpath() in published_xpaths
+ self.job_handler.deregister()
@rift.test.dts.async_test
def test_publish(self):
@@ -89,14 +100,15 @@
"""
yield from self.job_handler.register()
- mock_msg = RwStagingMgmtYang.StagingArea.from_dict({
+ mock_msg = RwStagingMgmtYang.YangData_RwProject_Project_StagingAreas_StagingArea.from_dict({
"area_id": "123"})
self.job_handler.on_staging_area_create(mock_msg)
yield from asyncio.sleep(5, loop=self.loop)
- itr = yield from self.dts.query_read("/staging-areas/staging-area[area-id='{}']".format(
- mock_msg.area_id))
+ xpath = self.project.add_project("/staging-areas/staging-area[area-id={}]".
+ format(quoted_key(mock_msg.area_id)))
+ itr = yield from self.dts.query_read(xpath)
result = None
@@ -106,6 +118,7 @@
print (result)
assert result == mock_msg
+ self.job_handler.deregister()
def main():
runner = xmlrunner.XMLTestRunner(output=os.environ["RIFT_MODULE_TEST"])
diff --git a/rwlaunchpad/plugins/rwstagingmgr/test/utest_staging_store.py b/rwlaunchpad/plugins/rwstagingmgr/test/utest_staging_store.py
index eb71aa3..c71d962 100755
--- a/rwlaunchpad/plugins/rwstagingmgr/test/utest_staging_store.py
+++ b/rwlaunchpad/plugins/rwstagingmgr/test/utest_staging_store.py
@@ -26,7 +26,12 @@
import unittest
import xmlrunner
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
from rift.tasklets.rwstagingmgr.store import StagingFileStore
+from rift.mano.utils.project import ManoProject, DEFAULT_PROJECT
import gi
gi.require_version('RwStagingMgmtYang', '1.0')
@@ -34,6 +39,18 @@
RwStagingMgmtYang,
)
+class MockTasklet(object):
+ def __init__(self):
+ self.log = logging.getLogger()
+ self.projects = {}
+ project = ManoProject(self.log, name=DEFAULT_PROJECT)
+ project.publisher = None
+ self.projects[project.name] = project
+
+ def set_delegate(self, store):
+ self.projects[DEFAULT_PROJECT].publisher = store
+
+
class TestSerializer(unittest.TestCase):
def test_staging_area_create(self):
@@ -44,9 +61,10 @@
"""
tmp_dir = tempfile.mkdtemp()
- store = StagingFileStore(root_dir=tmp_dir)
+ tasklet = MockTasklet()
+ store = StagingFileStore(tasklet, root_dir=tmp_dir)
- mock_model = RwStagingMgmtYang.StagingArea.from_dict({})
+ mock_model = RwStagingMgmtYang.YangData_RwProject_Project_StagingAreas_StagingArea.from_dict({})
stg = store.create_staging_area(mock_model)
mock_id = stg.model.area_id
@@ -63,9 +81,10 @@
"""
tmp_dir = tempfile.mkdtemp()
- store = StagingFileStore(root_dir=tmp_dir)
+ tasklet = MockTasklet()
+ store = StagingFileStore(tasklet, root_dir=tmp_dir)
- mock_model = RwStagingMgmtYang.StagingArea.from_dict({})
+ mock_model = RwStagingMgmtYang.YangData_RwProject_Project_StagingAreas_StagingArea.from_dict({})
# get the wrapped mock model
mock_model = store.create_staging_area(mock_model)
mock_id = mock_model.model.area_id
diff --git a/rwlaunchpad/plugins/rwstagingmgr/test/utest_tornado_app.py b/rwlaunchpad/plugins/rwstagingmgr/test/utest_tornado_app.py
index ec8e105..cc83863 100755
--- a/rwlaunchpad/plugins/rwstagingmgr/test/utest_tornado_app.py
+++ b/rwlaunchpad/plugins/rwstagingmgr/test/utest_tornado_app.py
@@ -67,7 +67,7 @@
self.staging_id = str(uuid.uuid4())
self.staging_dir = os.path.join(self.staging_dir_tmp, self.staging_id)
os.makedirs(self.staging_dir)
- mock_model = RwStagingMgmtYang.StagingArea.from_dict({
+ mock_model = RwStagingMgmtYang.YangData_RwProject_Project_StagingAreas_StagingArea.from_dict({
'path': self.staging_dir,
"validity_time": int(time.time()) + 5
})
@@ -95,7 +95,7 @@
def get_app(self):
self.store, self.mock_model = self.create_mock_store()
- return StagingApplication(self.store, cleanup_interval=5)
+ return StagingApplication(self.store, self._loop, cleanup_interval=5)
def test_file_upload_and_download(self):
"""
@@ -118,6 +118,7 @@
headers={"Content-Type": "multipart/form-data"})
assert response.code == 200
+
assert os.path.isfile(os.path.join(
self.staging_dir,
os.path.basename(temp_file)))
@@ -138,6 +139,8 @@
print (self.get_url('/'))
print (self.staging_dir)
time.sleep(5)
+
+ self.store.remove_staging_area(self.mock_model)
self.store.remove_staging_area.assert_called_once_with(self.mock_model)
def tearDown(self):
diff --git a/rwlaunchpad/plugins/rwvnfm/CMakeLists.txt b/rwlaunchpad/plugins/rwvnfm/CMakeLists.txt
index 7bc05a7..ba3a8fb 100644
--- a/rwlaunchpad/plugins/rwvnfm/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwvnfm/CMakeLists.txt
@@ -24,7 +24,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
# anything not in a site-packages directory so we have to
@@ -34,6 +34,7 @@
FILES
rift/tasklets/${TASKLET_NAME}/__init__.py
rift/tasklets/${TASKLET_NAME}/${TASKLET_NAME}.py
- COMPONENT ${PKG_LONG_NAME}
+ rift/tasklets/${TASKLET_NAME}/subscriber.py
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
diff --git a/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
index 2cbe240..c00f91e 100755
--- a/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
+++ b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/rwvnfmtasklet.py
@@ -1,4 +1,3 @@
-#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,21 @@
import asyncio
import collections
import enum
+import gi
import logging
-import uuid
-import time
import os.path
import re
import shutil
import sys
+import time
+import uuid
+import yaml
-import gi
gi.require_version('RwDts', '1.0')
gi.require_version('RwVnfrYang', '1.0')
+gi.require_version('VnfrYang', '1.0')
gi.require_version('RwVnfmYang', '1.0')
+gi.require_version('RwVnfdYang', '1.0')
gi.require_version('RwVlrYang', '1.0')
gi.require_version('RwManifestYang', '1.0')
gi.require_version('RwBaseYang', '1.0')
@@ -37,6 +39,8 @@
from gi.repository import (
RwDts as rwdts,
RwVnfrYang,
+ RwVnfdYang,
+ VnfdYang,
RwVnfmYang,
RwVlrYang,
VnfrYang,
@@ -44,15 +48,24 @@
RwBaseYang,
RwResourceMgrYang,
ProtobufC,
+ RwTypes
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
import rift.tasklets
import rift.package.store
import rift.package.cloud_init
import rift.package.script
import rift.mano.dts as mano_dts
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectHandler,
+ )
import rift.mano.utils.short_name as mano_short_name
+from . import subscriber
+VCP_FIELDS = ['name', 'id', 'connection_point_id', 'type_yang', 'ip_address', 'mac_address']
class VMResourceError(Exception):
""" VM resource Error"""
@@ -135,10 +148,18 @@
class VNFMPlacementGroupError(Exception):
+ """ VNF placement group Error """
pass
+
+class VlrError(Exception):
+ """ Virtual Link Record Error """
+ pass
+
+
class VirtualNetworkFunctionRecordState(enum.Enum):
""" VNFR state """
+ PRE_INIT = 0
INIT = 1
VL_INIT_PHASE = 2
VM_INIT_PHASE = 3
@@ -160,133 +181,31 @@
TERMINATED = 6
FAILED = 10
-
-class VcsComponent(object):
- """ VCS Component within the VNF descriptor """
- def __init__(self, dts, log, loop, cluster_name, vcs_handler, component, mangled_name):
- self._dts = dts
- self._log = log
- self._loop = loop
- self._component = component
- self._cluster_name = cluster_name
- self._vcs_handler = vcs_handler
- self._mangled_name = mangled_name
-
- @staticmethod
- def mangle_name(component_name, vnf_name, vnfd_id):
- """ mangled component name """
- return vnf_name + ":" + component_name + ":" + vnfd_id
-
- @property
- def name(self):
- """ name of this component"""
- return self._mangled_name
-
- @property
- def path(self):
- """ The path for this object """
- return("D,/rw-manifest:manifest" +
- "/rw-manifest:operational-inventory" +
- "/rw-manifest:component" +
- "[rw-manifest:component-name = '{}']").format(self.name)
-
- @property
- def instance_xpath(self):
- """ The path for this object """
- return("D,/rw-base:vcs" +
- "/instances" +
- "/instance" +
- "[instance-name = '{}']".format(self._cluster_name))
-
- @property
- def start_comp_xpath(self):
- """ start component xpath """
- return (self.instance_xpath +
- "/child-n[instance-name = 'START-REQ']")
-
- def get_start_comp_msg(self, ip_address):
- """ start this component """
- start_msg = RwBaseYang.VcsInstance_Instance_ChildN()
- start_msg.instance_name = 'START-REQ'
- start_msg.component_name = self.name
- start_msg.admin_command = "START"
- start_msg.ip_address = ip_address
-
- return start_msg
-
- @property
- def msg(self):
- """ Returns the message for this vcs component"""
-
- vcs_comp_dict = self._component.as_dict()
-
- def mangle_comp_names(comp_dict):
- """ mangle component name with VNF name, id"""
- for key, val in comp_dict.items():
- if isinstance(val, dict):
- comp_dict[key] = mangle_comp_names(val)
- elif isinstance(val, list):
- i = 0
- for ent in val:
- if isinstance(ent, dict):
- val[i] = mangle_comp_names(ent)
- else:
- val[i] = ent
- i += 1
- elif key == "component_name":
- comp_dict[key] = VcsComponent.mangle_name(val,
- self._vnfd_name,
- self._vnfd_id)
- return comp_dict
-
- mangled_dict = mangle_comp_names(vcs_comp_dict)
- msg = RwManifestYang.OpInventory_Component.from_dict(mangled_dict)
- return msg
-
- @asyncio.coroutine
- def publish(self, xact):
- """ Publishes the VCS component """
- self._log.debug("Publishing the VcsComponent %s, path = %s comp = %s",
- self.name, self.path, self.msg)
- yield from self._vcs_handler.publish(xact, self.path, self.msg)
-
- @asyncio.coroutine
- def start(self, xact, parent, ip_addr=None):
- """ Starts this VCS component """
- # ATTN RV - replace with block add
- start_msg = self.get_start_comp_msg(ip_addr)
- self._log.debug("starting component %s %s",
- self.start_comp_xpath, start_msg)
- yield from self._dts.query_create(self.start_comp_xpath,
- 0,
- start_msg)
- self._log.debug("started component %s, %s",
- self.start_comp_xpath, start_msg)
-
-
class VirtualDeploymentUnitRecord(object):
""" Virtual Deployment Unit Record """
def __init__(self,
dts,
log,
loop,
+ project,
vdud,
vnfr,
nsr_config,
mgmt_intf,
mgmt_network,
- cloud_account_name,
+ datacenter_name,
vnfd_package_store,
vdur_id=None,
placement_groups=[]):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
self._vdud = vdud
self._vnfr = vnfr
self._nsr_config = nsr_config
self._mgmt_intf = mgmt_intf
- self._cloud_account_name = cloud_account_name
+ self._datacenter_name = datacenter_name
self._vnfd_package_store = vnfd_package_store
self._mgmt_network = mgmt_network
@@ -301,35 +220,46 @@
self._rm_regh = None
self._vm_resp = None
self._vdud_cloud_init = None
- self._vdur_console_handler = VnfrConsoleOperdataDtsHandler(dts, log, loop, self._vnfr._vnfm, self._vnfr.vnfr_id, self._vdur_id,self.vdu_id)
+ self._vdur_console_handler = VnfrConsoleOperdataDtsHandler(
+ dts, log, loop, self._vnfr._vnfm, self._vnfr.vnfr_id, self._vdur_id,self.vdu_id)
+
@asyncio.coroutine
def vdu_opdata_register(self):
yield from self._vdur_console_handler.register()
- def cp_ip_addr(self, cp_name):
- """ Find ip address by connection point name """
+ def vm_cp_info(self, cp_name):
+ """ Find the VM Connection info by connection point name """
if self._vm_resp is not None:
for conn_point in self._vm_resp.connection_points:
if conn_point.name == cp_name:
- return conn_point.ip_address
- return "0.0.0.0"
+ return conn_point
+ return None
+
+ def cp_ip_addr(self, cp_name):
+ """ Find ip address by connection point name """
+ vm_cp_info = self.vm_cp_info(cp_name)
+ if vm_cp_info:
+ return vm_cp_info.ip_address
+ else:
+ return "0.0.0.0"
def cp_mac_addr(self, cp_name):
""" Find mac address by connection point name """
- if self._vm_resp is not None:
- for conn_point in self._vm_resp.connection_points:
- if conn_point.name == cp_name:
- return conn_point.mac_addr
- return "00:00:00:00:00:00"
+ vm_cp_info = self.vm_cp_info(cp_name)
+ if vm_cp_info:
+ return vm_cp_info.mac_addr
+ else:
+ return "00:00:00:00:00:00"
def cp_id(self, cp_name):
""" Find connection point id by connection point name """
- if self._vm_resp is not None:
- for conn_point in self._vm_resp.connection_points:
- if conn_point.name == cp_name:
- return conn_point.connection_point_id
- return ''
+ vm_cp_info = self.vm_cp_info(cp_name)
+ if vm_cp_info:
+ return vm_cp_info.connection_point_id
+ else:
+ return str()
+
@property
def vdu_id(self):
@@ -350,9 +280,9 @@
""" Return this VDUR's unique short name """
# Impose these restrictions on Unique name
# Max 64
- # - Max 10 of NSR name (remove all specialcharacters, only numbers and alphabets)
- # - 6 chars of shortened name
- # - Max 10 of VDU name (remove all specialcharacters, only numbers and alphabets)
+ # - Max trailing 10 chars of NSR name (remove all specialcharacters, only numbers and alphabets)
+ # - 9 chars of shortened name
+ # - Max trailing 10 of VDU name (remove all specialcharacters, only numbers and alphabets)
#
def _restrict_tag(input_str):
# Exclude all characters except a-zA-Z0-9
@@ -370,9 +300,9 @@
return shortstr
@property
- def cloud_account_name(self):
+ def datacenter_name(self):
""" Cloud account this VDU should be created in """
- return self._cloud_account_name
+ return self._datacenter_name
@property
def image_name(self):
@@ -419,8 +349,9 @@
"vswitch_epa",
"hypervisor_epa",
"host_epa",
- "volumes",
+ "volumes"
]
+
vdu_copy_dict = {k: v for k, v in
self._vdud.as_dict().items() if k in vdu_fields}
vdur_dict = {"id": self._vdur_id,
@@ -431,6 +362,7 @@
"unique_short_name": self.unique_short_name
}
+
if self.vm_resp is not None:
vdur_dict.update({"vim_id": self.vm_resp.vdu_id,
"flavor_id": self.vm_resp.flavor_id
@@ -438,14 +370,15 @@
if self._vm_resp.has_field('image_id'):
vdur_dict.update({ "image_id": self.vm_resp.image_id })
- if self.management_ip is not None:
+ if self.management_ip:
vdur_dict["management_ip"] = self.management_ip
- if self.vm_management_ip is not None:
+ if self.vm_management_ip:
vdur_dict["vm_management_ip"] = self.vm_management_ip
vdur_dict.update(vdu_copy_dict)
+
if self.vm_resp is not None:
if self._vm_resp.has_field('volumes'):
for opvolume in self._vm_resp.volumes:
@@ -464,9 +397,18 @@
vdur_dict['supplemental_boot_data']['boot_data_drive'] = self._vm_resp.supplemental_boot_data.boot_data_drive
if self._vm_resp.supplemental_boot_data.has_field('custom_meta_data'):
metadata_list = list()
+
+ # supplemental_boot_data below is returned by Openstack.
+ # The self._vm_resp version of supplemental data is defaulting to CLOUD_METADATA
+ # as Openstack does not repond with 'destination' attribute of custom meta data elements.
+ # Therefore the vdur when published does not specify the destination of the custom-meta-data.
+ # Should we add this field (destination) explicitly here by comparig the keys with the already obtained
+ # details in self._vdud ?
+
for metadata_item in self._vm_resp.supplemental_boot_data.custom_meta_data:
- metadata_list.append(metadata_item.as_dict())
+ metadata_list.append(metadata_item.as_dict())
vdur_dict['supplemental_boot_data']['custom_meta_data'] = metadata_list
+
if self._vm_resp.supplemental_boot_data.has_field('config_file'):
file_list = list()
for file_item in self._vm_resp.supplemental_boot_data.config_file:
@@ -479,45 +421,77 @@
for intf, cp_id, vlr in self._int_intf:
cp = self.find_internal_cp_by_cp_id(cp_id)
- icp_list.append({"name": cp.name,
- "id": cp.id,
- "type_yang": "VPORT",
- "ip_address": self.cp_ip_addr(cp.id),
- "mac_address": self.cp_mac_addr(cp.id)})
+ cp_info = dict(name=cp.name,
+ id=cp.id,
+ type_yang='VPORT',
+ ip_address=self.cp_ip_addr(cp.name),
+ mac_address=self.cp_mac_addr(cp.name),
+ connection_point_id=self.cp_id(cp.name))
- ii_list.append({"name": intf.name,
- "vdur_internal_connection_point_ref": cp.id,
- "virtual_interface": {}})
+ virtual_cps = [ vcp for vcp in vlr._vlr.virtual_connection_points
+ if [ True for cp_ref in vcp.associated_cps if cp.name == cp_ref ]]
+
+ if virtual_cps:
+ for vcp in virtual_cps:
+ cp_info['virtual_cps'] = [ {k:v for k,v in vcp.as_dict().items() if k in VCP_FIELDS}
+ for vcp in virtual_cps ]
+
+ icp_list.append(cp_info)
+
+ ii_dict = {"name": intf.name,
+ "internal_connection_point_ref": cp.id,
+ "virtual_interface": {}}
+
+ if "position" in intf.as_dict():
+ ii_dict["position"] = intf.position
+
+ ii_list.append(ii_dict)
vdur_dict["internal_connection_point"] = icp_list
self._log.debug("internal_connection_point:%s", vdur_dict["internal_connection_point"])
- vdur_dict["internal_interface"] = ii_list
+
ei_list = []
for intf, cp, vlr in self._ext_intf:
- ei_list.append({"name": cp.name,
- "vnfd_connection_point_ref": cp.name,
- "virtual_interface": {}})
+ ei_dict = {"name": intf.name,
+ "external_connection_point_ref": cp.name,
+ "virtual_interface": {}}
+ if "position" in intf.as_dict():
+ ei_dict["position"] = intf.position
+
+ ei_list.append(ei_dict)
+
+ virtual_cps = [ vcp for vcp in vlr.virtual_connection_points
+ if [ True for cp_ref in vcp.associated_cps if cp.name == cp_ref ]]
+
+ if virtual_cps:
+ for vcp in virtual_cps:
+ virtual_cp_info = [ {k:v for k,v in vcp.as_dict().items() if k in VCP_FIELDS}
+ for vcp in virtual_cps ]
+ else:
+ virtual_cp_info = []
+
self._vnfr.update_cp(cp.name,
self.cp_ip_addr(cp.name),
self.cp_mac_addr(cp.name),
- self.cp_id(cp.name))
+ self.cp_id(cp.name),
+ virtual_cp_info)
- vdur_dict["external_interface"] = ei_list
+ vdur_dict["interface"] = ei_list + ii_list
- placement_groups = []
- for group in self._placement_groups:
- placement_groups.append(group.as_dict())
- vdur_dict['placement_groups_info'] = placement_groups
- return RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur.from_dict(vdur_dict)
+ vdur_dict['placement_groups_info'] = [group.as_dict()
+ for group in self._placement_groups]
+
+ return RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur.from_dict(vdur_dict)
@property
def resmgr_path(self):
""" path for resource-mgr"""
- return ("D,/rw-resource-mgr:resource-mgmt" +
- "/vdu-event" +
- "/vdu-event-data[event-id='{}']".format(self._request_id))
+ xpath = self._project.add_project("D,/rw-resource-mgr:resource-mgmt" +
+ "/vdu-event" +
+ "/vdu-event-data[event-id={}]".format(quoted_key(self._request_id)))
+ return xpath
@property
def vm_flavor_msg(self):
@@ -531,7 +505,20 @@
def vdud_cloud_init(self):
""" Return the cloud-init contents for the VDU """
if self._vdud_cloud_init is None:
- self._vdud_cloud_init = self.cloud_init()
+ ci = self.cloud_init()
+
+ # VNFR ssh public key, if available
+ if self._vnfr.public_key:
+ if not ci:
+ ci = "#cloud-config"
+ self._vdud_cloud_init = """{}
+ssh_authorized_keys:
+ - {}""". \
+ format(ci, self._vnfr.public_key)
+ else:
+ self._vdud_cloud_init = ci
+
+ self._log.debug("Cloud init: {}".format(self._vdud_cloud_init))
return self._vdud_cloud_init
@@ -539,9 +526,10 @@
""" Populate cloud_init with cloud-config script from
either the inline contents or from the file provided
"""
+ cloud_init_msg = None
if self._vdud.cloud_init is not None:
self._log.debug("cloud_init script provided inline %s", self._vdud.cloud_init)
- return self._vdud.cloud_init
+ cloud_init_msg = self._vdud.cloud_init
elif self._vdud.cloud_init_file is not None:
# Get cloud-init script contents from the file provided in the cloud_init_file param
self._log.debug("cloud_init script provided in file %s", self._vdud.cloud_init_file)
@@ -550,12 +538,52 @@
stored_package = self._vnfd_package_store.get_package(self._vnfr.vnfd_id)
cloud_init_extractor = rift.package.cloud_init.PackageCloudInitExtractor(self._log)
try:
- return cloud_init_extractor.read_script(stored_package, filename)
+ cloud_init_msg = cloud_init_extractor.read_script(stored_package, filename)
except rift.package.cloud_init.CloudInitExtractionError as e:
self.instantiation_failed(str(e))
raise VirtualDeploymentUnitRecordError(e)
else:
- self._log.debug("VDU Instantiation: cloud-init script not provided")
+ if not self._vnfr._vnfr_msg.cloud_config.key_pair and not self._vnfr._vnfr_msg.cloud_config.user:
+ self._log.debug("VDU Instantiation: cloud-init script not provided")
+ return
+
+ self._log.debug("Current cloud init msg is {}".format(cloud_init_msg))
+ if not self._vnfr._vnfr_msg.cloud_config.key_pair and not self._vnfr._vnfr_msg.cloud_config.user:
+ return cloud_init_msg
+
+ cloud_init_dict = {}
+ if cloud_init_msg:
+ try:
+ cloud_init_dict = yaml.load(cloud_init_msg)
+ except Exception as e:
+ self._log.exception(e)
+ self._log.error("Error loading cloud init Yaml file with exception %s", str(e))
+ return cloud_init_msg
+
+ self._log.debug("Current cloud init dict is {}".format(cloud_init_dict))
+
+ for key_pair in self._vnfr._vnfr_msg.cloud_config.key_pair:
+ if "ssh_authorized_keys" not in cloud_init_dict:
+ cloud_init_dict["ssh_authorized_keys"] = list()
+ cloud_init_dict["ssh_authorized_keys"].append(key_pair.key)
+
+ users = list()
+ for user_entry in self._vnfr._vnfr_msg.cloud_config.user:
+ if "users" not in cloud_init_dict:
+ cloud_init_dict["users"] = list()
+ user = {}
+ user["name"] = user_entry.name
+ user["gecos"] = user_entry.user_info
+ user["sudo"] = "ALL=(ALL) NOPASSWD:ALL"
+ user["ssh-authorized-keys"] = list()
+ for ssh_key in user_entry.key_pair:
+ user["ssh-authorized-keys"].append(ssh_key.key)
+ cloud_init_dict["users"].append(user)
+
+ cloud_msg = yaml.safe_dump(cloud_init_dict,width=1000,default_flow_style=False)
+ cloud_init = "#cloud-config\n"+cloud_msg
+ self._log.debug("Cloud init msg is {}".format(cloud_init))
+ return cloud_init
def process_openstack_placement_group_construct(self, vm_create_msg_dict):
host_aggregates = []
@@ -572,15 +600,19 @@
if availability_zones:
if len(availability_zones) > 1:
- self._log.error("Can not launch VDU: %s in multiple availability zones. Requested Zones: %s", self.name, availability_zones)
- raise VNFMPlacementGroupError("Can not launch VDU: {} in multiple availability zones. Requsted Zones".format(self.name, availability_zones))
+ self._log.error("Can not launch VDU: %s in multiple availability zones. " +
+ "Requested Zones: %s", self.name, availability_zones)
+ raise VNFMPlacementGroupError("Can not launch VDU: {} in multiple availability" +
+ " zones. Requsted Zones".format(self.name, availability_zones))
else:
vm_create_msg_dict['availability_zone'] = availability_zones[0]
if server_groups:
if len(server_groups) > 1:
- self._log.error("Can not launch VDU: %s in multiple Server Group. Requested Groups: %s", self.name, server_groups)
- raise VNFMPlacementGroupError("Can not launch VDU: {} in multiple Server Groups. Requsted Groups".format(self.name, server_groups))
+ self._log.error("Can not launch VDU: %s in multiple Server Group. " +
+ "Requested Groups: %s", self.name, server_groups)
+ raise VNFMPlacementGroupError("Can not launch VDU: {} in multiple " +
+ "Server Groups. Requsted Groups".format(self.name, server_groups))
else:
vm_create_msg_dict['server_group'] = server_groups[0]
@@ -620,11 +652,15 @@
# Find source file in scripts dir of VNFD
self._log.debug("Checking for source config file at %s", source)
try:
- source_file_str = cloud_init_extractor.read_script(stored_package, source)
+ try:
+ source_file_str = cloud_init_extractor.read_script(stored_package, source)
+ file_item['source'] = source_file_str
+ except rift.package.package.PackageError as e:
+ self._log.info("Invalid package with Package descriptor id")
+
except rift.package.cloud_init.CloudInitExtractionError as e:
raise VirtualDeploymentUnitRecordError(e)
# Update source file location with file contents
- file_item['source'] = source_file_str
return
@@ -637,6 +673,48 @@
"volumes",
"supplemental_boot_data"]
+ def make_resmgr_cp_args(intf, cp, vlr):
+ cp_info = dict(name = cp.name,
+ virtual_link_id = vlr.network_id,
+ type_yang = intf.virtual_interface.type_yang)
+
+ if vlr.network_id is None:
+ raise VlrError("Unresolved virtual link id for vlr id:%s, name:%s",
+ (vlr.id, vlr.name))
+
+ if cp.has_field('port_security_enabled'):
+ cp_info["port_security_enabled"] = cp.port_security_enabled
+
+ try:
+ if intf.static_ip_address:
+ cp_info["static_ip_address"] = intf.static_ip_address
+ except AttributeError as e:
+ ### This can happen because of model difference between OSM and RIFT. Ignore exception
+ self._log.debug(str(e))
+
+ if (intf.virtual_interface.has_field('vpci') and
+ intf.virtual_interface.vpci is not None):
+ cp_info["vpci"] = intf.virtual_interface.vpci
+
+ if (vlr.has_field('ip_profile_params')) and (vlr.ip_profile_params.has_field('security_group')):
+ cp_info['security_group'] = vlr.ip_profile_params.security_group
+
+ if vlr.has_field('virtual_connection_points'):
+ virtual_cps = [ vcp for vcp in vlr.virtual_connection_points
+ if [ True for cp_ref in vcp.associated_cps if cp.name == cp_ref ]]
+ if virtual_cps:
+ fields = ['connection_point_id', 'name', 'ip_address', 'mac_address']
+ cp_info['virtual_cps'] = [ {k:v for k,v in vcp.as_dict().items() if k in fields}
+ for vcp in virtual_cps ]
+
+ # Adding Port Sequence Information to cp_info
+ intf_dict = intf.as_dict()
+ if "position" in intf_dict:
+ cp_info["port_order"] = intf.position
+
+ self._log.debug("CP info {}".format(cp_info))
+ return cp_info
+
self._log.debug("Creating params based on VDUD: %s", self._vdud)
vdu_copy_dict = {k: v for k, v in self._vdud.as_dict().items() if k in vdu_fields}
@@ -662,41 +740,13 @@
if self._mgmt_network:
vm_create_msg_dict['mgmt_network'] = self._mgmt_network
- cp_list = []
+ cp_list = list()
for intf, cp, vlr in self._ext_intf:
- cp_info = { "name": cp.name,
- "virtual_link_id": vlr.network_id,
- "type_yang": intf.virtual_interface.type_yang }
+ cp_list.append(make_resmgr_cp_args(intf, cp, vlr))
- if cp.has_field('port_security_enabled'):
- cp_info["port_security_enabled"] = cp.port_security_enabled
-
- if (intf.virtual_interface.has_field('vpci') and
- intf.virtual_interface.vpci is not None):
- cp_info["vpci"] = intf.virtual_interface.vpci
-
- if (vlr.has_field('ip_profile_params')) and (vlr.ip_profile_params.has_field('security_group')):
- cp_info['security_group'] = vlr.ip_profile_params.security_group
-
- cp_list.append(cp_info)
-
- for intf, cp, vlr in self._int_intf:
- if (intf.virtual_interface.has_field('vpci') and
- intf.virtual_interface.vpci is not None):
- cp_list.append({"name": cp,
- "virtual_link_id": vlr.network_id,
- "type_yang": intf.virtual_interface.type_yang,
- "vpci": intf.virtual_interface.vpci})
- else:
- if cp.has_field('port_security_enabled'):
- cp_list.append({"name": cp,
- "virtual_link_id": vlr.network_id,
- "type_yang": intf.virtual_interface.type_yang,
- "port_security_enabled": cp.port_security_enabled})
- else:
- cp_list.append({"name": cp,
- "virtual_link_id": vlr.network_id,
- "type_yang": intf.virtual_interface.type_yang})
+ for intf, cp_id, vlr in self._int_intf:
+ cp = self.find_internal_cp_by_cp_id(cp_id)
+ cp_list.append(make_resmgr_cp_args(intf, cp, vlr.msg()))
vm_create_msg_dict["connection_points"] = cp_list
@@ -704,13 +754,18 @@
self.process_placement_groups(vm_create_msg_dict)
if 'supplemental_boot_data' in vm_create_msg_dict:
- self.process_custom_bootdata(vm_create_msg_dict)
+ self.process_custom_bootdata(vm_create_msg_dict)
- msg = RwResourceMgrYang.VDUEventData()
+ msg = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData()
msg.event_id = self._request_id
- msg.cloud_account = self.cloud_account_name
+ msg.cloud_account = self.datacenter_name
+
msg.request_info.from_dict(vm_create_msg_dict)
+ for volume in self._vdud.volumes:
+ v = msg.request_info.volumes.add()
+ v.from_dict(volume.as_dict())
+
return msg
@asyncio.coroutine
@@ -734,7 +789,7 @@
self._rm_regh = None
if self._vdur_console_handler is not None:
- self._log.error("Deregistering vnfr vdur registration handle")
+ self._log.debug("Deregistering vnfr vdur console registration handle")
self._vdur_console_handler._regh.deregister()
self._vdur_console_handler._regh = None
@@ -780,70 +835,91 @@
cp_name)
return cp
- def find_internal_vlr_by_cp_name(cp_name):
- """ Find the VLR corresponding to the connection point name"""
- cp = None
+ def find_internal_vlr_by_cp_id(cp_id):
+ self._log.debug("find_internal_vlr_by_cp_id(%s) called",
+ cp_id)
- self._log.debug("find_internal_vlr_by_cp_name(%s) called",
- cp_name)
-
- for int_cp in self._vdud.internal_connection_point:
- self._log.debug("Checking for int cp %s in internal connection points",
- int_cp.id)
- if int_cp.id == cp_name:
- cp = int_cp
- break
-
- if cp is None:
- self._log.debug("Failed to find cp %s in internal connection points",
- cp_name)
- msg = "Failed to find cp %s in internal connection points" % cp_name
- raise VduRecordError(msg)
+ # Validate the cp
+ cp = self.find_internal_cp_by_cp_id(cp_id)
# return the VLR associated with the connection point
- return vnfr.find_vlr_by_cp(cp_name)
+ return vnfr.find_vlr_by_cp(cp_id)
+
+
+ def add_external_interface(interface):
+ # Add an external interface from vdu interface list
+ cp = find_cp_by_name(interface.external_connection_point_ref)
+ if cp is None:
+ self._log.debug("Failed to find connection point - %s",
+ interface.external_connection_point_ref)
+ return
+
+ self._log.debug("Connection point name [%s], type[%s]",
+ cp.name, cp.type_yang)
+
+ vlr = vnfr.ext_vlr_by_id(cp.vlr_ref)
+
+ etuple = (interface, cp, vlr)
+ self._ext_intf.append(etuple)
+
+ self._log.debug("Created external interface tuple : %s", etuple)
+
+ @asyncio.coroutine
+ def add_internal_interface(interface):
+ # Add an internal interface from vdu interface list
+ cp_id = interface.internal_connection_point_ref
+ self._log.debug("Resolving internal interface name [%s], cp[%s]",
+ interface.name, cp_id)
+
+ if cp_id is None:
+ msg = "The Internal Interface : %s is not mapped to an internal connection point." % (interface.name)
+ self._log.error(msg)
+ raise VduRecordError(msg)
+
+ try:
+ vlr = find_internal_vlr_by_cp_id(cp_id)
+ iter = yield from self._dts.query_read(vlr.vlr_path())
+ for itr in iter:
+ vlr._vlr = (yield from itr).result
+ except Exception as e:
+ self._log.debug("Failed to find cp %s in internal VLR list", cp_id)
+ msg = "Failed to find cp %s in internal VLR list, e = %s" % (cp_id, e)
+ raise VduRecordError(msg)
+
+ ituple = (interface, cp_id, vlr)
+ self._int_intf.append(ituple)
+
+ self._log.debug("Created internal interface tuple : %s", ituple)
+
block = xact.block_create()
self._log.debug("Executing vm request id: %s, action: create",
self._request_id)
- # Resolve the networks associated external interfaces
- for ext_intf in self._vdud.external_interface:
- self._log.debug("Resolving external interface name [%s], cp[%s]",
- ext_intf.name, ext_intf.vnfd_connection_point_ref)
- cp = find_cp_by_name(ext_intf.vnfd_connection_point_ref)
- if cp is None:
- self._log.debug("Failed to find connection point - %s",
- ext_intf.vnfd_connection_point_ref)
- continue
- self._log.debug("Connection point name [%s], type[%s]",
- cp.name, cp.type_yang)
+ # Resolve the networks associated with interfaces ( both internal and external)
- vlr = vnfr.ext_vlr_by_id(cp.vlr_ref)
+ for intf in self._vdud.interface:
+ if intf.type_yang == 'EXTERNAL':
+ self._log.debug("Resolving external interface name [%s], cp[%s]",
+ intf.name, intf.external_connection_point_ref)
+ try:
+ add_external_interface(intf)
+ except Exception as e:
+ msg = "Failed to add external interface %s from vdu interface list, e = %s" % (intf.name, e)
+ self._log.error(msg)
+ raise VduRecordError(msg)
+ elif intf.type_yang == 'INTERNAL':
+ self._log.debug("Resolving internal interface name [%s], cp[%s]",
+ intf.name, intf.internal_connection_point_ref)
+ try:
+ yield from add_internal_interface(intf)
+ except Exception as e:
+ msg = "Failed to add internal interface %s from vdu interface list, e = %s" % (intf.name, e)
+ self._log.error(msg)
+ raise VduRecordError(msg)
- etuple = (ext_intf, cp, vlr)
- self._ext_intf.append(etuple)
- self._log.debug("Created external interface tuple : %s", etuple)
-
- # Resolve the networks associated internal interfaces
- for intf in self._vdud.internal_interface:
- cp_id = intf.vdu_internal_connection_point_ref
- self._log.debug("Resolving internal interface name [%s], cp[%s]",
- intf.name, cp_id)
-
- try:
- vlr = find_internal_vlr_by_cp_name(cp_id)
- except Exception as e:
- self._log.debug("Failed to find cp %s in internal VLR list", cp_id)
- msg = "Failed to find cp %s in internal VLR list, e = %s" % (cp_id, e)
- raise VduRecordError(msg)
-
- ituple = (intf, cp_id, vlr)
- self._int_intf.append(ituple)
-
- self._log.debug("Created internal interface tuple : %s", ituple)
resmgr_path = self.resmgr_path
resmgr_msg = self.resmgr_msg(config)
@@ -895,17 +971,6 @@
#self._vm_resp = resp.resource_info
return resp.resource_info
-
- @asyncio.coroutine
- def start_component(self):
- """ This VDUR is active """
- self._log.debug("Starting component %s for vdud %s vdur %s",
- self._vdud.vcs_component_ref,
- self._vdud,
- self._vdur_id)
- yield from self._vnfr.start_component(self._vdud.vcs_component_ref,
- self.vm_resp.management_ip)
-
@property
def active(self):
""" Is this VDU active """
@@ -928,9 +993,6 @@
self._log.debug("VDUR id %s in VNFR %s is active", self._vdur_id, self._vnfr.vnfr_id)
- if self._vdud.vcs_component_ref is not None:
- yield from self.start_component()
-
self._state = VDURecordState.READY
if self._vnfr.all_vdus_active():
@@ -969,6 +1031,10 @@
xact_info.respond_xpath(rwdts.XactRspCode.ACK)
try:
+ #Check if resource orchestrator is not rift so that resource manager tasklet is not invoked
+ if self._nsr_config.resource_orchestrator is not None:
+ return
+
reg_event = asyncio.Event(loop=self._loop)
@asyncio.coroutine
@@ -1027,18 +1093,23 @@
class InternalVirtualLinkRecord(object):
""" Internal Virtual Link record """
- def __init__(self, dts, log, loop, ivld_msg, vnfr_name, cloud_account_name, ip_profile=None):
+ def __init__(self, dts, log, loop, project, vnfm,
+ ivld_msg, vnfr_name, datacenter_name, ip_profile=None):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
+ self._vnfm = vnfm
self._ivld_msg = ivld_msg
self._vnfr_name = vnfr_name
- self._cloud_account_name = cloud_account_name
+ self._datacenter_name = datacenter_name
self._ip_profile = ip_profile
self._vlr_req = self.create_vlr()
self._vlr = None
+ self._network_id = None
self._state = VlRecordState.INIT
+ self._state_details = ""
@property
def vlr_id(self):
@@ -1056,11 +1127,32 @@
@property
def network_id(self):
""" Find VLR by id """
- return self._vlr.network_id if self._vlr else None
+ return self._network_id
+
+ @network_id.setter
+ def network_id(self, network_id):
+ """ network id setter"""
+ self._network_id = network_id
+
+ @property
+ def active(self):
+ """ """
+ return self._state == VlRecordState.ACTIVE
+
+ @property
+ def state(self):
+ """ state for this VLR """
+ return self._state
+
+ @property
+ def state_details(self):
+ """ state details for this VLR """
+ return self._state_details
def vlr_path(self):
""" VLR path for this VLR instance"""
- return "D,/vlr:vlr-catalog/vlr:vlr[vlr:id = '{}']".format(self.vlr_id)
+ return self._project.add_project("D,/vlr:vlr-catalog/vlr:vlr[vlr:id={}]".
+ format(quoted_key(self.vlr_id)))
def create_vlr(self):
""" Create the VLR record which will be instantiated """
@@ -1077,7 +1169,7 @@
vlr_dict = {"id": str(uuid.uuid4()),
"name": self.name,
- "cloud_account": self._cloud_account_name,
+ "datacenter": self._datacenter_name,
}
if self._ip_profile and self._ip_profile.has_field('ip_profile_params'):
@@ -1085,7 +1177,13 @@
vlr_dict.update(vld_copy_dict)
- vlr = RwVlrYang.YangData_Vlr_VlrCatalog_Vlr.from_dict(vlr_dict)
+ vlr = RwVlrYang.YangData_RwProject_Project_VlrCatalog_Vlr.from_dict(vlr_dict)
+
+ if self._ivld_msg.has_field('virtual_connection_points'):
+ for cp in self._ivld_msg.virtual_connection_points:
+ vcp = vlr.virtual_connection_points.add()
+ vcp.from_dict(cp.as_dict())
+
return vlr
@asyncio.coroutine
@@ -1098,28 +1196,39 @@
self._log.debug("Create VL with xpath %s and vlr %s",
self.vlr_path(), self._vlr_req)
- with self._dts.transaction(flags=0) as xact:
- block = xact.block_create()
- block.add_query_create(xpath=self.vlr_path(), msg=self._vlr_req)
- self._log.debug("Executing VL create path:%s msg:%s",
- self.vlr_path(), self._vlr_req)
+ try:
+ with self._dts.transaction(flags=0) as xact:
+ block = xact.block_create()
+ block.add_query_create(xpath=self.vlr_path(), msg=self._vlr_req)
+ self._log.debug("Executing VL create path:%s msg:%s",
+ self.vlr_path(), self._vlr_req)
- res_iter = None
- try:
- res_iter = yield from block.execute()
- except Exception:
+ self._state = VlRecordState.INSTANTIATION_PENDING
+ self._state_details = "Oustanding VL create request:%s".format(self.vlr_path())
+ res_iter = None
+ try:
+ res_iter = yield from block.execute()
+ except Exception as e:
+ self._state = VlRecordState.FAILED
+ self._state_details = str(e)
+ self._log.exception("Caught exception while instantial VL")
+ raise
+
+ for ent in res_iter:
+ res = yield from ent
+ self._vlr = res.result
+
+ if self._vlr.operational_status == 'failed':
+ self._log.debug("VL creation failed for vlr id %s", self._vlr.id)
self._state = VlRecordState.FAILED
- self._log.exception("Caught exception while instantial VL")
- raise
+ self._state_details = self._vlr.operational_status_details
+ raise VnfrInstantiationFailed("instantiation due to VL failure %s" % (self._vlr.id))
- for ent in res_iter:
- res = yield from ent
- self._vlr = res.result
-
- if self._vlr.operational_status == 'failed':
- self._log.debug("VL creation failed for vlr id %s", self._vlr.id)
- self._state = VlRecordState.FAILED
- raise VnfrInstantiationFailed("instantiation due to VL failure %s" % (self._vlr.id))
+ except Exception as e:
+ self._log.error("Caught exception while instantiating VL:%s:%s, e:%s",
+ self.vlr_id, self._vlr.name, e)
+ self._state_details = str(e)
+ raise
self._log.info("Created VL with xpath %s and vlr %s",
self.vlr_path(), self._vlr)
@@ -1148,13 +1257,12 @@
else:
yield from instantiate_vlr()
- self._state = VlRecordState.ACTIVE
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.FAILED):
+ self._state == VlRecordState.INSTANTIATION_PENDING or
+ self._state == VlRecordState.FAILED):
return True
return False
@@ -1169,25 +1277,50 @@
self._log.debug("Terminating VL with path %s", self.vlr_path())
self._state = VlRecordState.TERMINATE_PENDING
+ self._state_details = "VL Terminate pending"
block = xact.block_create()
block.add_query_delete(self.vlr_path())
yield from block.execute(flags=0, now=True)
self._state = VlRecordState.TERMINATED
+ self._state_details = "VL Terminated"
self._log.debug("Terminated VL with path %s", self.vlr_path())
+ def set_state_from_op_status(self, operational_status, operational_status_details):
+ """ Set the state of this VL based on operational_status"""
+
+ self._state_details = operational_status_details
+
+ if operational_status == 'running':
+ self._log.info("VL %s moved to active state", self.vlr_id)
+ self._state = VlRecordState.ACTIVE
+ elif operational_status == 'failed':
+ self._log.info("VL %s moved to failed state", self.vlr_id)
+ self._state = VlRecordState.FAILED
+ elif operational_status == 'vl_alloc_pending':
+ self._log.debug("VL %s is in alloc pending state", self.vlr_id)
+ self._state = VlRecordState.INSTANTIATION_PENDING
+ else:
+ raise VirtualLinkRecordError("Unknown operational_status %s" % (operational_status))
+
+ def msg(self):
+ """ Get a proto corresponding to this VLR """
+ msg = self._vlr
+ return msg
+
class VirtualNetworkFunctionRecord(object):
""" Virtual Network Function Record """
- def __init__(self, dts, log, loop, cluster_name, vnfm, vcs_handler, vnfr_msg, mgmt_network=None):
+ def __init__(self, dts, log, loop, cluster_name, vnfm, vnfr_msg,
+ mgmt_network=None, external_ro=False):
self._dts = dts
self._log = log
- self._loop = loop
+ self._loop = loop###
+ self._project = vnfm._project
self._cluster_name = cluster_name
self._vnfr_msg = vnfr_msg
self._vnfr_id = vnfr_msg.id
self._vnfd_id = vnfr_msg.vnfd.id
self._vnfm = vnfm
- self._vcs_handler = vcs_handler
self._vnfr = vnfr_msg
self._mgmt_network = mgmt_network
@@ -1195,7 +1328,7 @@
self._state = VirtualNetworkFunctionRecordState.INIT
self._state_failed_reason = None
self._ext_vlrs = {} # The list of external virtual links
- self._vlrs = [] # The list of internal virtual links
+ self._vlrs = {} # The list of internal virtual links
self._vdus = [] # The list of vdu
self._vlr_by_cp = {}
self._cprs = []
@@ -1203,10 +1336,20 @@
self._create_time = int(time.time())
self._vnf_mon = None
self._config_status = vnfr_msg.config_status
- self._vnfd_package_store = rift.package.store.VnfdPackageFilesystemStore(self._log)
+ self._vnfd_package_store = rift.package.store.VnfdPackageFilesystemStore(self._log, project=self._project.name)
self._rw_vnfd = None
self._vnfd_ref_count = 0
+ self._ssh_pub_key = None
+ self._ssh_key_file = None
+ self._task = None
+ # Create an asyncio loop to know when the virtual links are ready
+ self._vls_ready = asyncio.Event(loop=self._loop)
+
+ # Counter for pre-init VNFR State Update DTS Query
+ self._init = False
+ self._external_ro = external_ro
+
def _get_vdur_from_vdu_id(self, vdu_id):
self._log.debug("Finding vdur for vdu_id %s", vdu_id)
self._log.debug("Searching through vdus: %s", self._vdus)
@@ -1220,7 +1363,8 @@
@property
def operational_status(self):
""" Operational status of this VNFR """
- op_status_map = {"INIT": "init",
+ op_status_map = {"PRE_INIT": "pre_init",
+ "INIT": "init",
"VL_INIT_PHASE": "vl_init_phase",
"VM_INIT_PHASE": "vm_init_phase",
"READY": "running",
@@ -1234,7 +1378,20 @@
@staticmethod
def vnfd_xpath(vnfd_id):
""" VNFD xpath associated with this VNFR """
- return "C,/vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id = '{}']".format(vnfd_id)
+ return ("C,/project-vnfd:vnfd-catalog/project-vnfd:vnfd[project-vnfd:id={}]".
+ format(quoted_key(vnfd_id)))
+
+ @property
+ def external_ro(self):
+ return self._external_ro
+
+ @property
+ def task(self):
+ return self._task
+
+ @task.setter
+ def task(self, task):
+ self._task = task
@property
def vnfd_ref_count(self):
@@ -1278,9 +1435,9 @@
return self._vnfr.name
@property
- def cloud_account_name(self):
+ def datacenter_name(self):
""" Name of the cloud account this VNFR is instantiated in """
- return self._vnfr.cloud_account
+ return self._vnfr.datacenter
@property
def vnfd_id(self):
@@ -1302,20 +1459,15 @@
""" Config agent status for this VNFR """
return self._config_status
- def component_by_name(self, component_name):
- """ Find a component by name in the inventory list"""
- mangled_name = VcsComponent.mangle_name(component_name,
- self.vnf_name,
- self.vnfd_id)
- return self._inventory[mangled_name]
-
-
+ @property
+ def public_key(self):
+ return self._ssh_pub_key
@asyncio.coroutine
def get_nsr_config(self):
### Need access to NS instance configuration for runtime resolution.
### This shall be replaced when deployment flavors are implemented
- xpath = "C,/nsr:ns-instance-config"
+ xpath = self._project.add_project("C,/nsr:ns-instance-config")
results = yield from self._dts.query_read(xpath, rwdts.XactFlag.MERGE)
for result in results:
@@ -1327,10 +1479,22 @@
return None
@asyncio.coroutine
- def start_component(self, component_name, ip_addr):
- """ Start a component in the VNFR by name """
- comp = self.component_by_name(component_name)
- yield from comp.start(None, None, ip_addr)
+ def get_nsr_opdata(self):
+ """ NSR opdata associated with this VNFR """
+ xpath = self._project.add_project(
+ "D,/nsr:ns-instance-opdata/nsr:nsr" \
+ "[nsr:ns-instance-config-ref={}]". \
+ format(quoted_key(self._vnfr_msg.nsr_id_ref)))
+
+ results = yield from self._dts.query_read(xpath, rwdts.XactFlag.MERGE)
+
+ for result in results:
+ entry = yield from result
+ nsr_op = entry.result
+ return nsr_op
+
+ return None
+
def cp_ip_addr(self, cp_name):
""" Get ip address for connection point """
@@ -1365,39 +1529,43 @@
vnfd_fields = ["short_name", "vendor", "description", "version"]
vnfd_copy_dict = {k: v for k, v in self.vnfd.as_dict().items() if k in vnfd_fields}
- mgmt_intf = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_MgmtInterface()
+ mgmt_intf = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_MgmtInterface()
ip_address, port = self.mgmt_intf_info()
- if ip_address is not None:
+ if ip_address:
mgmt_intf.ip_address = ip_address
if port is not None:
mgmt_intf.port = port
+ if self._ssh_pub_key:
+ mgmt_intf.ssh_key.public_key = self._ssh_pub_key
+ mgmt_intf.ssh_key.private_key_file = self._ssh_key_file
+
vnfr_dict = {"id": self._vnfr_id,
"nsr_id_ref": self._vnfr_msg.nsr_id_ref,
"name": self.name,
"member_vnf_index_ref": self.member_vnf_index,
"operational_status": self.operational_status,
"operational_status_details": self._state_failed_reason,
- "cloud_account": self.cloud_account_name,
+ "datacenter": self.datacenter_name,
"config_status": self._config_status
}
vnfr_dict.update(vnfd_copy_dict)
- vnfr_msg = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr.from_dict(vnfr_dict)
- vnfr_msg.vnfd = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vnfd.from_dict(self.vnfd.as_dict())
+ vnfr_msg = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr.from_dict(vnfr_dict)
+ vnfr_msg.vnfd = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vnfd.from_dict(self.vnfd.as_dict())
vnfr_msg.create_time = self._create_time
vnfr_msg.uptime = int(time.time()) - self._create_time
vnfr_msg.mgmt_interface = mgmt_intf
# Add all the VLRs to VNFR
- for vlr in self._vlrs:
+ for vlr_id, vlr in self._vlrs.items():
ivlr = vnfr_msg.internal_vlr.add()
ivlr.vlr_ref = vlr.vlr_id
- # Add all the VDURs to VDUR
+ # Add all the VDUs to VDUR
if self._vdus is not None:
for vdu in self._vdus:
vdur = vnfr_msg.vdur.add()
@@ -1407,27 +1575,50 @@
vnfr_msg.dashboard_url = self.dashboard_url
for cpr in self._cprs:
- new_cp = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_ConnectionPoint.from_dict(cpr.as_dict())
+ new_cp = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_ConnectionPoint.from_dict(cpr.as_dict())
vnfr_msg.connection_point.append(new_cp)
if self._vnf_mon is not None:
for monp in self._vnf_mon.msg:
vnfr_msg.monitoring_param.append(
- VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_MonitoringParam.from_dict(monp.as_dict()))
+ VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_MonitoringParam.from_dict(monp.as_dict()))
if self._vnfr.vnf_configuration is not None:
vnfr_msg.vnf_configuration.from_dict(self._vnfr.vnf_configuration.as_dict())
- if (ip_address is not None and
- vnfr_msg.vnf_configuration.config_access.mgmt_ip_address is None):
- vnfr_msg.vnf_configuration.config_access.mgmt_ip_address = ip_address
for group in self._vnfr_msg.placement_groups_info:
- group_info = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_PlacementGroupsInfo()
+ group_info = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_PlacementGroupsInfo()
group_info.from_dict(group.as_dict())
vnfr_msg.placement_groups_info.append(group_info)
return vnfr_msg
+ @asyncio.coroutine
+ def update_config(self, msg, xact):
+ self._log.debug("VNFM vnf config: {}".
+ format(msg.vnf_configuration.as_dict()))
+ self._config_status = msg.config_status
+ self._vnfr = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr.from_dict(
+ msg.as_dict())
+ self._log.debug("VNFR msg config: {}".
+ format(self._vnfr.as_dict()))
+
+ yield from self.publish(xact)
+
+ @asyncio.coroutine
+ def update_vnfr_after_substitution(self, msg, xact):
+ self._log.debug("Updating VNFR after Input Param Substitution: {}".
+ format(msg.as_dict()))
+ self._state = VirtualNetworkFunctionRecordState.INIT
+ self._vnfd = msg.vnfd
+ msg.operational_status = 'init'
+ self._vnfr = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr.from_dict(
+ msg.as_dict())
+
+ self._log.debug("VNFR updated: {}".
+ format(self._vnfr.as_dict()))
+ yield from self.publish(xact)
+
@property
def dashboard_url(self):
ip, cfg_port = self.mgmt_intf_info()
@@ -1452,8 +1643,8 @@
@property
def xpath(self):
""" path for this VNFR """
- return("D,/vnfr:vnfr-catalog"
- "/vnfr:vnfr[vnfr:id='{}']".format(self.vnfr_id))
+ return self._project.add_project("D,/vnfr:vnfr-catalog"
+ "/vnfr:vnfr[vnfr:id={}]".format(quoted_key(self.vnfr_id)))
@asyncio.coroutine
def publish(self, xact):
@@ -1486,12 +1677,15 @@
vlr = InternalVirtualLinkRecord(dts=self._dts,
log=self._log,
loop=self._loop,
+ project=self._project,
+ vnfm=self._vnfm,
ivld_msg=ivld_msg,
vnfr_name=self.name,
- cloud_account_name=self.cloud_account_name,
+ datacenter_name=self.datacenter_name,
ip_profile=self.resolve_vld_ip_profile(self.vnfd, ivld_msg)
)
- self._vlrs.append(vlr)
+ self._vlrs[vlr.vlr_id] = vlr
+ self._vnfm.add_vlr_id_vnfr_map(vlr.vlr_id, self)
for int_cp in ivld_msg.internal_connection_point:
if int_cp.id_ref in self._vlr_by_cp:
@@ -1508,10 +1702,20 @@
self._log.debug("Instantiating Internal Virtual Links for vnfd id: %s",
self.vnfd_id)
- for vlr in self._vlrs:
+ for vlr_id, vlr in self._vlrs.items():
self._log.debug("Instantiating VLR %s", vlr)
yield from vlr.instantiate(xact, restart_mode)
+ # Wait for the VLs to be ready before yielding control out
+ if self._vlrs:
+ self._log.debug("VNFR id:%s, name:%s - Waiting for %d VLs to be ready",
+ self.vnfr_id, self.name, len(self._vlrs))
+ yield from self._vls_ready.wait()
+ else:
+ self._log.debug("VNFR id:%s, name:%s, No virtual links found",
+ self.vnfr_id, self.name)
+ self._vls_ready.set()
+
def find_vlr_by_cp(self, cp_name):
""" Find the VLR associated with the cp name """
return self._vlr_by_cp[cp_name]
@@ -1527,7 +1731,7 @@
for group_info in nsr_config.vnfd_placement_group_maps:
if group_info.placement_group_ref == input_group.name and \
group_info.vnfd_id_ref == self.vnfd_id:
- group = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur_PlacementGroupsInfo()
+ group = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur_PlacementGroupsInfo()
group_dict = {k:v for k,v in
group_info.as_dict().items()
if (k != 'placement_group_ref' and k !='vnfd_id_ref')}
@@ -1542,7 +1746,7 @@
placement_groups = []
### Step-1: Get VNF level placement groups
for group in self._vnfr_msg.placement_groups_info:
- #group_info = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur_PlacementGroupsInfo()
+ #group_info = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur_PlacementGroupsInfo()
#group_info.from_dict(group.as_dict())
placement_groups.append(group)
@@ -1553,10 +1757,11 @@
group_info = self.resolve_placement_group_cloud_construct(group,
nsr_config)
if group_info is None:
- self._log.info("Could not resolve cloud-construct for placement group: %s", group.name)
- ### raise VNFMPlacementGroupError("Could not resolve cloud-construct for placement group: {}".format(group.name))
+ self._log.info("Could not resolve cloud-construct for " +
+ "placement group: %s", group.name)
else:
- self._log.info("Successfully resolved cloud construct for placement group: %s for VDU: %s in VNF: %s (Member Index: %s)",
+ self._log.info("Successfully resolved cloud construct for " +
+ "placement group: %s for VDU: %s in VNF: %s (Member Index: %s)",
str(group_info),
vdu.name,
self.vnf_name,
@@ -1566,6 +1771,17 @@
return placement_groups
@asyncio.coroutine
+ def substitute_vdu_input_parameters(self, vdu):
+ result = vdu
+ for vdu_vnfr in self.vnfd.vdu:
+ if vdu["id"] == vdu_vnfr.id:
+ result = vdu_vnfr.as_dict()
+ break
+
+ return RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd_Vdu.from_dict(result)
+
+
+ @asyncio.coroutine
def vdu_cloud_init_instantiation(self):
[vdu.vdud_cloud_init for vdu in self._vdus]
@@ -1610,16 +1826,20 @@
[ group.name for group in placement_groups],
vdur_id)
+ # Update VDU Info from VNFR (It contains the input parameter for VDUs as well)
+ vdu_updated = yield from self.substitute_vdu_input_parameters(vdu.as_dict())
+
vdur = VirtualDeploymentUnitRecord(
dts=self._dts,
log=self._log,
loop=self._loop,
- vdud=vdu,
+ project = self._project,
+ vdud=vdu_updated,
vnfr=vnfr,
nsr_config=nsr_config,
mgmt_intf=self.has_mgmt_interface(vdu),
mgmt_network=self._mgmt_network,
- cloud_account_name=self.cloud_account_name,
+ datacenter_name=self.datacenter_name,
vnfd_package_store=self._vnfd_package_store,
vdur_id=vdur_id,
placement_groups = placement_groups,
@@ -1688,6 +1908,7 @@
VirtualDeploymentUnitRecordError is raised.
"""
+
for dependency in dependencies[vdu.vdu_id]:
self._log.debug("{}: waiting for {}".format(vdu.vdu_id, dependency.vdu_id))
@@ -1704,8 +1925,9 @@
# Substitute any variables contained in the cloud config script
config = str(vdu.vdud_cloud_init) if vdu.vdud_cloud_init is not None else ""
-
+
parts = re.split("\{\{ ([^\}]+) \}\}", config)
+
if len(parts) > 1:
# Extract the variable names
@@ -1715,6 +1937,7 @@
# Iterate of the variables and substitute values from the
# datastore.
+
for variable in variables:
# Handle a reference to a VDU by ID
@@ -1733,6 +1956,19 @@
config = config.replace("{{ %s }}" % variable, value)
continue
+ # Handle a reference to Cloud Init Variables: Start with 'CI'
+ if variable.startswith('CI'):
+ custom_meta_data = datastore.get('vdu[{}]'.format(vdu.vdu_id) + ".custom_meta_data")
+ try:
+ for meta_data in custom_meta_data:
+ if meta_data.destination == 'CLOUD_INIT':
+ if meta_data.name == variable:
+ config = config.replace("{{ %s }}" % variable, meta_data.value)
+ except Exception:
+ raise ValueError("Unrecognized Cloud Init Variable")
+
+ continue
+
# Handle unrecognized variables
msg = 'unrecognized cloud-config variable: {}'
raise ValueError(msg.format(variable))
@@ -1761,42 +1997,13 @@
def vlr_xpath(self, vlr_id):
""" vlr xpath """
- return(
- "D,/vlr:vlr-catalog/"
- "vlr:vlr[vlr:id = '{}']".format(vlr_id))
+ return self._project.add_project("D,/vlr:vlr-catalog/"
+ "vlr:vlr[vlr:id={}]".format(quoted_key(vlr_id)))
def ext_vlr_by_id(self, vlr_id):
""" find ext vlr by id """
return self._ext_vlrs[vlr_id]
- @asyncio.coroutine
- def publish_inventory(self, xact):
- """ Publish the inventory associated with this VNF """
- self._log.debug("Publishing inventory for VNFR id: %s", self._vnfr_id)
-
- for component in self._rw_vnfd.component:
- self._log.debug("Creating inventory component %s", component)
- mangled_name = VcsComponent.mangle_name(component.component_name,
- self.vnf_name,
- self.vnfd_id
- )
- comp = VcsComponent(dts=self._dts,
- log=self._log,
- loop=self._loop,
- cluster_name=self._cluster_name,
- vcs_handler=self._vcs_handler,
- component=component,
- mangled_name=mangled_name,
- )
- if comp.name in self._inventory:
- self._log.debug("Duplicate entries in inventory %s for vnfr %s",
- component, self._vnfd_id)
- return
- self._log.debug("Adding component %s for vnrf %s",
- comp.name, self._vnfr_id)
- self._inventory[comp.name] = comp
- yield from comp.publish(xact)
-
def all_vdus_active(self):
""" Are all VDUS in this VNFR active? """
for vdu in self._vdus:
@@ -1830,7 +2037,7 @@
# Update the VNFR with the changed status
yield from self.publish(None)
- def update_cp(self, cp_name, ip_address, mac_addr, cp_id):
+ def update_cp(self, cp_name, ip_address, mac_addr, cp_id, virtual_cps = list()):
"""Updated the connection point with ip address"""
for cp in self._cprs:
if cp.name == cp_name:
@@ -1839,6 +2046,8 @@
cp.ip_address = ip_address
cp.mac_address = mac_addr
cp.connection_point_id = cp_id
+ if virtual_cps:
+ cp.virtual_cps = [VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_ConnectionPoint_VirtualCps.from_dict(v) for v in virtual_cps]
return
err = "No connection point %s found in VNFR id %s" % (cp.name, self._vnfr_id)
@@ -1852,9 +2061,15 @@
@asyncio.coroutine
def instantiate(self, xact, restart_mode=False):
""" instantiate this VNF """
+ self._log.info("Instantiate VNF {}: {}".format(self._vnfr_id, self._state))
self.set_state(VirtualNetworkFunctionRecordState.VL_INIT_PHASE)
self._rw_vnfd = yield from self._vnfm.fetch_vnfd(self._vnfd_id)
+ nsr_op = yield from self.get_nsr_opdata()
+ if nsr_op:
+ self._ssh_key_file = nsr_op.ssh_key_generated.private_key_file
+ self._ssh_pub_key = nsr_op.ssh_key_generated.public_key
+
@asyncio.coroutine
def fetch_vlrs():
""" Fetch VLRs """
@@ -1863,11 +2078,11 @@
def cpr_from_cp(cp):
""" Creates a record level connection point from the desciptor cp"""
- cp_fields = ["name", "image", "vm-flavor", "port_security_enabled"]
+ cp_fields = ["name", "image", "vm-flavor", "port_security_enabled", "type_yang"]
cp_copy_dict = {k: v for k, v in cp.as_dict().items() if k in cp_fields}
cpr_dict = {}
cpr_dict.update(cp_copy_dict)
- return VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_ConnectionPoint.from_dict(cpr_dict)
+ return VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_ConnectionPoint.from_dict(cpr_dict)
self._log.debug("Fetching VLRs for VNFR id = %s, cps = %s",
self._vnfr_id, self._vnfr.connection_point)
@@ -1879,7 +2094,7 @@
vlr_path = self.vlr_xpath(cp.vlr_ref)
self._log.debug("Fetching VLR with path = %s", vlr_path)
- res_iter = yield from self._dts.query_read(self.vlr_xpath(cp.vlr_ref),
+ res_iter = yield from self._dts.query_read(vlr_path,
rwdts.XactFlag.MERGE)
for i in res_iter:
r = yield from i
@@ -1897,16 +2112,12 @@
self._log.debug("VNFR-ID %s: Fetching vlrs", self._vnfr_id)
yield from fetch_vlrs()
- # Publish inventory
- self._log.debug("VNFR-ID %s: Publishing Inventory", self._vnfr_id)
- yield from self.publish_inventory(xact)
-
- # Publish inventory
+ # Publish VLs
self._log.debug("VNFR-ID %s: Creating VLs", self._vnfr_id)
yield from self.create_vls()
# publish the VNFR
- self._log.debug("VNFR-ID %s: Publish VNFR", self._vnfr_id)
+ self._log.debug("Publish VNFR {}: {}".format(self._vnfr_id, self._state))
yield from self.publish(xact)
@@ -1919,6 +2130,12 @@
yield from self.instantiation_failed(str(e))
return
+ vl_state, failed_vl = self.vl_instantiation_state()
+ if vl_state == VlRecordState.FAILED:
+ self._log.error("VL Instantiation failed for one or more of the internal virtual links, vl:%s",failed_vl)
+ yield from self.instantiation_failed(failed_vl.state_details)
+ return
+
self.set_state(VirtualNetworkFunctionRecordState.VM_INIT_PHASE)
# instantiate VDUs
@@ -1933,12 +2150,13 @@
yield from self.publish(xact)
# publish the VNFR
- self._log.debug("VNFR-ID %s: Publish VNFR", self._vnfr_id)
+ self._log.debug("VNFR {}: Publish VNFR with state {}".
+ format(self._vnfr_id, self._state))
yield from self.publish(xact)
# instantiate VDUs
# ToDo: Check if this should be prevented during restart
- self._log.debug("VNFR-ID %s: Instantiate VDUs", self._vnfr_id)
+ self._log.debug("Instantiate VDUs {}: {}".format(self._vnfr_id, self._state))
_ = self._loop.create_task(self.instantiate_vdus(xact, self))
# publish the VNFR
@@ -1947,14 +2165,14 @@
self._log.debug("VNFR-ID %s: Instantiation Done", self._vnfr_id)
- # create task updating uptime for this vnfr
- self._log.debug("VNFR-ID %s: Starting task to update uptime", self._vnfr_id)
- self._loop.create_task(self.vnfr_uptime_update(xact))
-
@asyncio.coroutine
def terminate(self, xact):
""" Terminate this virtual network function """
+ if self._task:
+ self._log.debug("Canceling scheduled tasks for VNFR %s", self._vnfr_id)
+ self._task.cancel()
+
self._log.debug("Terminatng VNF id %s", self.vnfr_id)
self.set_state(VirtualNetworkFunctionRecordState.TERMINATE)
@@ -1968,7 +2186,8 @@
@asyncio.coroutine
def terminate_vls():
""" Terminate VLs in this VNF """
- for vl in self._vlrs:
+ for vlr_id, vl in self._vlrs.items():
+ self._vnfm.remove_vlr_id_vnfr_map(vlr_id)
yield from vl.terminate(xact)
@asyncio.coroutine
@@ -1988,23 +2207,83 @@
self._log.debug("Terminated VNF id %s", self.vnfr_id)
self.set_state(VirtualNetworkFunctionRecordState.TERMINATED)
- @asyncio.coroutine
- def vnfr_uptime_update(self, xact):
- while True:
- # Return when vnfr state is FAILED or TERMINATED etc
- if self._state not in [VirtualNetworkFunctionRecordState.INIT,
- VirtualNetworkFunctionRecordState.VL_INIT_PHASE,
- VirtualNetworkFunctionRecordState.VM_INIT_PHASE,
- VirtualNetworkFunctionRecordState.READY]:
- return
- yield from self.publish(xact)
- yield from asyncio.sleep(2, loop=self._loop)
+ # Unref the VNFD
+ self.vnfd_unref()
+ def vl_instantiation_state(self):
+ """ Get the state of VL instantiation of this VNF """
+ failed_vl = None
+ for vl_id, vlr in self._vlrs.items():
+ if vlr.state == VlRecordState.ACTIVE:
+ continue
+ elif vlr.state == VlRecordState.FAILED:
+ failed_vl = vlr
+ return VlRecordState.FAILED, failed_vl
+ elif vlr.state == VlRecordState.INSTANTIATION_PENDING:
+ failed_vl = vlr, failed_vl
+ return VlRecordState.INSTANTIATION_PENDING, failed_vl
+ else:
+ self._log.debug("vlr %s still in state %s", vlr, vlr.state)
+ raise VlRecordError("Invalid state %s", vlr.state)
+ return VlRecordState.ACTIVE, failed_vl
+
+ def vl_instantiation_successful(self):
+ """ Mark that all VLs in this VNF are active """
+ if self._vls_ready.is_set():
+ self._log.debug("VNFR id %s, vls_ready is already set", self.id)
+
+ vl_state, failed_vl = self.vl_instantiation_state()
+
+ if vl_state == VlRecordState.ACTIVE:
+ self._log.info("VNFR id:%s name:%s has all Virtual Links in active state, Ready to orchestrate VDUs",
+ self.vnfr_id, self.name)
+ self._vls_ready.set()
+
+ elif vl_state == VlRecordState.FAILED:
+ self._log.error("VNFR id:%s name:%s One of the Virtual Links failed to reach active state.Failed to orchestrate VNF",
+ self.vnfr_id, self.name)
+ self.instantiation_failed("VNFR id %s: failed since VL %s did not come up".format(self.vnfr_id, failed_vl.name))
+ self._vls_ready.set()
+
+ def find_vlr(self, vlr_id):
+ """ Find VLR matching the passed VLR id """
+
+ if vlr_id in self._vlrs:
+ return self._vlrs[vlr_id]
+ return None
+
+ def vlr_event(self, vlr, action):
+ self._log.debug("Received VLR %s with action:%s", vlr, action)
+
+ vlr_local = self.find_vlr(vlr.id)
+ if vlr_local is None:
+ self._log.error("VLR %s:%s received for unknown id, state:%s ignoring event",
+ vlr.id, vlr.name, vlr.state)
+ return
+
+ if action == rwdts.QueryAction.CREATE or action == rwdts.QueryAction.UPDATE:
+ if vlr.operational_status == 'running':
+ vlr_local.set_state_from_op_status(vlr.operational_status, vlr.operational_status_details)
+ self._log.info("VLR %s:%s moving to active state",
+ vlr.id, vlr.name)
+ elif vlr.operational_status == 'failed':
+ vlr_local.set_state_from_op_status(vlr.operational_status, vlr.operational_status_details)
+ self._log.info("VLR %s:%s moving to failed state",
+ vlr.id, vlr.name)
+ else:
+ self._log.warning("VLR %s:%s received state:%s",
+ vlr.id, vlr.name, vlr.operational_status)
+
+ if vlr.has_field('network_id'):
+ vlr_local.network_id = vlr.network_id
+
+ # Check if vl instantiation successful for this VNFR
+ self.vl_instantiation_successful()
class VnfdDtsHandler(object):
""" DTS handler for VNFD config changes """
- XPATH = "C,/vnfd:vnfd-catalog/vnfd:vnfd"
+ XPATH = "C,/project-vnfd:vnfd-catalog/project-vnfd:vnfd"
def __init__(self, dts, log, loop, vnfm):
self._dts = dts
@@ -2012,28 +2291,56 @@
self._loop = loop
self._vnfm = vnfm
self._regh = None
+ self._reg_ready = 0
@asyncio.coroutine
def regh(self):
""" DTS registration handle """
return self._regh
+ def deregister(self):
+ '''De-register from DTS'''
+ self._log.debug("De-register VNFD DTS handler for project {}".
+ format(self._vnfm._project.name))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
@asyncio.coroutine
def register(self):
""" Register for VNFD configuration"""
+ @asyncio.coroutine
def on_apply(dts, acg, xact, action, scratch):
"""Apply the configuration"""
self._log.debug("Got VNFM VNFD apply (xact: %s) (action: %s)(scr: %s)",
xact, action, scratch)
is_recovery = xact.xact is None and action == rwdts.AppconfAction.INSTALL
+ # Create/Update a VNFD record
+ if self._regh:
+ for cfg in self._regh.get_xact_elements(xact):
+ # Only interested in those VNFD cfgs whose ID was received in prepare callback
+ if cfg.id in scratch.get('vnfds', []) or is_recovery:
+ self._vnfm.update_vnfd(cfg)
+ else:
+ self._log.warning("Reg handle none for {} in project {}".
+ format(self.__class__, self._vnfm._project))
+
+ scratch.pop('vnfds', None)
+
+ if is_recovery:
+ #yield from self._vnfm.vnfr_handler.register()
+ #yield from self._vnfm.vnfr_ref_handler.register()
+ self._reg_ready = 1
@asyncio.coroutine
def on_prepare(dts, acg, xact, xact_info, ks_path, msg, scratch):
""" on prepare callback """
- self._log.debug("Got on prepare for VNFD (path: %s) (action: %s)",
- ks_path.to_xpath(RwVnfmYang.get_schema()), msg)
+ xpath = ks_path.to_xpath(RwVnfmYang.get_schema())
+ self._log.debug("Got on prepare for VNFD (path: %s) (action: %s) (msg: %s)",
+ xpath,
+ xact_info.query_action, msg)
fref = ProtobufC.FieldReference.alloc()
fref.goto_whole_message(msg.to_pbcm())
@@ -2043,73 +2350,43 @@
self._log.debug("Deleting VNFD with id %s", msg.id)
if self._vnfm.vnfd_in_use(msg.id):
self._log.debug("Cannot delete VNFD in use - %s", msg)
- err = "Cannot delete a VNFD in use - %s" % msg
- raise VirtualNetworkFunctionDescriptorRefCountExists(err)
+ err_msg = "Cannot delete a VNFD in use - %s" % msg
+ xact_info.send_error_xpath(RwTypes.RwStatus.FAILURE, xpath, err_msg)
+ xact_info.respond_xpath(rwdts.XactRspCode.NACK, xpath)
+ return
# Delete a VNFD record
yield from self._vnfm.delete_vnfd(msg.id)
- xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+ try:
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+ except rift.tasklets.dts.ResponseError as e:
+ self._log.warning(
+ "VnfdDtsHandler in project {} with path {} for action {} failed: {}".
+ format(self._vnfm._project, xpath, xact_info.query_action, e))
- self._log.debug(
- "Registering for VNFD config using xpath: %s",
- VnfdDtsHandler.XPATH,
- )
+ xpath = self._vnfm._project.add_project(VnfdDtsHandler.XPATH)
+ self._log.debug("Registering for VNFD config using xpath: {}".
+ format(xpath))
+
acg_hdl = rift.tasklets.AppConfGroup.Handler(on_apply=on_apply)
with self._dts.appconf_group_create(handler=acg_hdl) as acg:
self._regh = acg.register(
- xpath=VnfdDtsHandler.XPATH,
+ xpath=xpath,
flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY,
on_prepare=on_prepare)
-
-class VcsComponentDtsHandler(object):
- """ Vcs Component DTS handler """
- XPATH = ("D,/rw-manifest:manifest" +
- "/rw-manifest:operational-inventory" +
- "/rw-manifest:component")
-
- def __init__(self, dts, log, loop, vnfm):
- self._dts = dts
- self._log = log
- self._loop = loop
- self._regh = None
- self._vnfm = vnfm
-
- @property
- def regh(self):
- """ DTS registration handle """
- return self._regh
-
- @asyncio.coroutine
- def register(self):
- """ Registers VCS component dts publisher registration"""
- self._log.debug("VCS Comp publisher DTS handler registering path %s",
- VcsComponentDtsHandler.XPATH)
-
- hdl = rift.tasklets.DTS.RegistrationHandler()
- handlers = rift.tasklets.Group.Handler()
- with self._dts.group_create(handler=handlers) as group:
- self._regh = group.register(xpath=VcsComponentDtsHandler.XPATH,
- handler=hdl,
- flags=(rwdts.Flag.PUBLISHER |
- rwdts.Flag.NO_PREP_READ |
- rwdts.Flag.DATASTORE),)
-
- @asyncio.coroutine
- def publish(self, xact, path, msg):
- """ Publishes the VCS component """
- self._log.debug("Publishing the VcsComponent xact = %s, %s:%s",
- xact, path, msg)
- self.regh.create_element(path, msg)
- self._log.debug("Published the VcsComponent to %s xact = %s, %s:%s",
- VcsComponentDtsHandler.XPATH, xact, path, msg)
-
class VnfrConsoleOperdataDtsHandler(object):
- """ registers 'D,/vnfr:vnfr-console/vnfr:vnfr[id]/vdur[id]' and handles CRUD from DTS"""
+ """
+ Registers 'D,/rw-project:project/vnfr:vnfr-console/vnfr:vnfr[id]/vdur[id]'
+ and handles CRUD from DTS
+ """
+
@property
def vnfr_vdu_console_xpath(self):
""" path for resource-mgr"""
- return ("D,/rw-vnfr:vnfr-console/rw-vnfr:vnfr[rw-vnfr:id='{}']/rw-vnfr:vdur[vnfr:id='{}']".format(self._vnfr_id,self._vdur_id))
+ return self._project.add_project(
+ "D,/rw-vnfr:vnfr-console/rw-vnfr:vnfr[rw-vnfr:id={}]".format(quoted_key(self._vnfr_id)) +
+ "/rw-vnfr:vdur[vnfr:id={}]".format(quoted_key(self._vdur_id)))
def __init__(self, dts, log, loop, vnfm, vnfr_id, vdur_id, vdu_id):
self._dts = dts
@@ -2122,6 +2399,16 @@
self._vdur_id = vdur_id
self._vdu_id = vdu_id
+ self._project = vnfm._project
+
+ def deregister(self):
+ '''De-register from DTS'''
+ self._log.debug("De-register VNFR console DTS handler for project {}".
+ format(self._project))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
@asyncio.coroutine
def register(self):
""" Register for VNFR VDU Operational Data read from dts """
@@ -2136,7 +2423,7 @@
)
if action == rwdts.QueryAction.READ:
- schema = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur.schema()
+ schema = RwVnfrYang.YangData_RwProject_Project_VnfrConsole_Vnfr_Vdur.schema()
path_entry = schema.keyspec_to_entry(ks_path)
self._log.debug("VDU Opdata path is {}".format(path_entry.key00.id))
try:
@@ -2153,7 +2440,7 @@
return
with self._dts.transaction() as new_xact:
resp = yield from vdur.read_resource(new_xact)
- vdur_console = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur()
+ vdur_console = RwVnfrYang.YangData_RwProject_Project_VnfrConsole_Vnfr_Vdur()
vdur_console.id = self._vdur_id
if resp.console_url:
vdur_console.console_url = resp.console_url
@@ -2162,13 +2449,13 @@
self._log.debug("Recevied console URL for vdu {} is {}".format(self._vdu_id,vdur_console))
except Exception:
self._log.exception("Caught exception while reading VDU %s", self._vdu_id)
- vdur_console = RwVnfrYang.YangData_RwVnfr_VnfrConsole_Vnfr_Vdur()
+ vdur_console = RwVnfrYang.YangData_RwProject_Project_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)
+ xpath=self.vnfr_vdu_console_xpath,
+ msg=vdur_console)
else:
#raise VnfRecordError("Not supported operation %s" % action)
self._log.error("Not supported operation %s" % action)
@@ -2187,7 +2474,7 @@
class VnfrDtsHandler(object):
- """ registers 'D,/vnfr:vnfr-catalog/vnfr:vnfr' and handles CRUD from DTS"""
+ """ registers 'D,/rw-project:project/vnfr:vnfr-catalog/vnfr:vnfr' and handles CRUD from DTS"""
XPATH = "D,/vnfr:vnfr-catalog/vnfr:vnfr"
def __init__(self, dts, log, loop, vnfm):
@@ -2197,6 +2484,7 @@
self._vnfm = vnfm
self._regh = None
+ self._project = vnfm._project
@property
def regh(self):
@@ -2208,17 +2496,17 @@
""" Return VNF manager instance """
return self._vnfm
+ def deregister(self):
+ '''De-register from DTS'''
+ self._log.debug("De-register VNFR DTS handler for project {}".
+ format(self._project))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
@asyncio.coroutine
def register(self):
""" Register for vnfr create/update/delete/read requests from dts """
- def on_commit(xact_info):
- """ The transaction has been committed """
- self._log.debug("Got vnfr commit (xact_info: %s)", xact_info)
- return rwdts.MemberRspCode.ACTION_OK
-
- def on_abort(*args):
- """ Abort callback """
- self._log.debug("VNF transaction got aborted")
@asyncio.coroutine
def on_event(dts, g_reg, xact, xact_event, scratch_data):
@@ -2234,13 +2522,22 @@
yield from vnfr.instantiate(None, restart_mode=True)
+ self._log.debug("Got on_event in vnfm: {}".format(xact_event))
+
if xact_event == rwdts.MemberEvent.INSTALL:
curr_cfg = self.regh.elements
for cfg in curr_cfg:
- vnfr = self.vnfm.create_vnfr(cfg)
- self._loop.create_task(instantiate_realloc_vnfr(vnfr))
+ try:
+ vnfr = self.vnfm.create_vnfr(cfg, restart_mode = True)
+ if vnfr is None:
+ self._log.error("Not Creating VNFR {} as corresponding NS is terminated".format(cfg.id))
+ else:
+ self._log.debug("Creating VNFR {}".format(vnfr.vnfr_id))
+ except Exception as e:
+ self._log.exception(e)
+ raise e
- self._log.debug("Got on_event in vnfm")
+ self._loop.create_task(instantiate_realloc_vnfr(vnfr))
return rwdts.MemberRspCode.ACTION_OK
@@ -2252,62 +2549,125 @@
xact_info, action, msg
)
+ @asyncio.coroutine
+ def create_vnf(vnfr):
+
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+
+ if msg.operational_status == 'pre_init':
+ vnfr.set_state(VirtualNetworkFunctionRecordState.PRE_INIT)
+ yield from vnfr.publish(None)
+
+ if vnfr.external_ro:
+ return
+
+ if msg.operational_status == 'init':
+ vnfr._init = True
+ def on_instantiate_done(fut):
+ # If the do_instantiate fails, then publish NSR with failed result
+ 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.exception("VNFR instantiation failed for VNFR id %s: %s", vnfr.vnfr_id, str(e))
+ self._loop.create_task(vnfr.instantiation_failed(failed_reason=str(e)))
+
+ try:
+ # RIFT-9105: Unable to add a READ query under an existing transaction
+ # xact = xact_info.xact
+ assert vnfr.task is None
+ vnfr.task = self._loop.create_task(vnfr.instantiate(None))
+ vnfr.task.add_done_callback(on_instantiate_done)
+
+
+ except Exception as e:
+ self._log.exception(e)
+ self._log.error("Error while instantiating vnfr:%s", vnfr.vnfr_id)
+ vnfr.set_state(VirtualNetworkFunctionRecordState.FAILED)
+ yield from vnfr.publish(None)
+
+ return
+
if action == rwdts.QueryAction.CREATE:
if not msg.has_field("vnfd"):
err = "Vnfd not provided"
self._log.error(err)
raise VnfRecordError(err)
-
vnfr = self.vnfm.create_vnfr(msg)
- try:
- # RIFT-9105: Unable to add a READ query under an existing transaction
- # xact = xact_info.xact
- yield from vnfr.instantiate(None)
- except Exception as e:
- self._log.exception(e)
- self._log.error("Error while instantiating vnfr:%s", vnfr.vnfr_id)
- vnfr.set_state(VirtualNetworkFunctionRecordState.FAILED)
- yield from vnfr.publish(None)
+ if vnfr is None:
+ self._log.error("Not Creating VNFR {} as corresponding NS is terminated".format(msg.id))
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+ else:
+ yield from create_vnf(vnfr)
+ return
+
elif action == rwdts.QueryAction.DELETE:
- schema = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr.schema()
+ schema = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr.schema()
path_entry = schema.keyspec_to_entry(ks_path)
vnfr = self._vnfm.get_vnfr(path_entry.key00.id)
if vnfr is None:
- self._log.debug("VNFR id %s not found for delete", path_entry.key00.id)
- raise VirtualNetworkFunctionRecordNotFound(
- "VNFR id %s", path_entry.key00.id)
+ self._log.error("VNFR id %s not found for delete", path_entry.key00.id)
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+ return
+ # Preventing exception here if VNFR id is not found. This means delete is
+ # invoked before Creation.
+ # raise VirtualNetworkFunctionRecordNotFound(
+ # "VNFR id %s", path_entry.key00.id)
try:
- yield from vnfr.terminate(xact_info.xact)
- # Unref the VNFD
- vnfr.vnfd_unref()
+ if not vnfr.external_ro:
+ yield from vnfr.terminate(xact_info.xact)
yield from self._vnfm.delete_vnfr(xact_info.xact, vnfr)
except Exception as e:
self._log.exception(e)
self._log.error("Caught exception while deleting vnfr %s", path_entry.key00.id)
elif action == rwdts.QueryAction.UPDATE:
- schema = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr.schema()
+ schema = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr.schema()
path_entry = schema.keyspec_to_entry(ks_path)
vnfr = None
try:
vnfr = self._vnfm.get_vnfr(path_entry.key00.id)
+
+ if vnfr is None:
+ # This means one of two things : The VNFR has been deleted or its a Launchpad restart.
+ if msg.id in self._vnfm._deleted_vnfrs:
+ # VNFR is deleted.
+ self._log.error("Not Creating VNFR {} as corresponding NS is terminated".format(msg.id))
+ return
+
+ self._log.debug("Launchpad Restart - Recreating VNFR - %s", msg.id)
+ vnfr = self.vnfm.create_vnfr(msg)
+ if vnfr is None:
+ self._log.error("Not Creating VNFR {} as corresponding NS is terminated".format(msg.id))
+ else:
+ yield from create_vnf(vnfr)
+
+ return
+
except Exception as e:
- self._log.debug("No vnfr found with id %s", path_entry.key00.id)
+ self._log.error("Exception in VNFR Update : %s", str(e))
xact_info.respond_xpath(rwdts.XactRspCode.NA)
return
- if vnfr is None:
- self._log.debug("VNFR id %s not found for update", path_entry.key00.id)
- xact_info.respond_xpath(rwdts.XactRspCode.NA)
+ if vnfr.external_ro:
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK)
return
- self._log.debug("VNFR {} update config status {} (current {})".
- format(vnfr.name, msg.config_status, vnfr.config_status))
- # Update the config status and publish
- vnfr._config_status = msg.config_status
- yield from vnfr.publish(None)
+ if (msg.operational_status == 'pre_init' and not vnfr._init):
+ # Creating VNFR INSTANTIATION TASK
+ self._log.debug("VNFR {} update after substitution {} (operational_status {})".
+ format(vnfr.name, msg.vnfd, msg.operational_status))
+ yield from vnfr.update_vnfr_after_substitution(msg, xact_info)
+ yield from create_vnf(vnfr)
+ return
+
+ else:
+ self._log.debug("VNFR {} update config status {} (current {})".
+ format(vnfr.name, msg.config_status, vnfr.config_status))
+ # Update the config and publish
+ yield from vnfr.update_config(msg, xact_info)
else:
raise NotImplementedError(
@@ -2316,25 +2676,26 @@
xact_info.respond_xpath(rwdts.XactRspCode.ACK)
- self._log.debug("Registering for VNFR using xpath: %s",
- VnfrDtsHandler.XPATH,)
+ xpath = self._project.add_project(VnfrDtsHandler.XPATH)
+ self._log.debug("Registering for VNFR using xpath: {}".
+ format(xpath))
- hdl = rift.tasklets.DTS.RegistrationHandler(on_commit=on_commit,
- on_prepare=on_prepare,)
+ hdl = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare,)
handlers = rift.tasklets.Group.Handler(on_event=on_event,)
with self._dts.group_create(handler=handlers) as group:
- self._regh = group.register(xpath=VnfrDtsHandler.XPATH,
+ self._regh = group.register(xpath=xpath,
handler=hdl,
flags=(rwdts.Flag.PUBLISHER |
+ rwdts.Flag.SHARED |
rwdts.Flag.NO_PREP_READ |
- rwdts.Flag.CACHE |
rwdts.Flag.DATASTORE),)
@asyncio.coroutine
- def create(self, xact, path, msg):
+ def create(self, xact, xpath, msg):
"""
Create a VNFR record in DTS with path and message
"""
+ path = self._project.add_project(xpath)
self._log.debug("Creating VNFR xact = %s, %s:%s",
xact, path, msg)
@@ -2343,21 +2704,23 @@
xact, path, msg)
@asyncio.coroutine
- def update(self, xact, path, msg):
+ def update(self, xact, xpath, msg, flags=rwdts.XactFlag.REPLACE):
"""
Update a VNFR record in DTS with path and message
"""
+ path = self._project.add_project(xpath)
self._log.debug("Updating VNFR xact = %s, %s:%s",
xact, path, msg)
- self.regh.update_element(path, msg)
+ self.regh.update_element(path, msg, flags)
self._log.debug("Updated VNFR xact = %s, %s:%s",
xact, path, msg)
@asyncio.coroutine
- def delete(self, xact, path):
+ def delete(self, xact, xpath):
"""
Delete a VNFR record in DTS with path and message
"""
+ path = self._project.add_project(xpath)
self._log.debug("Deleting VNFR xact = %s, %s", xact, path)
self.regh.delete_element(path)
self._log.debug("Deleted VNFR xact = %s, %s", xact, path)
@@ -2385,6 +2748,14 @@
""" Return the NS manager instance """
return self._vnfm
+ def deregister(self):
+ '''De-register from DTS'''
+ self._log.debug("De-register VNFD Ref DTS handler for project {}".
+ format(self._vnfm._project))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
@asyncio.coroutine
def register(self):
""" Register for VNFD ref count read from dts """
@@ -2399,7 +2770,7 @@
)
if action == rwdts.QueryAction.READ:
- schema = RwVnfrYang.YangData_Vnfr_VnfrCatalog_VnfdRefCount.schema()
+ schema = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_VnfdRefCount.schema()
path_entry = schema.keyspec_to_entry(ks_path)
vnfd_list = yield from self._vnfm.get_vnfd_refcount(path_entry.key00.vnfd_id_ref)
for xpath, msg in vnfd_list:
@@ -2414,7 +2785,8 @@
hdl = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare,)
with self._dts.group_create() as group:
- self._regh = group.register(xpath=VnfdRefCountDtsHandler.XPATH,
+ self._regh = group.register(xpath=self._vnfm._project.add_project(
+ VnfdRefCountDtsHandler.XPATH),
handler=hdl,
flags=rwdts.Flag.PUBLISHER,
)
@@ -2463,7 +2835,8 @@
set_if_not_none('mgmt.ip', vdur.vm_management_ip)
# The below can be used for hostname
set_if_not_none('vdur_name', vdur.unique_short_name)
-
+ set_if_not_none('custom_meta_data', vdur._vdud.supplemental_boot_data.custom_meta_data)
+
def update(self, vdur):
"""Update the VDUR information in the datastore
@@ -2493,6 +2866,7 @@
set_or_delete('mgmt.ip', vdur.vm_management_ip)
# The below can be used for hostname
set_or_delete('vdur_name', vdur.unique_short_name)
+ set_or_delete('custom_meta_data', vdur._vdud.supplemental_boot_data.custom_meta_data)
def remove(self, vdur_id):
"""Remove all of the data associated with specified VDUR
@@ -2532,6 +2906,7 @@
The requested data or None
"""
+
result = self._pattern.match(expr)
if result is None:
raise ValueError('data expression not recognized ({})'.format(expr))
@@ -2546,25 +2921,36 @@
class VnfManager(object):
""" The virtual network function manager class """
- def __init__(self, dts, log, loop, cluster_name):
+ def __init__(self, dts, log, loop, project, cluster_name):
self._dts = dts
self._log = log
self._loop = loop
+ self._project = project
self._cluster_name = cluster_name
- self._vcs_handler = VcsComponentDtsHandler(dts, log, loop, self)
- self._vnfr_handler = VnfrDtsHandler(dts, log, loop, self)
- self._vnfr_ref_handler = VnfdRefCountDtsHandler(dts, log, loop, self)
- self._nsr_handler = mano_dts.NsInstanceConfigSubscriber(log, dts, loop, callback=self.handle_nsr)
+ # This list maintains a list of all the deleted vnfrs' ids. This is done to be able to determine
+ # if the vnfr is not found because of restart or simply because it was deleted. In the first case we
+ # recreate the vnfr while in the latter we do not.
+ self._deleted_vnfrs = []
- self._dts_handlers = [VnfdDtsHandler(dts, log, loop, self),
+ self._vnfr_handler = VnfrDtsHandler(dts, log, loop, self)
+ self._vnfd_handler = VnfdDtsHandler(dts, log, loop, self)
+ self._vnfr_ref_handler = VnfdRefCountDtsHandler(dts, log, loop, self)
+ self._nsr_handler = mano_dts.NsInstanceConfigSubscriber(
+ log, dts, loop, project, callback=self.handle_nsr)
+ self._vlr_handler = subscriber.VlrSubscriberDtsHandler(log, dts, loop, project,
+ callback=self.vlr_event)
+
+ self._dts_handlers = [self._vnfd_handler,
self._vnfr_handler,
- self._vcs_handler,
self._vnfr_ref_handler,
- self._nsr_handler]
+ self._nsr_handler,
+ self._vlr_handler
+ ]
self._vnfrs = {}
self._vnfds_to_vnfr = {}
self._nsrs = {}
+ self._vnfr_for_vlr = {}
@property
def vnfr_handler(self):
@@ -2572,9 +2958,9 @@
return self._vnfr_handler
@property
- def vcs_handler(self):
- """ VCS dts handler """
- return self._vcs_handler
+ def vnfr_ref_handler(self):
+ """ VNFR dts handler """
+ return self._vnfr_ref_handler
@asyncio.coroutine
def register(self):
@@ -2582,6 +2968,11 @@
for hdl in self._dts_handlers:
yield from hdl.register()
+ def deregister(self):
+ self._log.debug("De-register VNFM project {}".format(self._project.name))
+ for hdl in self._dts_handlers:
+ hdl.deregister()
+
@asyncio.coroutine
def run(self):
""" Run this VNFM instance """
@@ -2589,19 +2980,48 @@
yield from self.register()
def handle_nsr(self, nsr, action):
- if action in [rwdts.QueryAction.CREATE]:
+ if action in [rwdts.QueryAction.CREATE, rwdts.QueryAction.UPDATE]:
self._nsrs[nsr.id] = nsr
elif action == rwdts.QueryAction.DELETE:
if nsr.id in self._nsrs:
del self._nsrs[nsr.id]
- def get_linked_mgmt_network(self, vnfr):
+ def get_nsr_config(self, nsr_id):
+ """
+ Gets the NSR config from the DTS cache.
+ Called in recovery mode only.
+ """
+ if nsr_id in self._nsrs:
+ return self._nsrs[nsr_id]
+
+ if len(self._nsrs):
+ self._log.error("VNFR with id {} not found".format(nsr_id))
+ return None
+
+ curr_cfgs = list(self._nsr_handler.reg.elements)
+ key_map = { getattr(cfg, self._nsr_handler.key_name()): cfg for cfg in curr_cfgs }
+ curr_cfgs = [key_map[key] for key in key_map]
+
+ for cfg in curr_cfgs:
+ self._nsrs[cfg.id] = cfg
+
+ if nsr_id in self._nsrs:
+ return self._nsrs[nsr_id]
+
+ self._log.error("VNFR with id {} not found in DTS cache".format(nsr_id))
+ return None
+
+
+ def get_linked_mgmt_network(self, vnfr, restart_mode=False):
"""For the given VNFR get the related mgmt network from the NSD, if
available.
"""
vnfd_id = vnfr.vnfd.id
nsr_id = vnfr.nsr_id_ref
+ if restart_mode:
+ self._nsrs[nsr_id] = self.get_nsr_config(vnfr.nsr_id_ref)
+
# for the given related VNFR, get the corresponding NSR-config
nsr_obj = None
try:
@@ -2613,7 +3033,13 @@
# network
for vld in nsr_obj.nsd.vld:
if vld.mgmt_network:
- return vld.name
+ for vnfd in vld.vnfd_connection_point_ref:
+ if vnfd.vnfd_id_ref == vnfd_id:
+ if vld.vim_network_name is not None:
+ mgmt_net = vld.vim_network_name
+ else:
+ mgmt_net = self._project.name + "." + nsr_obj.name + "." + vld.name
+ return mgmt_net
return None
@@ -2621,11 +3047,19 @@
""" get VNFR by vnfr id """
if vnfr_id not in self._vnfrs:
- raise VnfRecordError("VNFR id %s not found", vnfr_id)
+ self._log.error("VNFR id {} not found".format(vnfr_id))
+ return None
+ # Returning None to prevent exception here. The caller raises the exception.
+ # raise VnfRecordError("VNFR id %s not found", vnfr_id)
return self._vnfrs[vnfr_id]
- def create_vnfr(self, vnfr):
+ def create_vnfr(self, vnfr, restart_mode=False):
+ # Check if NSR is present. This is a situation where the NS has been deleted before
+ # VNFR Create starts.
+ if vnfr.nsr_id_ref not in self._nsrs:
+ return None
+
""" Create a VNFR instance """
if vnfr.id in self._vnfrs:
msg = "Vnfr id %s already exists" % vnfr.id
@@ -2636,11 +3070,24 @@
vnfr.id,
vnfr.vnfd.id)
- mgmt_network = self.get_linked_mgmt_network(vnfr)
+ try:
+ mgmt_network = self.get_linked_mgmt_network(vnfr, restart_mode)
+ except Exception as e:
+ self._log.exception(e)
+ raise e
+
+ # Identify if we are using Rift RO or external RO
+ external_ro = False
+ nsr = self._nsrs[vnfr.nsr_id_ref]
+ if (nsr.resource_orchestrator and
+ nsr.resource_orchestrator != 'rift'):
+ self._log.debug("VNFR {} using external RO".
+ format(vnfr.name))
+ external_ro = True
self._vnfrs[vnfr.id] = VirtualNetworkFunctionRecord(
- self._dts, self._log, self._loop, self._cluster_name, self, self.vcs_handler, vnfr,
- mgmt_network=mgmt_network
+ self._dts, self._log, self._loop, self._cluster_name, self, vnfr,
+ mgmt_network=mgmt_network, external_ro=external_ro,
)
#Update ref count
@@ -2663,15 +3110,18 @@
self._vnfds_to_vnfr[vnfr.vnfd.id] -= 1
del self._vnfrs[vnfr.vnfr_id]
+ self._deleted_vnfrs.append(vnfr.vnfr_id)
@asyncio.coroutine
def fetch_vnfd(self, vnfd_id):
""" Fetch VNFDs based with the vnfd id"""
- vnfd_path = VirtualNetworkFunctionRecord.vnfd_xpath(vnfd_id)
+ vnfd_path = self._project.add_project(
+ VirtualNetworkFunctionRecord.vnfd_xpath(vnfd_id))
self._log.debug("Fetch vnfd with path %s", vnfd_path)
vnfd = None
- res_iter = yield from self._dts.query_read(vnfd_path, rwdts.XactFlag.MERGE)
+ res_iter = yield from self._dts.query_read(vnfd_path,
+ rwdts.XactFlag.MERGE)
for ent in res_iter:
res = yield from ent
@@ -2716,22 +3166,10 @@
del self._vnfds_to_vnfr[vnfd_id]
- # Remove any files uploaded with VNFD and stored under $RIFT_ARTIFACTS/libs/<id>
- try:
- rift_artifacts_dir = os.environ['RIFT_ARTIFACTS']
- vnfd_dir = os.path.join(rift_artifacts_dir, 'launchpad/libs', vnfd_id)
- if os.path.exists(vnfd_dir):
- shutil.rmtree(vnfd_dir, ignore_errors=True)
- except Exception as e:
- self._log.error("Exception in cleaning up VNFD {}: {}".
- format(self._vnfds_to_vnfr[vnfd_id].vnfd.name, e))
- self._log.exception(e)
-
-
def vnfd_refcount_xpath(self, vnfd_id):
""" xpath for ref count entry """
- return (VnfdRefCountDtsHandler.XPATH +
- "[rw-vnfr:vnfd-id-ref = '{}']").format(vnfd_id)
+ return self._project.add_project(VnfdRefCountDtsHandler.XPATH +
+ "[rw-vnfr:vnfd-id-ref={}]").format(quoted_key(vnfd_id))
@asyncio.coroutine
def get_vnfd_refcount(self, vnfd_id):
@@ -2739,18 +3177,75 @@
vnfd_list = []
if vnfd_id is None or vnfd_id == "":
for vnfd in self._vnfds_to_vnfr.keys():
- vnfd_msg = RwVnfrYang.YangData_Vnfr_VnfrCatalog_VnfdRefCount()
+ vnfd_msg = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_VnfdRefCount()
vnfd_msg.vnfd_id_ref = vnfd
vnfd_msg.instance_ref_count = self._vnfds_to_vnfr[vnfd]
vnfd_list.append((self.vnfd_refcount_xpath(vnfd), vnfd_msg))
elif vnfd_id in self._vnfds_to_vnfr:
- vnfd_msg = RwVnfrYang.YangData_Vnfr_VnfrCatalog_VnfdRefCount()
+ vnfd_msg = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_VnfdRefCount()
vnfd_msg.vnfd_id_ref = vnfd_id
vnfd_msg.instance_ref_count = self._vnfds_to_vnfr[vnfd_id]
vnfd_list.append((self.vnfd_refcount_xpath(vnfd_id), vnfd_msg))
return vnfd_list
+ def add_vlr_id_vnfr_map(self, vlr_id, vnfr):
+ """ Add a mapping for vlr_id into VNFR """
+ self._vnfr_for_vlr[vlr_id] = vnfr
+
+ def remove_vlr_id_vnfr_map(self, vlr_id):
+ """ Remove a mapping for vlr_id into VNFR """
+ del self._vnfr_for_vlr[vlr_id]
+
+ def find_vnfr_for_vlr_id(self, vlr_id):
+ """ Find VNFR for VLR id """
+ vnfr = None
+ if vlr_id in self._vnfr_for_vlr:
+ vnfr = self._vnfr_for_vlr[vlr_id]
+
+ def vlr_event(self, vlr, action):
+ """ VLR event handler """
+ self._log.debug("VnfManager: Received VLR %s with action:%s", vlr, action)
+
+ if vlr.id not in self._vnfr_for_vlr:
+ self._log.warning("VLR %s:%s received for unknown id; %s",
+ vlr.id, vlr.name, vlr)
+ return
+ vnfr = self._vnfr_for_vlr[vlr.id]
+
+ vnfr.vlr_event(vlr, action)
+
+
+class VnfmProject(ManoProject):
+
+ def __init__(self, name, tasklet, **kw):
+ super(VnfmProject, self).__init__(tasklet.log, name)
+ self.update(tasklet)
+
+ self._vnfm = None
+
+ @asyncio.coroutine
+ def register (self):
+ try:
+ vm_parent_name = self._tasklet.tasklet_info.get_parent_vm_parent_instance_name()
+ assert vm_parent_name is not None
+ self._vnfm = VnfManager(self._dts, self.log, self.loop, self, vm_parent_name)
+ yield from self._vnfm.run()
+ except Exception:
+ print("Caught Exception in VNFM init:", sys.exc_info()[0])
+ raise
+
+ def deregister(self):
+ self._log.debug("De-register project {} for VnfmProject".
+ format(self.name))
+ self._vnfm.deregister()
+
+ @asyncio.coroutine
+ def delete_prepare(self):
+ if self._vnfm and self._vnfm._vnfrs:
+ delete_msg = "Project has VNFR associated with it. Delete all Project NSR and try again."
+ return False, delete_msg
+ return True, "True"
class VnfmTasklet(rift.tasklets.Tasklet):
""" VNF Manager tasklet class """
@@ -2760,7 +3255,12 @@
self.rwlog.set_subcategory("vnfm")
self._dts = None
- self._vnfm = None
+ self._project_handler = None
+ self.projects = {}
+
+ @property
+ def dts(self):
+ return self._dts
def start(self):
try:
@@ -2777,7 +3277,7 @@
self.log.debug("Created DTS Api GI Object: %s", self._dts)
except Exception:
- print("Caught Exception in VNFM start:", sys.exc_info()[0])
+ self._log.error("Caught Exception in VNFM start:", sys.exc_info()[0])
raise
def on_instance_started(self):
@@ -2788,20 +3288,15 @@
try:
self._dts.deinit()
except Exception:
- print("Caught Exception in VNFM stop:", sys.exc_info()[0])
+ self._log.error("Caught Exception in VNFM stop:", sys.exc_info()[0])
raise
@asyncio.coroutine
def init(self):
""" Task init callback """
- try:
- vm_parent_name = self.tasklet_info.get_parent_vm_parent_instance_name()
- assert vm_parent_name is not None
- self._vnfm = VnfManager(self._dts, self.log, self.loop, vm_parent_name)
- yield from self._vnfm.run()
- except Exception:
- print("Caught Exception in VNFM init:", sys.exc_info()[0])
- raise
+ self.log.debug("creating project handler")
+ self.project_handler = ProjectHandler(self, VnfmProject)
+ self.project_handler.register()
@asyncio.coroutine
def run(self):
diff --git a/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/subscriber.py b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/subscriber.py
new file mode 100644
index 0000000..8b0da85
--- /dev/null
+++ b/rwlaunchpad/plugins/rwvnfm/rift/tasklets/rwvnfmtasklet/subscriber.py
@@ -0,0 +1,39 @@
+#
+# Copyright 2016 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import rift.mano.dts as mano_dts
+import asyncio
+
+from gi.repository import (
+ RwDts as rwdts,
+ RwTypes,
+ RwVlrYang,
+ RwYang
+ )
+import rift.tasklets
+
+import requests
+
+
+class VlrSubscriberDtsHandler(mano_dts.AbstractOpdataSubscriber):
+ """ VLR DTS handler """
+ XPATH = "D,/vlr:vlr-catalog/vlr:vlr"
+
+ def __init__(self, log, dts, loop, project, callback=None):
+ super().__init__(log, dts, loop, project, callback)
+
+ def get_xpath(self):
+ return ("D,/vlr:vlr-catalog/vlr:vlr")
diff --git a/rwlaunchpad/plugins/rwvns/CMakeLists.txt b/rwlaunchpad/plugins/rwvns/CMakeLists.txt
index b10d81d..6c8bf6d 100644
--- a/rwlaunchpad/plugins/rwvns/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwvns/CMakeLists.txt
@@ -29,7 +29,7 @@
##
# This function creates an install target for the plugin artifacts
##
-rift_install_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py)
+rift_install_gobject_python_plugin(${TASKLET_NAME} ${TASKLET_NAME}.py COMPONENT ${INSTALL_COMPONENT})
# Workaround RIFT-6485 - rpmbuild defaults to python2 for
# anything not in a site-packages directory so we have to
@@ -47,5 +47,5 @@
rift/topmgr/sdnsim.py
rift/tasklets/${TASKLET_NAME}/__init__.py
rift/tasklets/${TASKLET_NAME}/${TASKLET_NAME}.py
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
PYTHON3_ONLY)
diff --git a/rwlaunchpad/plugins/rwvns/rift/tasklets/rwvnstasklet/rwvnstasklet.py b/rwlaunchpad/plugins/rwvns/rift/tasklets/rwvnstasklet/rwvnstasklet.py
index 6ec2421..97ef76c 100755
--- a/rwlaunchpad/plugins/rwvns/rift/tasklets/rwvnstasklet/rwvnstasklet.py
+++ b/rwlaunchpad/plugins/rwvns/rift/tasklets/rwvnstasklet/rwvnstasklet.py
@@ -1,6 +1,6 @@
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -28,12 +28,17 @@
)
import rift.tasklets
+from rift.mano.utils.project import (
+ ManoProject,
+ ProjectHandler,
+)
import rift.mano.sdn
from rift.vlmgr import (
VlrDtsHandler,
VldDtsHandler,
VirtualLinkRecord,
+ VirtualLinkEventListener
)
from rift.topmgr import (
@@ -54,16 +59,17 @@
class SDNAccountHandlers(object):
- def __init__(self, dts, log, log_hdl, acctstore, loop):
+ def __init__(self, dts, log, log_hdl, acctstore, loop, project):
self._log = log
self._log_hdl = log_hdl
self._dts = dts
self._loop = loop
self._acctstore = acctstore
+ self._project = project
self._log.debug("Creating SDN account config handler")
self.sdn_cfg_handler = rift.mano.sdn.SDNAccountConfigSubscriber(
- self._dts, self._log, self._log_hdl,
+ self._dts, self._log, project, self._log_hdl,
rift.mano.sdn.SDNAccountConfigCallbacks(
on_add_apply=self.on_sdn_account_added,
on_delete_apply=self.on_sdn_account_deleted,
@@ -74,7 +80,7 @@
self._log.debug("Creating SDN account opdata handler")
self.sdn_operdata_handler = rift.mano.sdn.SDNAccountDtsOperdataHandler(
- self._dts, self._log, self._loop,
+ self._dts, self._log, self._loop, project,
)
def on_sdn_account_deleted(self, account_name):
@@ -90,21 +96,29 @@
self.sdn_cfg_handler.register()
yield from self.sdn_operdata_handler.register()
+ def deregister(self):
+ self.sdn_cfg_handler.deregister()
+ self.sdn_operdata_handler.deregister()
+
class VnsManager(object):
""" The Virtual Network Service Manager """
- def __init__(self, dts, log, log_hdl, loop):
+ def __init__(self, dts, log, log_hdl, loop, project):
self._dts = dts
self._log = log
self._log_hdl = log_hdl
self._loop = loop
+ self._project = project
self._acctstore = {}
self._vlr_handler = VlrDtsHandler(dts, log, loop, self)
self._vld_handler = VldDtsHandler(dts, log, loop, self)
- self._sdn_handlers = SDNAccountHandlers(dts, log, log_hdl, self._acctstore, loop)
+ self._sdn_handlers = SDNAccountHandlers(dts, log, log_hdl, self._acctstore, loop, self._project)
self._nwtopdata_store = NwtopDataStore(log)
- self._nwtopdiscovery_handler = NwtopDiscoveryDtsHandler(dts, log, loop, self._acctstore, self._nwtopdata_store)
- self._nwtopstatic_handler = NwtopStaticDtsHandler(dts, log, loop, self._acctstore, self._nwtopdata_store)
+ self._nwtopdiscovery_handler = NwtopDiscoveryDtsHandler(dts, log, loop, project,
+ self._acctstore, self._nwtopdata_store)
+ self._nwtopstatic_handler = NwtopStaticDtsHandler(dts, log, loop, project,
+ self._acctstore, self._nwtopdata_store)
+ self._vl_event_listener = VirtualLinkEventListener(dts, log, loop, self)
self._vlrs = {}
@asyncio.coroutine
@@ -138,6 +152,12 @@
yield from self._nwtopdiscovery_handler.register()
@asyncio.coroutine
+ def register_vl_event_listener(self):
+ """ Register Virtual Link related events DTS handler """
+ self._log.debug("Registering Virtual Link Event listener")
+ yield from self._vl_event_listener.register()
+
+ @asyncio.coroutine
def register(self):
""" Register all static DTS handlers"""
yield from self.register_sdn_handlers()
@@ -145,6 +165,15 @@
yield from self.register_vld_handler()
yield from self.register_nwtopstatic_handler()
yield from self.register_nwtopdiscovery_handler()
+ yield from self.register_vl_event_listener()
+
+ def deregister(self):
+ self._vl_event_listener.deregister()
+ self._nwtopdiscovery_handler.deregister()
+ self._nwtopstatic_handler.deregister()
+ self._vld_handler.deregister()
+ self._vlr_handler.deregister()
+ self._sdn_handlers.deregister()
def create_vlr(self, msg):
""" Create VLR """
@@ -160,7 +189,6 @@
self._loop,
self,
msg,
- msg.res_id
)
return self._vlrs[msg.id]
@@ -181,7 +209,7 @@
del self._vlrs[vlr_id]
self._log.info("Deleted virtual link id %s", vlr_id)
- def find_vlr_by_vld_id(self, vld_id):
+ def find_vlR_by_vld_id(self, vld_id):
""" Find a VLR matching the VLD Id """
for vlr in self._vlrs.values():
if vlr.vld_id == vld_id:
@@ -199,18 +227,87 @@
return False
@asyncio.coroutine
- def publish_vlr(self, xact, path, msg):
+ def publish_vlr(self, xact, xpath, msg):
""" Publish a VLR """
+ path = self._project.add_project(xpath)
self._log.debug("Publish vlr called with path %s, msg %s",
path, msg)
yield from self._vlr_handler.update(xact, path, msg)
@asyncio.coroutine
- def unpublish_vlr(self, xact, path):
+ def unpublish_vlr(self, xact, xpath):
""" Publish a VLR """
+ path = self._project.add_project(xpath)
self._log.debug("Unpublish vlr called with path %s", path)
yield from self._vlr_handler.delete(xact, path)
+ def create_virual_link_event(self, event_id, event_msg):
+ """ Update Virtual Link Event """
+ self._log.debug("Creating Virtual Link Event id [%s], msg [%s]",
+ event_id, event_msg)
+
+ @asyncio.coroutine
+ def update_virual_link_event(self, event_id, event_msg):
+ """ Update Virtual Link Event """
+ self._log.debug("Updating Virtual Link Event id [%s], msg [%s]",
+ event_id, event_msg)
+ # event id and vlr_id are the same.
+ # Use event id to look up the VLR and update and publish state change
+ vlr = None
+
+ if event_id in self._vlrs:
+ vlr = self._vlrs[event_id]
+
+ if vlr is None:
+ self._log.error("Received VLR Event notifcation for unknown VLR - event-id:%s",
+ event_id)
+ return
+
+ if event_msg.resource_info.resource_state == 'active':
+ with self._dts.transaction(flags=0) as xact:
+ yield from vlr.ready(event_msg, xact)
+ elif event_msg.resource_info.resource_state == 'failed':
+ with self._dts.transaction(flags=0) as xact:
+ if event_msg.resource_info.resource_errors:
+ vlr._state_failed_reason = str(event_msg.resource_info.resource_errors)
+ yield from vlr.failed(event_msg, xact)
+ else:
+ self._log.warning("Receieved unknown resource state %s for event id %s vlr:%s",
+ event_msg.resource_info.resource_state, event_id, vlr.name)
+
+ def delete_virual_link_event(self, event_id):
+ """ Delete Virtual Link Event """
+ self._log.debug("Deleting Virtual Link Event id [%s]",
+ event_id)
+
+
+class VnsProject(ManoProject):
+
+ def __init__(self, name, tasklet, **kw):
+ super(VnsProject, self).__init__(tasklet.log, name)
+ self.update(tasklet)
+
+ self._vlr_handler = None
+ self._vnsm = None
+ # A mapping of instantiated vlr_id's to VirtualLinkRecord objects
+ self._vlrs = {}
+
+ @asyncio.coroutine
+ def register (self):
+ try:
+ self._vnsm = VnsManager(dts=self._dts,
+ log=self.log,
+ log_hdl=self.log_hdl,
+ loop=self.loop,
+ project=self)
+ yield from self._vnsm.run()
+ except Exception as e:
+ self.log.exception("VNS Task failed to run", e)
+
+ def deregister(self):
+ self._log.debug("De-register project {}".format(self.name))
+ self._vnsm.deregister()
+
class VnsTasklet(rift.tasklets.Tasklet):
""" The VNS tasklet class """
@@ -220,21 +317,25 @@
self.rwlog.set_subcategory("vns")
self._dts = None
- self._vlr_handler = None
+ self._project_handler = None
+ self.projects = {}
- self._vnsm = None
- # A mapping of instantiated vlr_id's to VirtualLinkRecord objects
- self._vlrs = {}
+ @property
+ def dts(self):
+ return self._dts
def start(self):
super(VnsTasklet, self).start()
self.log.info("Starting VnsTasklet")
self.log.debug("Registering with dts")
- self._dts = rift.tasklets.DTS(self.tasklet_info,
- RwVnsYang.get_schema(),
- self.loop,
- self.on_dts_state_change)
+ try:
+ self._dts = rift.tasklets.DTS(self.tasklet_info,
+ RwVnsYang.get_schema(),
+ self.loop,
+ self.on_dts_state_change)
+ except Exception:
+ self.log.exception("Caught Exception in VNS start:", e)
self.log.debug("Created DTS Api GI Object: %s", self._dts)
@@ -252,17 +353,9 @@
@asyncio.coroutine
def init(self):
""" task init callback"""
- self._vnsm = VnsManager(dts=self._dts,
- log=self.log,
- log_hdl=self.log_hdl,
- loop=self.loop)
- yield from self._vnsm.run()
-
- # NSM needs to detect VLD deletion that has active VLR
- # self._vld_handler = VldDescriptorConfigDtsHandler(
- # self._dts, self.log, self.loop, self._vlrs,
- # )
- # yield from self._vld_handler.register()
+ self.log.debug("creating project handler")
+ self.project_handler = ProjectHandler(self, VnsProject)
+ self.project_handler.register()
@asyncio.coroutine
def run(self):
diff --git a/rwlaunchpad/plugins/rwvns/rift/topmgr/rwtopmgr.py b/rwlaunchpad/plugins/rwvns/rift/topmgr/rwtopmgr.py
index af4b75b..f7e0e61 100755
--- a/rwlaunchpad/plugins/rwvns/rift/topmgr/rwtopmgr.py
+++ b/rwlaunchpad/plugins/rwvns/rift/topmgr/rwtopmgr.py
@@ -1,4 +1,3 @@
-
#
# Copyright 2016 RIFT.IO Inc
#
@@ -16,8 +15,8 @@
#
import asyncio
-
import gi
+
gi.require_version('RwDts', '1.0')
gi.require_version('RwcalYang', '1.0')
gi.require_version('RwTypes', '1.0')
@@ -35,16 +34,20 @@
from gi.repository.RwTypes import RwStatus
import rift.tasklets
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
class NwtopDiscoveryDtsHandler(object):
""" Handles DTS interactions for the Discovered Topology registration """
DISC_XPATH = "D,/nd:network"
- def __init__(self, dts, log, loop, acctstore, nwdatastore):
+ def __init__(self, dts, log, loop, project, acctmgr, nwdatastore):
self._dts = dts
self._log = log
self._loop = loop
- self._acctstore = acctstore
+ self._project = project
+ self._acctmgr = acctmgr
self._nwdatastore = nwdatastore
self._regh = None
@@ -54,6 +57,13 @@
""" The registration handle associated with this Handler"""
return self._regh
+ def deregister(self):
+ self._log.debug("De-register Topology discovery handler for project {}".
+ format(self._project.name))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
@asyncio.coroutine
def register(self):
""" Register for the Discovered Topology path """
@@ -93,7 +103,7 @@
nw.server_provided = False
nw.network_id = name + ':' + nw.network_id
self._log.debug("...Network id %s", nw.network_id)
- nw_xpath = ("D,/nd:network[network-id=\'{}\']").format(nw.network_id)
+ nw_xpath = ("D,/nd:network[network-id={}]").format(quoted_key(nw.network_id))
xact_info.respond_xpath(rwdts.XactRspCode.MORE,
nw_xpath, nw)
@@ -108,7 +118,7 @@
on_prepare=on_prepare,
)
- yield from self._dts.register(
+ self._regh = yield from self._dts.register(
NwtopDiscoveryDtsHandler.DISC_XPATH,
flags=rwdts.Flag.PUBLISHER,
handler=handler
@@ -119,11 +129,12 @@
""" Handles DTS interactions for the Static Topology registration """
STATIC_XPATH = "C,/nd:network"
- def __init__(self, dts, log, loop, acctstore, nwdatastore):
+ def __init__(self, dts, log, loop, project, acctmgr, nwdatastore):
self._dts = dts
self._log = log
self._loop = loop
- self._acctstore = acctstore
+ self._project = project
+ self._acctmgr = acctmgr
self._regh = None
self.pending = {}
@@ -133,8 +144,14 @@
def regh(self):
""" The registration handle associated with this Handler"""
return self._regh
-
-
+
+ def deregister(self):
+ self._log.debug("De-register Topology static handler for project {}".
+ format(self._project.name))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
@asyncio.coroutine
def register(self):
""" Register for the Static Topology path """
@@ -173,8 +190,6 @@
on_apply=apply_nw_config)
with self._dts.appconf_group_create(handler=handler) as acg:
- acg.register(xpath = NwtopStaticDtsHandler.STATIC_XPATH,
- flags = rwdts.Flag.SUBSCRIBER,
- on_prepare=prepare_nw_cfg)
-
-
+ self._regh = acg.register(xpath = NwtopStaticDtsHandler.STATIC_XPATH,
+ flags = rwdts.Flag.SUBSCRIBER,
+ on_prepare=prepare_nw_cfg)
diff --git a/rwlaunchpad/plugins/rwvns/rift/topmgr/sdnsim.py b/rwlaunchpad/plugins/rwvns/rift/topmgr/sdnsim.py
index 4a6b93b..b5a4762 100644
--- a/rwlaunchpad/plugins/rwvns/rift/topmgr/sdnsim.py
+++ b/rwlaunchpad/plugins/rwvns/rift/topmgr/sdnsim.py
@@ -15,16 +15,20 @@
# limitations under the License.
#
-from . import core
+import gi
import logging
+from . import core
+
import xml.etree.ElementTree as etree
from gi.repository import RwTopologyYang as RwTl
-import gi
gi.require_version('RwYang', '1.0')
from gi.repository import RwYang
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
logger = logging.getLogger(__name__)
@@ -32,7 +36,7 @@
class SdnSim(core.Topology):
def __init__(self):
super(SdnSim, self).__init__()
- self._model = RwYang.Model.create_libncx()
+ self._model = RwYang.Model.create_libyang()
self._model.load_schema_ypbc(RwTl.get_schema())
def get_network_list(self, account):
@@ -57,7 +61,7 @@
for nw in nwtop.network:
nw.server_provided = False
logger.debug("...Network id %s", nw.network_id)
- #nw_xpath = ("D,/nd:network[network-id=\'{}\']").format(nw.network_id)
+ #nw_xpath = ("D,/nd:network[network-id={}]").format(quoted_key(nw.network_id))
#xact_info.respond_xpath(rwdts.XactRspCode.MORE,
# nw_xpath, nw)
elif 'xml' in topology_source:
diff --git a/rwlaunchpad/plugins/rwvns/rift/vlmgr/__init__.py b/rwlaunchpad/plugins/rwvns/rift/vlmgr/__init__.py
index 2bdb77a..ea1d741 100644
--- a/rwlaunchpad/plugins/rwvns/rift/vlmgr/__init__.py
+++ b/rwlaunchpad/plugins/rwvns/rift/vlmgr/__init__.py
@@ -1,4 +1,4 @@
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +15,12 @@
#
# Author(s): Ravi Chamarty
# Creation Date: 9/2/2015
-#
+#
from .rwvlmgr import (
VirtualLinkRecordState,
VirtualLinkRecord,
VlrDtsHandler,
VldDtsHandler,
+ VirtualLinkEventListener,
)
diff --git a/rwlaunchpad/plugins/rwvns/rift/vlmgr/rwvlmgr.py b/rwlaunchpad/plugins/rwvns/rift/vlmgr/rwvlmgr.py
index bdea4ef..271ed39 100755
--- a/rwlaunchpad/plugins/rwvns/rift/vlmgr/rwvlmgr.py
+++ b/rwlaunchpad/plugins/rwvns/rift/vlmgr/rwvlmgr.py
@@ -1,5 +1,4 @@
-
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,10 +16,10 @@
import asyncio
import enum
-import uuid
-import time
-
import gi
+import time
+import uuid
+
gi.require_version('RwVlrYang', '1.0')
gi.require_version('RwDts', '1.0')
gi.require_version('RwResourceMgrYang', '1.0')
@@ -30,6 +29,8 @@
RwDts as rwdts,
RwResourceMgrYang,
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
import rift.tasklets
@@ -63,29 +64,30 @@
"""
Virtual Link Record object
"""
- def __init__(self, dts, log, loop, vnsm, vlr_msg, req_id=None):
+ def __init__(self, dts, log, loop, vnsm, vlr_msg):
self._dts = dts
self._log = log
self._loop = loop
self._vnsm = vnsm
self._vlr_msg = vlr_msg
+ self._vlr_id = self._vlr_msg.id
+ self._project = vnsm._project
self._network_id = None
self._network_pool = None
self._assigned_subnet = None
+ self._virtual_cps = list()
self._create_time = int(time.time())
- if req_id == None:
- self._request_id = str(uuid.uuid4())
- else:
- self._request_id = req_id
self._state = VirtualLinkRecordState.INIT
self._state_failed_reason = None
+ self._name = self._vlr_msg.name
@property
def vld_xpath(self):
""" VLD xpath associated with this VLR record """
- return "C,/vld:vld-catalog/vld:vld[id='{}']".format(self.vld_id)
+ return self._project.add_project("C,/vld:vld-catalog/vld:vld[id={}]".
+ format(quoted_key(self.vld_id)))
@property
def vld_id(self):
@@ -95,29 +97,34 @@
@property
def vlr_id(self):
""" VLR id associated with this VLR record """
- return self._vlr_msg.id
+ return self._vlr_id
@property
def xpath(self):
""" path for this VLR """
- return("D,/vlr:vlr-catalog"
- "/vlr:vlr[vlr:id='{}']".format(self.vlr_id))
+ return self._project.add_project("D,/vlr:vlr-catalog"
+ "/vlr:vlr[vlr:id={}]".format(quoted_key(self.vlr_id)))
@property
def name(self):
""" Name of this VLR """
- return self._vlr_msg.name
+ return self._name
@property
- def cloud_account_name(self):
- """ Cloud Account to instantiate the virtual link on """
- return self._vlr_msg.cloud_account
+ def datacenter(self):
+ """ RO Account to instantiate the virtual link on """
+ return self._vlr_msg.datacenter
+
+ @property
+ def event_id(self):
+ """ Event Identifier for this virtual link """
+ return self._vlr_id
@property
def resmgr_path(self):
""" path for resource-mgr"""
- return ("D,/rw-resource-mgr:resource-mgmt" +
- "/vlink-event/vlink-event-data[event-id='{}']".format(self._request_id))
+ return self._project.add_project("D,/rw-resource-mgr:resource-mgmt" +
+ "/vlink-event/vlink-event-data[event-id={}]".format(quoted_key(self.event_id)))
@property
def operational_status(self):
@@ -135,7 +142,7 @@
@property
def msg(self):
""" VLR message for this VLR """
- msg = RwVlrYang.YangData_Vlr_VlrCatalog_Vlr()
+ msg = RwVlrYang.YangData_RwProject_Project_VlrCatalog_Vlr()
msg.copy_from(self._vlr_msg)
if self._network_id is not None:
@@ -147,18 +154,25 @@
if self._assigned_subnet is not None:
msg.assigned_subnet = self._assigned_subnet
+ if self._virtual_cps:
+ for cp in msg.virtual_connection_points:
+ for vcp in self._virtual_cps:
+ if cp.name == vcp['name']:
+ cp.ip_address = vcp['ip_address']
+ cp.mac_address = vcp['mac_address']
+ cp.connection_point_id = vcp['connection_point_id']
+ break
msg.operational_status = self.operational_status
msg.operational_status_details = self._state_failed_reason
- msg.res_id = self._request_id
-
+ msg.res_id = self.event_id
return msg
@property
def resmgr_msg(self):
""" VLR message for this VLR """
- msg = RwResourceMgrYang.VirtualLinkEventData()
- msg.event_id = self._request_id
- msg.cloud_account = self.cloud_account_name
+ msg = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData()
+ msg.event_id = self.event_id
+ msg.cloud_account = self.datacenter
msg.request_info.name = self.name
msg.request_info.vim_network_name = self._vlr_msg.vim_network_name
msg.request_info.provider_network.from_dict(
@@ -167,24 +181,32 @@
if self._vlr_msg.has_field('ip_profile_params'):
msg.request_info.ip_profile_params.from_dict(self._vlr_msg.ip_profile_params.as_dict())
+ for cp in self._vlr_msg.virtual_connection_points:
+ vcp = msg.request_info.virtual_cps.add()
+ vcp.from_dict({k:v for k,v in cp.as_dict().items()
+ if k in ['name','port_security_enabled','type_yang']})
+ if (self._vlr_msg.has_field('ip_profile_params')) and (self._vlr_msg.ip_profile_params.has_field('security_group')):
+ vcp.security_group = self._vlr_msg.ip_profile_params.security_group
+
return msg
@asyncio.coroutine
def create_network(self, xact):
""" Create network for this VL """
- self._log.debug("Creating network req-id: %s", self._request_id)
- return (yield from self.request_network(xact, "create"))
+ self._log.debug("Creating network event-id: %s:%s", self.event_id, self._vlr_msg)
+ network_rsp = yield from self.request_network(xact, "create")
+ return network_rsp
@asyncio.coroutine
def delete_network(self, xact):
""" Delete network for this VL """
- self._log.debug("Deleting network - req-id: %s", self._request_id)
+ self._log.debug("Deleting network - event-id: %s", self.event_id)
return (yield from self.request_network(xact, "delete"))
@asyncio.coroutine
def read_network(self, xact):
""" Read network for this VL """
- self._log.debug("Reading network - req-id: %s", self._request_id)
+ self._log.debug("Reading network - event-id: %s", self.event_id)
return (yield from self.request_network(xact, "read"))
@asyncio.coroutine
@@ -199,8 +221,7 @@
block.add_query_create(self.resmgr_path, self.resmgr_msg)
elif action == "delete":
self._log.debug("Deleting network path:%s", self.resmgr_path)
- if self.resmgr_msg.request_info.name != "multisite":
- block.add_query_delete(self.resmgr_path)
+ block.add_query_delete(self.resmgr_path)
elif action == "read":
self._log.debug("Reading network path:%s", self.resmgr_path)
block.add_query_read(self.resmgr_path)
@@ -222,8 +243,7 @@
if resp.has_field('resource_info') and resp.resource_info.resource_state == "failed":
raise NetworkResourceError(resp.resource_info.resource_errors)
- if not (resp.has_field('resource_info') and
- resp.resource_info.has_field('virtual_link_id')):
+ if not resp.has_field('resource_info') :
raise NetworkResourceError("Did not get a valid network resource response (resp: %s)", resp)
self._log.debug("Got network request response: %s", resp)
@@ -240,29 +260,70 @@
try:
self._state = VirtualLinkRecordState.RESOURCE_ALLOC_PENDING
+ network_rsp = None
if restart == 0:
network_resp = yield from self.create_network(xact)
else:
network_resp = yield from self.read_network(xact)
if network_resp == None:
- network_resp = yield from self.create_network(xact)
+ network_resp = yield from self.create_network(xact)
- # Note network_resp.virtual_link_id is CAL assigned network_id.
+ if network_resp:
+ self._state = self.vl_state_from_network_resp(network_resp)
- self._network_id = network_resp.resource_info.virtual_link_id
- self._network_pool = network_resp.resource_info.pool_name
- self._assigned_subnet = network_resp.resource_info.subnet
-
- self._state = VirtualLinkRecordState.READY
-
- yield from self.publish(xact)
-
+ if self._state == VirtualLinkRecordState.READY:
+ # Move this VL into ready state
+ yield from self.ready(network_resp, xact)
+ else:
+ yield from self.publish(xact)
except Exception as e:
self._log.error("Instantiatiation of VLR record failed: %s", str(e))
self._state = VirtualLinkRecordState.FAILED
self._state_failed_reason = str(e)
yield from self.publish(xact)
+ def vl_state_from_network_resp(self, network_resp):
+ """ Determine VL state from network response """
+ if network_resp.resource_info.resource_state == 'pending':
+ return VirtualLinkRecordState.RESOURCE_ALLOC_PENDING
+ elif network_resp.resource_info.resource_state == 'active':
+ return VirtualLinkRecordState.READY
+ elif network_resp.resource_info.resource_state == 'failed':
+ return VirtualLinkRecordState.FAILED
+ return VirtualLinkRecordState.RESOURCE_ALLOC_PENDING
+
+ @asyncio.coroutine
+ def ready(self, event_resp, xact):
+ """ This virtual link is ready """
+ # Note network_resp.virtual_link_id is CAL assigned network_id.
+ self._log.debug("Virtual Link id %s name %s in ready state, event_rsp:%s",
+ self.vlr_id,
+ self.name,
+ event_resp)
+ self._network_id = event_resp.resource_info.virtual_link_id
+ self._network_pool = event_resp.resource_info.pool_name
+ self._assigned_subnet = event_resp.resource_info.subnet
+ self._virtual_cps = [ vcp.as_dict()
+ for vcp in event_resp.resource_info.virtual_connection_points ]
+
+ yield from self.publish(xact)
+
+ self._state = VirtualLinkRecordState.READY
+
+ yield from self.publish(xact)
+
+ @asyncio.coroutine
+ def failed(self, event_resp, xact):
+ """ This virtual link Failed """
+ self._log.debug("Virtual Link id %s name %s failed to instantiate, event_rsp:%s",
+ self.vlr_id,
+ self.name,
+ event_resp)
+
+ self._state = VirtualLinkRecordState.FAILED
+
+ yield from self.publish(xact)
+
@asyncio.coroutine
def publish(self, xact):
""" publish this VLR """
@@ -313,6 +374,7 @@
self._vnsm = vnsm
self._regh = None
+ self._project = vnsm._project
@property
def regh(self):
@@ -322,11 +384,6 @@
@asyncio.coroutine
def register(self):
""" Register for the VLR path """
- def on_commit(xact_info):
- """ The transaction has been committed """
- self._log.debug("Got vlr commit (xact_info: %s)", xact_info)
-
- return rwdts.MemberRspCode.ACTION_OK
@asyncio.coroutine
def on_event(dts, g_reg, xact, xact_event, scratch_data):
@@ -369,7 +426,7 @@
return
elif action == rwdts.QueryAction.DELETE:
# Delete an VLR record
- schema = RwVlrYang.YangData_Vlr_VlrCatalog_Vlr.schema()
+ schema = RwVlrYang.YangData_RwProject_Project_VlrCatalog_Vlr.schema()
path_entry = schema.keyspec_to_entry(ks_path)
self._log.debug("Terminating VLR id %s", path_entry.key00.id)
yield from self._vnsm.delete_vlr(path_entry.key00.id, xact_info.xact)
@@ -379,26 +436,32 @@
xact_info.respond_xpath(rwdts.XactRspCode.ACK)
return
- self._log.debug("Registering for VLR using xpath: %s",
- VlrDtsHandler.XPATH)
+ xpath = self._project.add_project(VlrDtsHandler.XPATH)
+ self._log.debug("Registering for VLR using xpath: {}".
+ format(xpath))
- reg_handle = rift.tasklets.DTS.RegistrationHandler(
- on_commit=on_commit,
- on_prepare=on_prepare,
- )
+ reg_handle = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare,)
handlers = rift.tasklets.Group.Handler(on_event=on_event,)
with self._dts.group_create(handler=handlers) as group:
self._regh = group.register(
- xpath=VlrDtsHandler.XPATH,
+ xpath=xpath,
handler=reg_handle,
flags=rwdts.Flag.PUBLISHER | rwdts.Flag.NO_PREP_READ| rwdts.Flag.DATASTORE,
)
+ def deregister(self):
+ self._log.debug("De-register VLR handler for project {}".
+ format(self._project.name))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
@asyncio.coroutine
- def create(self, xact, path, msg):
+ def create(self, xact, xpath, msg):
"""
Create a VLR record in DTS with path and message
"""
+ path = self._project.add_project(xpath)
self._log.debug("Creating VLR xact = %s, %s:%s",
xact, path, msg)
self.regh.create_element(path, msg)
@@ -406,10 +469,11 @@
xact, path, msg)
@asyncio.coroutine
- def update(self, xact, path, msg):
+ def update(self, xact, xpath, msg):
"""
Update a VLR record in DTS with path and message
"""
+ path = self._project.add_project(xpath)
self._log.debug("Updating VLR xact = %s, %s:%s",
xact, path, msg)
self.regh.update_element(path, msg)
@@ -417,10 +481,11 @@
xact, path, msg)
@asyncio.coroutine
- def delete(self, xact, path):
+ def delete(self, xact, xpath):
"""
Delete a VLR record in DTS with path and message
"""
+ path = self._project.add_project(xpath)
self._log.debug("Deleting VLR xact = %s, %s", xact, path)
self.regh.delete_element(path)
self._log.debug("Deleted VLR xact = %s, %s", xact, path)
@@ -453,8 +518,13 @@
"Got on prepare for VLD update (ks_path: %s) (action: %s)",
ks_path.to_xpath(VldYang.get_schema()), msg)
- schema = VldYang.YangData_Vld_VldCatalog_Vld.schema()
+ schema = VldYang.YangData_RwProject_Project_VldCatalog_Vld.schema()
path_entry = schema.keyspec_to_entry(ks_path)
+ # TODO: Check why on project delete this gets called
+ if not path_entry:
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+ return
+
vld_id = path_entry.key00.id
disabled_actions = [rwdts.QueryAction.DELETE, rwdts.QueryAction.UPDATE]
@@ -476,8 +546,75 @@
handler = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare)
- yield from self._dts.register(
- VldDtsHandler.XPATH,
+ self._regh = yield from self._dts.register(
+ self._vnsm._project.add_project(VldDtsHandler.XPATH),
flags=rwdts.Flag.SUBSCRIBER,
handler=handler
)
+
+ def deregister(self):
+ self._log.debug("De-register VLD handler for project {}".
+ format(self._vnsm._project.name))
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
+
+class VirtualLinkEventListener(object):
+ """ DTS Listener to listen on Virtual Link related events """
+ XPATH = "D,/rw-resource-mgr:resource-mgmt/vlink-event/vlink-event-data"
+ def __init__(self, dts, log, loop, vnsm):
+ self._dts = dts
+ self._log = log
+ self._loop = loop
+ self._vnsm = vnsm
+ self._regh = None
+
+ @property
+ def regh(self):
+ """ The registration handle assocaited with this Handler"""
+ return self._regh
+
+ def event_id_from_keyspec(self, ks):
+ """ Get the event id from the keyspec """
+ event_pe = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData.schema().keyspec_to_entry(ks)
+ try:
+ # Can get just path without event id when
+ # deleting project
+ event_id = event_pe.key00.event_id
+ except AttributeError:
+ return None
+ return event_id
+
+ @asyncio.coroutine
+ def register(self):
+ """ Register the Virtual Link Event path """
+ @asyncio.coroutine
+ def on_prepare(xact_info, query_action, ks_path, msg):
+ """ prepare callback on Virtual Link Events """
+ try:
+ self._log.debug(
+ "Got on prepare for Virtual Link Event id (ks_path: %s) (msg: %s)",
+ ks_path.to_xpath(RwResourceMgrYang.get_schema()), msg)
+ event_id = self.event_id_from_keyspec(ks_path)
+ if event_id:
+ if query_action == rwdts.QueryAction.CREATE or query_action == rwdts.QueryAction.UPDATE:
+ yield from self._vnsm.update_virual_link_event(event_id, msg)
+ elif query_action == rwdts.QueryAction.DELETE:
+ self._vnsm.delete_virual_link_event(event_id)
+ except Exception as e:
+ self._log.exception("Caught execption in Virtual Link Event handler", e)
+
+ xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+
+ handler = rift.tasklets.DTS.RegistrationHandler(on_prepare=on_prepare)
+
+ self._regh = yield from self._dts.register(
+ self._vnsm._project.add_project(VirtualLinkEventListener.XPATH),
+ flags=rwdts.Flag.SUBSCRIBER,
+ handler=handler
+ )
+
+ def deregister(self):
+ if self._regh:
+ self._regh.deregister()
+ self._regh = None
diff --git a/rwlaunchpad/plugins/rwvns/test/create_stackedProvNettopology.py b/rwlaunchpad/plugins/rwvns/test/create_stackedProvNettopology.py
index 86638f4..9dab8c2 100644
--- a/rwlaunchpad/plugins/rwvns/test/create_stackedProvNettopology.py
+++ b/rwlaunchpad/plugins/rwvns/test/create_stackedProvNettopology.py
@@ -287,7 +287,7 @@
if __name__ == "__main__":
- model = RwYang.Model.create_libncx()
+ model = RwYang.Model.create_libyang()
model.load_schema_ypbc(RwTl.get_schema())
# create logger
logger = logging.getLogger('Provider Network Topology')
diff --git a/rwlaunchpad/plugins/rwvns/test/create_stackedSfctopology.py b/rwlaunchpad/plugins/rwvns/test/create_stackedSfctopology.py
index a27a0b9..67b0f8e 100644
--- a/rwlaunchpad/plugins/rwvns/test/create_stackedSfctopology.py
+++ b/rwlaunchpad/plugins/rwvns/test/create_stackedSfctopology.py
@@ -223,7 +223,7 @@
if __name__ == "__main__":
- model = RwYang.Model.create_libncx()
+ model = RwYang.Model.create_libyang()
model.load_schema_ypbc(RwTl.get_schema())
# create logger
logger = logging.getLogger('SFC Network Topology')
diff --git a/rwlaunchpad/plugins/rwvns/test/create_stackedVMNettopology.py b/rwlaunchpad/plugins/rwvns/test/create_stackedVMNettopology.py
index 99f5898..6de02a7 100644
--- a/rwlaunchpad/plugins/rwvns/test/create_stackedVMNettopology.py
+++ b/rwlaunchpad/plugins/rwvns/test/create_stackedVMNettopology.py
@@ -283,7 +283,7 @@
if __name__ == "__main__":
- model = RwYang.Model.create_libncx()
+ model = RwYang.Model.create_libyang()
model.load_schema_ypbc(RwTl.get_schema())
# create logger
logger = logging.getLogger('VM Network Topology')
diff --git a/rwlaunchpad/plugins/rwvns/test/create_stackedl2topology.py b/rwlaunchpad/plugins/rwvns/test/create_stackedl2topology.py
index 3ae3e80..c232079 100644
--- a/rwlaunchpad/plugins/rwvns/test/create_stackedl2topology.py
+++ b/rwlaunchpad/plugins/rwvns/test/create_stackedl2topology.py
@@ -224,7 +224,7 @@
outf.write(line)
if __name__ == "__main__":
- model = RwYang.Model.create_libncx()
+ model = RwYang.Model.create_libyang()
model.load_schema_ypbc(RwTl.get_schema())
# create logger
logger = logging.getLogger(__file__)
diff --git a/rwlaunchpad/plugins/rwvns/test/test_sdn_mock.py b/rwlaunchpad/plugins/rwvns/test/test_sdn_mock.py
index 6121747..d0c1d48 100644
--- a/rwlaunchpad/plugins/rwvns/test/test_sdn_mock.py
+++ b/rwlaunchpad/plugins/rwvns/test/test_sdn_mock.py
@@ -35,9 +35,9 @@
def get_sdn_account():
"""
- Creates an object for class RwsdnalYang.SdnAccount()
+ Creates an object for class RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
"""
- account = RwsdnalYang.SDNAccount()
+ account = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
account.account_type = "mock"
account.mock.username = "rift"
account.mock.plugin_name = "rwsdn_mock"
diff --git a/rwlaunchpad/plugins/rwvns/test/test_sdn_odl.py b/rwlaunchpad/plugins/rwvns/test/test_sdn_odl.py
index b4dda0e..07355f4 100644
--- a/rwlaunchpad/plugins/rwvns/test/test_sdn_odl.py
+++ b/rwlaunchpad/plugins/rwvns/test/test_sdn_odl.py
@@ -38,9 +38,9 @@
def get_sdn_account():
"""
- Creates an object for class RwsdnalYang.SdnAccount()
+ Creates an object for class RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
"""
- account = RwsdnalYang.SDNAccount()
+ account = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
account.name = "grunt27"
account.account_type = "odl"
account.odl.plugin_name = "rwsdn_odl"
diff --git a/rwlaunchpad/plugins/rwvns/test/test_sdn_openstack.py b/rwlaunchpad/plugins/rwvns/test/test_sdn_openstack.py
index 05fc3f7..4586a37 100644
--- a/rwlaunchpad/plugins/rwvns/test/test_sdn_openstack.py
+++ b/rwlaunchpad/plugins/rwvns/test/test_sdn_openstack.py
@@ -41,9 +41,9 @@
def get_sdn_account():
"""
- Creates an object for class RwsdnalYang.SdnAccount()
+ Creates an object for class RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
"""
- account = RwsdnalYang.SDNAccount()
+ account = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
account.name = "grunt17"
account.account_type = "openstack"
account.openstack.plugin_name = "rwsdn_openstack"
diff --git a/rwlaunchpad/plugins/rwvns/test/test_sdn_sim.py b/rwlaunchpad/plugins/rwvns/test/test_sdn_sim.py
index e9cd0b3..e23bd49 100644
--- a/rwlaunchpad/plugins/rwvns/test/test_sdn_sim.py
+++ b/rwlaunchpad/plugins/rwvns/test/test_sdn_sim.py
@@ -31,9 +31,9 @@
def get_sdn_account():
"""
- Creates an object for class RwsdnalYang.SdnAccount()
+ Creates an object for class RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
"""
- account = RwsdnalYang.SDNAccount()
+ account = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
account.account_type = "sdnsim"
account.sdnsim.username = "rift"
account.sdnsim.plugin_name = "rwsdn_sim"
diff --git a/rwlaunchpad/plugins/rwvns/vala/CMakeLists.txt b/rwlaunchpad/plugins/rwvns/vala/CMakeLists.txt
index 8f87f66..5dc7b91 100644
--- a/rwlaunchpad/plugins/rwvns/vala/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwvns/vala/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
rw_log_yang-1.0 rw_base_yang-1.0 rwcal_yang-1.0 rwsdnal_yang-1.0 rw_manifest_yang-1.0 protobuf_c-1.0 ietf_netconf_yang-1.0
ietf_network_yang-1.0 ietf_network_topology_yang-1.0
ietf_l2_topology_yang-1.0 rw_topology_yang-1.0
- rw_log-1.0
+ rw_log-1.0 rw_project_yang-1.0 rw_user_yang-1.0 rw_rbac_base_yang-1.0
VAPI_DIRS
${RIFT_SUBMODULE_BINARY_ROOT}/models/plugins/yang
${RIFT_SUBMODULE_BINARY_ROOT}/rwcal/plugins/yang
@@ -50,7 +50,7 @@
GENERATE_VAPI_FILE ${VALA_LONG_NAME}.vapi
GENERATE_GIR_FILE ${VALA_TYPELIB_PREFIX}.gir
GENERATE_TYPELIB_FILE ${VALA_TYPELIB_PREFIX}.typelib
- DEPENDS rwcal_yang rwsdnal_yang mano_yang rwlog_gi rwschema_yang
+ DEPENDS rwcal_yang rwsdnal_yang mano_yang rwlog_gi rwschema_yang rwproject_yang
)
rift_install_vala_artifacts(
@@ -59,7 +59,7 @@
VAPI_FILES ${VALA_LONG_NAME}.vapi
GIR_FILES ${VALA_TYPELIB_PREFIX}.gir
TYPELIB_FILES ${VALA_TYPELIB_PREFIX}.typelib
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
DEST_PREFIX .
)
diff --git a/rwlaunchpad/plugins/rwvns/vala/rwsdn-python/CMakeLists.txt b/rwlaunchpad/plugins/rwvns/vala/rwsdn-python/CMakeLists.txt
index f8d8a71..30334a8 100644
--- a/rwlaunchpad/plugins/rwvns/vala/rwsdn-python/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwvns/vala/rwsdn-python/CMakeLists.txt
@@ -17,4 +17,4 @@
include(rift_plugin)
-rift_install_python_plugin(rwsdn-plugin rwsdn-plugin.py)
+rift_install_gobject_python_plugin(rwsdn-plugin rwsdn-plugin.py COMPONENT ${INSTALL_COMPONENT})
diff --git a/rwlaunchpad/plugins/rwvns/vala/rwsdn.vala b/rwlaunchpad/plugins/rwvns/vala/rwsdn.vala
index a4d597d..527b255 100644
--- a/rwlaunchpad/plugins/rwvns/vala/rwsdn.vala
+++ b/rwlaunchpad/plugins/rwvns/vala/rwsdn.vala
@@ -10,8 +10,8 @@
* Credential Validation related APIs
*/
public abstract RwTypes.RwStatus validate_sdn_creds(
- Rwsdnal.SDNAccount account,
- out Rwsdnal.SdnConnectionStatus status);
+ Rwsdnal.YangData_RwProject_Project_SdnAccounts_SdnAccountList account,
+ out Rwsdnal.YangData_RwProject_Project_SdnAccounts_SdnAccountList_ConnectionStatus status);
/*
* Configuring related APIs
@@ -22,22 +22,22 @@
* Network related APIs
*/
public abstract RwTypes.RwStatus get_network_list(
- Rwsdnal.SDNAccount account,
+ Rwsdnal.YangData_RwProject_Project_SdnAccounts_SdnAccountList account,
out RwTopology.YangData_IetfNetwork network_topology);
/*
* VNFFG Chain related APIs
*/
public abstract RwTypes.RwStatus create_vnffg_chain(
- Rwsdnal.SDNAccount account,
- Rwsdnal.VNFFGChain vnffg_chain,
+ Rwsdnal.YangData_RwProject_Project_SdnAccounts_SdnAccountList account,
+ Rwsdnal.YangData_RwProject_Project_Vnffgs_VnffgChain vnffg_chain,
out string vnffg_id);
/*
* VNFFG Chain Terminate related APIs
*/
public abstract RwTypes.RwStatus terminate_vnffg_chain(
- Rwsdnal.SDNAccount account,
+ Rwsdnal.YangData_RwProject_Project_SdnAccounts_SdnAccountList account,
string vnffg_id);
@@ -45,23 +45,25 @@
* Network related APIs
*/
public abstract RwTypes.RwStatus get_vnffg_rendered_paths(
- Rwsdnal.SDNAccount account,
- out Rwsdnal.VNFFGRenderedPaths rendered_paths);
+ Rwsdnal.YangData_RwProject_Project_SdnAccounts_SdnAccountList account,
+ out Rwsdnal.YangData_RwProject_Project_VnffgRenderedPaths rendered_paths);
/*
* Classifier related APIs
*/
public abstract RwTypes.RwStatus create_vnffg_classifier(
- Rwsdnal.SDNAccount account,
- Rwsdnal.VNFFGClassifier vnffg_classifier,
- out string vnffg_classifier_id);
+ Rwsdnal.YangData_RwProject_Project_SdnAccounts_SdnAccountList account,
+ Rwsdnal.YangData_RwProject_Project_VnffgClassifiers vnffg_classifier,
+ [CCode (array_length = false, array_null_terminated = true)]
+ out string [] vnffg_classifier_id);
/*
* Classifier related APIs
*/
public abstract RwTypes.RwStatus terminate_vnffg_classifier(
- Rwsdnal.SDNAccount account,
- string vnffg_classifier_id);
+ Rwsdnal.YangData_RwProject_Project_SdnAccounts_SdnAccountList account,
+ [CCode (array_length = false, array_null_terminated = true)]
+ string [] vnffg_classifier_id);
diff --git a/rwlaunchpad/plugins/rwvns/vala/rwsdn_mock/CMakeLists.txt b/rwlaunchpad/plugins/rwvns/vala/rwsdn_mock/CMakeLists.txt
index 357e2ab..e15b64a 100644
--- a/rwlaunchpad/plugins/rwvns/vala/rwsdn_mock/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwvns/vala/rwsdn_mock/CMakeLists.txt
@@ -17,4 +17,4 @@
include(rift_plugin)
-rift_install_python_plugin(rwsdn_mock rwsdn_mock.py)
+rift_install_gobject_python_plugin(rwsdn_mock rwsdn_mock.py COMPONENT ${INSTALL_COMPONENT})
diff --git a/rwlaunchpad/plugins/rwvns/vala/rwsdn_mock/rwsdn_mock.py b/rwlaunchpad/plugins/rwvns/vala/rwsdn_mock/rwsdn_mock.py
index fc0d86e..1d9264d 100644
--- a/rwlaunchpad/plugins/rwvns/vala/rwsdn_mock/rwsdn_mock.py
+++ b/rwlaunchpad/plugins/rwvns/vala/rwsdn_mock/rwsdn_mock.py
@@ -144,7 +144,7 @@
)
)
- account = RwsdnalYang.SDNAccount()
+ account = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList()
account.name = 'mock'
account.account_type = 'mock'
account.mock.username = 'rift'
diff --git a/rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/CMakeLists.txt b/rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/CMakeLists.txt
index 239f971..d54138e 100644
--- a/rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/CMakeLists.txt
@@ -17,4 +17,4 @@
include(rift_plugin)
-rift_install_python_plugin(rwsdn_odl rwsdn_odl.py)
+rift_install_gobject_python_plugin(rwsdn_odl rwsdn_odl.py COMPONENT ${INSTALL_COMPONENT})
diff --git a/rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/rwsdn_odl.py b/rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/rwsdn_odl.py
index 2727d8a..6e97543 100644
--- a/rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/rwsdn_odl.py
+++ b/rwlaunchpad/plugins/rwvns/vala/rwsdn_odl/rwsdn_odl.py
@@ -156,8 +156,10 @@
@param account - a SDN account
"""
+ classifier_list = list()
classifier_name = self.sdnodl.create_sfc_classifier(account,vnffg_classifier)
- return classifier_name
+ classifier_list.append(classifier_name)
+ return classifier_list
@rwstatus(ret_on_failure=[None])
def do_terminate_vnffg_classifier(self, account, vnffg_classifier_name):
@@ -336,7 +338,7 @@
"""
Validate the SDN account credentials by accessing the rest API using the provided credentials
"""
- status = RwsdnalYang.SdnConnectionStatus()
+ status = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList_ConnectionStatus()
url = '{}/{}'.format(account.odl.url,"restconf")
try:
r=requests.get(url,auth=(account.odl.username,account.odl.password))
@@ -934,7 +936,7 @@
self.delete_all_sf(account)
def _fill_rsp_list(self,sfc_rsp_list,sff_list):
- vnffg_rsps = RwsdnalYang.VNFFGRenderedPaths()
+ vnffg_rsps = RwsdnalYang.YangData_RwProject_Project_VnffgRenderedPaths()
for sfc_rsp in sfc_rsp_list['rendered-service-paths']['rendered-service-path']:
rsp = vnffg_rsps.vnffg_rendered_path.add()
rsp.name = sfc_rsp['name']
diff --git a/rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/CMakeLists.txt b/rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/CMakeLists.txt
index fcf944f..285d58b 100644
--- a/rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/CMakeLists.txt
@@ -17,4 +17,4 @@
include(rift_plugin)
-rift_install_python_plugin(rwsdn_openstack rwsdn_openstack.py)
+rift_install_gobject_python_plugin(rwsdn_openstack rwsdn_openstack.py COMPONENT ${INSTALL_COMPONENT})
diff --git a/rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/rwsdn_openstack.py b/rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/rwsdn_openstack.py
index a9ff983..ee4e63b 100644
--- a/rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/rwsdn_openstack.py
+++ b/rwlaunchpad/plugins/rwvns/vala/rwsdn_openstack/rwsdn_openstack.py
@@ -94,7 +94,9 @@
cert_validate = kwargs['cert_validate'] if 'cert_validate' in kwargs else False
region = kwargs['region_name'] if 'region_name' in kwargs else False
- discover = ks_drv.KeystoneVersionDiscover(kwargs['auth_url'], logger = self.log)
+ discover = ks_drv.KeystoneVersionDiscover(kwargs['auth_url'],
+ cert_validate,
+ logger = self.log)
(major, minor) = discover.get_version()
self.sess_drv = sess_drv.SessionDriver(auth_method = 'password',
@@ -112,7 +114,7 @@
logger = self.log)
def validate_account_creds(self):
- status = RwsdnalYang.SdnConnectionStatus()
+ status = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList_ConnectionStatus()
try:
self.sess_drv.invalidate_auth_token()
self.sess_drv.auth_token
@@ -279,7 +281,7 @@
Returns:
Validation Code and Details String
"""
- status = RwsdnalYang.SdnConnectionStatus()
+ status = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList_ConnectionStatus()
try:
drv = self._use_driver(account)
drv.validate_account_creds()
@@ -322,7 +324,7 @@
else:
prev_vm_id = path.vnfr_ids[0].vdu_list[0].vm_id
port_list.append((path.vnfr_ids[0].vdu_list[0].port_id, path.vnfr_ids[0].vdu_list[0].port_id))
- vnffg_id = drv.create_port_chain(vnffg.name, port_list)
+ vnffg_id = drv.portchain_drv.create_port_chain(vnffg.name, port_list)
return vnffg_id
@rwstatus
@@ -390,7 +392,7 @@
@param account - a SDN account
"""
self.log.debug('Received get VNFFG rendered path for account %s ', account)
- vnffg_rsps = RwsdnalYang.VNFFGRenderedPaths()
+ vnffg_rsps = RwsdnalYang.YangData_RwProject_Project_VnffgRenderedPaths()
drv = self._use_driver(account)
port_chain_list = drv.get_port_chain_list()
for port_chain in port_chain_list:
diff --git a/rwlaunchpad/plugins/rwvns/vala/rwsdn_sim/CMakeLists.txt b/rwlaunchpad/plugins/rwvns/vala/rwsdn_sim/CMakeLists.txt
index 90e06b4..0580424 100644
--- a/rwlaunchpad/plugins/rwvns/vala/rwsdn_sim/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwvns/vala/rwsdn_sim/CMakeLists.txt
@@ -17,4 +17,4 @@
include(rift_plugin)
-rift_install_python_plugin(rwsdn_sim rwsdn_sim.py)
+rift_install_gobject_python_plugin(rwsdn_sim rwsdn_sim.py COMPONENT ${INSTALL_COMPONENT})
diff --git a/rwlaunchpad/plugins/rwvns/vala/rwsdn_sim/rwsdn_sim.py b/rwlaunchpad/plugins/rwvns/vala/rwsdn_sim/rwsdn_sim.py
index 164aa03..c880516 100644
--- a/rwlaunchpad/plugins/rwvns/vala/rwsdn_sim/rwsdn_sim.py
+++ b/rwlaunchpad/plugins/rwvns/vala/rwsdn_sim/rwsdn_sim.py
@@ -91,7 +91,7 @@
Returns:
Validation Code and Details String
"""
- status = RwsdnalYang.SdnConnectionStatus()
+ status = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList_ConnectionStatus()
print("SDN Successfully connected")
status.status = "success"
status.details = "Connection was successful"
diff --git a/rwlaunchpad/plugins/rwvns/yang/CMakeLists.txt b/rwlaunchpad/plugins/rwvns/yang/CMakeLists.txt
index 5e7e98a..0ff2739 100644
--- a/rwlaunchpad/plugins/rwvns/yang/CMakeLists.txt
+++ b/rwlaunchpad/plugins/rwvns/yang/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -26,12 +26,9 @@
rift_add_yang_target(
TARGET rwsdnal_yang
YANG_FILES ${source_yang_files}
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
LIBRARIES
- rwschema_yang_gen
- rwyang
- rwlog
- rwlog-mgmt_yang_gen
mano-types_yang_gen
+ rwprojectmano_yang_gen
)
diff --git a/rwlaunchpad/plugins/rwvns/yang/rwsdnal.yang b/rwlaunchpad/plugins/rwvns/yang/rwsdnal.yang
index b24952b..8ebc3ab 100644
--- a/rwlaunchpad/plugins/rwvns/yang/rwsdnal.yang
+++ b/rwlaunchpad/plugins/rwvns/yang/rwsdnal.yang
@@ -27,10 +27,6 @@
prefix rwbase;
}
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import rw-yang-types {
prefix "rwt";
}
@@ -51,6 +47,14 @@
prefix "yang";
}
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ revision 2017-02-08 {
+ description
+ "Update model to support projects.";
+ }
revision 2014-12-30 {
description
@@ -72,7 +76,6 @@
grouping connection-status {
container connection-status {
config false;
- rwpb:msg-new SdnConnectionStatus;
leaf status {
type sdn-connection-status-enum;
}
@@ -82,7 +85,7 @@
}
}
- uses connection-status;
+ // uses connection-status;
typedef sdn-account-type {
description "SDN account type";
@@ -204,70 +207,99 @@
}
}
- container sdn-accounts {
- list sdn-account-list {
- rwpb:msg-new SDNAccount;
- key "name";
+ augment "/rw-project:project" {
+ container sdn-accounts {
+ list sdn-account-list {
+ key "name";
- leaf name {
- type string;
+ leaf name {
+ type string;
+ }
+
+ uses sdn-provider-auth;
+ uses connection-status;
}
-
- uses sdn-provider-auth;
- uses connection-status;
}
}
- container vnffgs {
- list vnffg-chain {
- key "name";
- rwpb:msg-new VNFFGChain;
-
- leaf name {
- type string;
- }
-
- list vnf-chain-path {
- key "order";
- leaf order {
- type uint32;
- description " Order of the VNF in VNFFG chain";
- }
- leaf service-function-type {
+ augment "/rw-project:project" {
+ container vnffgs {
+ list vnffg-chain {
+ key "name";
+
+ leaf name {
type string;
}
- leaf nsh-aware {
- type boolean;
- }
- leaf transport-type {
- type string;
- }
- list vnfr-ids {
- key "vnfr-id";
- leaf vnfr-id {
- type yang:uuid;
+
+ list vnf-chain-path {
+ key "order";
+ leaf order {
+ type uint32;
+ description " Order of the VNF in VNFFG chain";
}
- leaf vnfr-name {
+ leaf service-function-type {
+ type string;
+ }
+ leaf nsh-aware {
+ type boolean;
+ }
+ leaf transport-type {
+ type string;
+ }
+ list vnfr-ids {
+ key "vnfr-id";
+ leaf vnfr-id {
+ type yang:uuid;
+ }
+ leaf vnfr-name {
+ type string;
+ }
+ leaf mgmt-address {
+ type inet:ip-address;
+ }
+ leaf mgmt-port {
+ type inet:port-number;
+ }
+ list vdu-list {
+ key "vm-id port-id";
+ leaf port-id {
+ type string;
+ }
+ leaf vm-id {
+ type string;
+ }
+ leaf name {
+ type string;
+ }
+ leaf address {
+ type inet:ip-address;
+ }
+ leaf port {
+ type inet:port-number;
+ }
+ }
+ leaf sff-name {
+ description "SFF name useful for non OVS based SFF";
+ type string;
+ }
+ }
+ }
+ list sff {
+ key "name";
+ leaf name {
+ type string;
+ }
+ leaf function-type {
type string;
}
leaf mgmt-address {
type inet:ip-address;
}
leaf mgmt-port {
- type inet:port-number;
+ type inet:port-number;
}
- list vdu-list {
- key "vm-id port-id";
- leaf port-id {
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
- type string;
- }
- leaf vm-id {
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
- type string;
- }
+ list dp-endpoints {
+ key "name";
leaf name {
type string;
}
@@ -278,182 +310,146 @@
type inet:port-number;
}
}
- leaf sff-name {
- description "SFF name useful for non OVS based SFF";
- type string;
- }
+ list vnfr-list {
+ key "vnfr-name";
+ leaf vnfr-name {
+ type string;
+ }
+ }
+ }
+ leaf classifier-name {
+ type string;
}
}
- list sff {
- rwpb:msg-new VNFFGSff;
- key "name";
+ }
+ }
+
+ augment "/rw-project:project" {
+ container vnffg-rendered-paths {
+ list vnffg-rendered-path {
+ key "name";
+ config false;
leaf name {
type string;
}
- leaf function-type {
- type string;
+ leaf path-id {
+ description
+ "Unique Identifier for the service path";
+ type uint32;
}
- leaf mgmt-address {
- type inet:ip-address;
- }
- leaf mgmt-port {
- type inet:port-number;
- }
- list dp-endpoints {
- key "name";
- leaf name {
- type string;
- }
- leaf address {
- type inet:ip-address;
+ list rendered-path-hop {
+ key "hop-number";
+ leaf hop-number {
+ type uint8;
}
- leaf port {
- type inet:port-number;
+ leaf service-index {
+ description
+ "Location within the service path";
+ type uint8;
}
- }
- list vnfr-list {
- key "vnfr-name";
leaf vnfr-name {
type string;
}
+ container service-function-forwarder {
+ leaf name {
+ description
+ "Service Function Forwarder name";
+ type string;
+ }
+ leaf ip-address {
+ description
+ "Service Function Forwarder Data Plane IP address";
+ type inet:ip-address;
+ }
+ leaf port {
+ description
+ "Service Function Forwarder Data Plane port";
+ type inet:port-number;
+ }
+ }
}
}
- leaf classifier-name {
- type string;
- }
}
}
- container vnffg-rendered-paths {
- rwpb:msg-new VNFFGRenderedPaths;
- list vnffg-rendered-path {
- key "name";
- rwpb:msg-new VNFFGRenderedPath;
- config false;
- leaf name {
- type string;
- }
- leaf path-id {
- description
- "Unique Identifier for the service path";
- type uint32;
- }
- list rendered-path-hop {
- key "hop-number";
- leaf hop-number {
- type uint8;
- }
- leaf service-index {
- description
- "Location within the service path";
- type uint8;
- }
- leaf vnfr-name {
+ augment "/rw-project:project" {
+ container vnffg-classifiers {
+ list vnffg-classifier {
+ key "name";
+
+ leaf name {
type string;
}
- container service-function-forwarder {
- leaf name {
- description
- "Service Function Forwarder name";
+ leaf rsp-name {
+ type string;
+ }
+ leaf rsp-id {
+ type yang:uuid;
+ }
+ leaf port-id {
+ type string;
+ }
+ leaf vm-id {
+ type string;
+ }
+ leaf sff-name {
+ type string;
+ }
+ container vnffg-metadata {
+ leaf ctx1 {
type string;
}
- leaf ip-address {
- description
- "Service Function Forwarder Data Plane IP address";
- type inet:ip-address;
- }
- leaf port {
- description
- "Service Function Forwarder Data Plane port";
- type inet:port-number;
- }
+ leaf ctx2 {
+ type string;
+ }
+ leaf ctx3 {
+ type string;
+ }
+ leaf ctx4 {
+ type string;
+ }
}
- }
- }
- }
-
-
- container vnffg-classifiers {
- list vnffg-classifier {
- key "name";
- rwpb:msg-new VNFFGClassifier;
-
- leaf name {
- type string;
- }
- leaf rsp-name {
- type string;
- }
- leaf rsp-id {
- type yang:uuid;
- }
- leaf port-id {
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
- type string;
- }
- leaf vm-id {
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
- type string;
- }
- leaf sff-name {
- type string;
- }
- container vnffg-metadata {
- leaf ctx1 {
- type string;
- }
- leaf ctx2 {
- type string;
- }
- leaf ctx3 {
- type string;
- }
- leaf ctx4 {
- type string;
- }
- }
- list match-attributes {
- description
+ list match-attributes {
+ description
"List of match attributes.";
- key "name";
- leaf name {
- description
+ key "name";
+ leaf name {
+ description
"Name for the Access list";
- type string;
- }
+ type string;
+ }
- leaf ip-proto {
- description
+ leaf ip-proto {
+ description
"IP Protocol.";
- type uint8;
- }
+ type uint8;
+ }
- leaf source-ip-address {
- description
+ leaf source-ip-address {
+ description
"Source IP address.";
- type inet:ip-prefix;
- }
+ type inet:ip-prefix;
+ }
- leaf destination-ip-address {
- description
+ leaf destination-ip-address {
+ description
"Destination IP address.";
- type inet:ip-prefix;
- }
+ type inet:ip-prefix;
+ }
- leaf source-port {
- description
+ leaf source-port {
+ description
"Source port number.";
- type inet:port-number;
- }
+ type inet:port-number;
+ }
- leaf destination-port {
- description
+ leaf destination-port {
+ description
"Destination port number.";
- type inet:port-number;
- }
- } //match-attributes
+ type inet:port-number;
+ }
+ } //match-attributes
+ }
}
}
diff --git a/rwlaunchpad/plugins/vala/rwos_ma_nfvo/CMakeLists.txt b/rwlaunchpad/plugins/vala/rwos_ma_nfvo/CMakeLists.txt
index b0919bd..3ee763a 100644
--- a/rwlaunchpad/plugins/vala/rwos_ma_nfvo/CMakeLists.txt
+++ b/rwlaunchpad/plugins/vala/rwos_ma_nfvo/CMakeLists.txt
@@ -36,15 +36,12 @@
rw_types-1.0 rw_log_yang-1.0 rw_schema_proto-1.0 rw_yang_pb-1.0
rw_yang-1.0 protobuf_c-1.0 rw_keyspec-1.0 rw_log-1.0
- #VAPI_DIRS ${RIFT_SUBMODULE_BINARY_ROOT}/rwcal/plugins/yang
- #GIR_PATHS ${RIFT_SUBMODULE_BINARY_ROOT}/rwcal/plugins/yang
GENERATE_HEADER_FILE ${VALA_NAME}.h
GENERATE_SO_FILE lib${VALA_LONG_NAME}.so
GENERATE_VAPI_FILE ${VALA_LONG_NAME}.vapi
GENERATE_GIR_FILE ${VALA_TYPELIB_PREFIX}.gir
GENERATE_TYPELIB_FILE ${VALA_TYPELIB_PREFIX}.typelib
- #DEPENDS rwcal_yang rwlog_gi rwschema_yang
)
rift_install_vala_artifacts(
@@ -53,7 +50,7 @@
VAPI_FILES ${VALA_LONG_NAME}.vapi
GIR_FILES ${VALA_TYPELIB_PREFIX}.gir
TYPELIB_FILES ${VALA_TYPELIB_PREFIX}.typelib
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
DEST_PREFIX .
)
diff --git a/rwlaunchpad/plugins/vala/rwos_ma_nfvo/rwos_ma_nfvo_rest/CMakeLists.txt b/rwlaunchpad/plugins/vala/rwos_ma_nfvo/rwos_ma_nfvo_rest/CMakeLists.txt
index f9ec32f..1980cb5 100644
--- a/rwlaunchpad/plugins/vala/rwos_ma_nfvo/rwos_ma_nfvo_rest/CMakeLists.txt
+++ b/rwlaunchpad/plugins/vala/rwos_ma_nfvo/rwos_ma_nfvo_rest/CMakeLists.txt
@@ -17,4 +17,4 @@
include(rift_plugin)
-rift_install_python_plugin(rwos_ma_nfvo_rest rwos_ma_nfvo_rest.py)
+rift_install_gobject_python_plugin(rwos_ma_nfvo_rest rwos_ma_nfvo_rest.py COMPONENT ${INSTALL_COMPONENT})
diff --git a/rwlaunchpad/plugins/vala/rwve_vnfm_em/CMakeLists.txt b/rwlaunchpad/plugins/vala/rwve_vnfm_em/CMakeLists.txt
index 12ff14c..aa0b3de 100644
--- a/rwlaunchpad/plugins/vala/rwve_vnfm_em/CMakeLists.txt
+++ b/rwlaunchpad/plugins/vala/rwve_vnfm_em/CMakeLists.txt
@@ -36,15 +36,12 @@
rw_types-1.0 rw_log_yang-1.0 rw_schema_proto-1.0 rw_yang_pb-1.0
rw_yang-1.0 protobuf_c-1.0 rw_keyspec-1.0 rw_log-1.0
- #VAPI_DIRS ${RIFT_SUBMODULE_BINARY_ROOT}/rwcal/plugins/yang
- #GIR_PATHS ${RIFT_SUBMODULE_BINARY_ROOT}/rwcal/plugins/yang
GENERATE_HEADER_FILE ${VALA_NAME}.h
GENERATE_SO_FILE lib${VALA_LONG_NAME}.so
GENERATE_VAPI_FILE ${VALA_LONG_NAME}.vapi
GENERATE_GIR_FILE ${VALA_TYPELIB_PREFIX}.gir
GENERATE_TYPELIB_FILE ${VALA_TYPELIB_PREFIX}.typelib
- #DEPENDS rwcal_yang rwlog_gi rwschema_yang
)
rift_install_vala_artifacts(
@@ -53,7 +50,7 @@
VAPI_FILES ${VALA_LONG_NAME}.vapi
GIR_FILES ${VALA_TYPELIB_PREFIX}.gir
TYPELIB_FILES ${VALA_TYPELIB_PREFIX}.typelib
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
DEST_PREFIX .
)
diff --git a/rwlaunchpad/plugins/vala/rwve_vnfm_em/rwve_vnfm_em_rest/CMakeLists.txt b/rwlaunchpad/plugins/vala/rwve_vnfm_em/rwve_vnfm_em_rest/CMakeLists.txt
index 6efbd40..2ac7afe 100644
--- a/rwlaunchpad/plugins/vala/rwve_vnfm_em/rwve_vnfm_em_rest/CMakeLists.txt
+++ b/rwlaunchpad/plugins/vala/rwve_vnfm_em/rwve_vnfm_em_rest/CMakeLists.txt
@@ -17,4 +17,4 @@
include(rift_plugin)
-rift_install_python_plugin(rwve_vnfm_em_rest rwve_vnfm_em_rest.py)
+rift_install_gobject_python_plugin(rwve_vnfm_em_rest rwve_vnfm_em_rest.py COMPONENT ${INSTALL_COMPONENT})
diff --git a/rwlaunchpad/plugins/vala/rwve_vnfm_vnf/CMakeLists.txt b/rwlaunchpad/plugins/vala/rwve_vnfm_vnf/CMakeLists.txt
index 190763d..d067c34 100644
--- a/rwlaunchpad/plugins/vala/rwve_vnfm_vnf/CMakeLists.txt
+++ b/rwlaunchpad/plugins/vala/rwve_vnfm_vnf/CMakeLists.txt
@@ -36,15 +36,12 @@
rw_types-1.0 rw_log_yang-1.0 rw_schema_proto-1.0 rw_yang_pb-1.0
rw_yang-1.0 protobuf_c-1.0 rw_keyspec-1.0 rw_log-1.0
- #VAPI_DIRS ${RIFT_SUBMODULE_BINARY_ROOT}/rwcal/plugins/yang
- #GIR_PATHS ${RIFT_SUBMODULE_BINARY_ROOT}/rwcal/plugins/yang
GENERATE_HEADER_FILE ${VALA_NAME}.h
GENERATE_SO_FILE lib${VALA_LONG_NAME}.so
GENERATE_VAPI_FILE ${VALA_LONG_NAME}.vapi
GENERATE_GIR_FILE ${VALA_TYPELIB_PREFIX}.gir
GENERATE_TYPELIB_FILE ${VALA_TYPELIB_PREFIX}.typelib
- #DEPENDS rwcal_yang rwlog_gi rwschema_yang
)
rift_install_vala_artifacts(
@@ -53,7 +50,7 @@
VAPI_FILES ${VALA_LONG_NAME}.vapi
GIR_FILES ${VALA_TYPELIB_PREFIX}.gir
TYPELIB_FILES ${VALA_TYPELIB_PREFIX}.typelib
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
DEST_PREFIX .
)
diff --git a/rwlaunchpad/plugins/vala/rwve_vnfm_vnf/rwve_vnfm_vnf_rest/CMakeLists.txt b/rwlaunchpad/plugins/vala/rwve_vnfm_vnf/rwve_vnfm_vnf_rest/CMakeLists.txt
index e890eaa..45a451a 100644
--- a/rwlaunchpad/plugins/vala/rwve_vnfm_vnf/rwve_vnfm_vnf_rest/CMakeLists.txt
+++ b/rwlaunchpad/plugins/vala/rwve_vnfm_vnf/rwve_vnfm_vnf_rest/CMakeLists.txt
@@ -17,4 +17,4 @@
include(rift_plugin)
-rift_install_python_plugin(rwve_vnfm_vnf_rest rwve_vnfm_vnf_rest.py)
+rift_install_gobject_python_plugin(rwve_vnfm_vnf_rest rwve_vnfm_vnf_rest.py COMPONENT ${INSTALL_COMPONENT})
diff --git a/rwlaunchpad/plugins/yang/CMakeLists.txt b/rwlaunchpad/plugins/yang/CMakeLists.txt
index 43e87e1..fe07994 100644
--- a/rwlaunchpad/plugins/yang/CMakeLists.txt
+++ b/rwlaunchpad/plugins/yang/CMakeLists.txt
@@ -1,5 +1,5 @@
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -64,18 +64,41 @@
${rw_monitor_log_file}
${rw_mon_params_log_file}
${rw_resource_mgr_log_file}
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
LIBRARIES
mano_yang_gen
rwcloud_yang_gen
+ rwro_account_yang_gen
rw_conman_yang_gen
rwconfig_agent_yang_gen
mano-types_yang_gen
+ rwprojectmano_yang_gen
DEPENDS
mano_yang
rwcloud_yang
+ rwro_account_yang
rw_conman_yang
rwconfig_agent_yang
mano-types_yang
+ rwprojectmano_yang
+ # Added to make sure that the target is built,
+ # Not required b mano yang
+ rw_project_person_yang
+ ASSOCIATED_FILES
+ rw-pkg-mgmt.role.xml
+ rw-staging-mgmt.role.xml
+ rw-image-mgmt.role.xml
)
+rift_add_yang_target(
+ TARGET rw_project_person_yang
+ YANG_FILES
+ rw-project-person-db.yang
+ COMPONENT ${INSTALL_COMPONENT}
+ LIBRARIES
+ rwprojectmano_yang_gen
+ DEPENDS
+ rwprojectmano_yang
+ ASSOCIATED_FILES
+ rw-launchpad.role.xml
+)
diff --git a/rwlaunchpad/plugins/yang/rw-image-mgmt.role.xml b/rwlaunchpad/plugins/yang/rw-image-mgmt.role.xml
new file mode 100644
index 0000000..14344dd
--- /dev/null
+++ b/rwlaunchpad/plugins/yang/rw-image-mgmt.role.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" ?>
+<config xmlns="http://riftio.com/ns/riftware-1.0/rw-rbac-role-def">
+ <key-definition>
+ <role>rw-project-mano:rw-image-mgmt-role</role>
+ <key-set>
+ <name>project-name</name>
+ <path>/rw-project:project/rw-project:name</path>
+ </key-set>
+ </key-definition>
+
+ <role-definition>
+ <role>rw-project-mano:catalog-oper</role>
+ <keys-role>rw-project-mano:rw-image-mgmt-role</keys-role>
+ <authorize>
+ <permissions>read execute</permissions>
+ <path>/rw-project:project/rw-image-mgmt:upload-jobs</path>
+ </authorize>
+ </role-definition>
+
+ <role-definition>
+ <role>rw-project-mano:catalog-admin</role>
+ <keys-role>rw-project-mano:rw-image-mgmt-role</keys-role>
+ <authorize>
+ <permissions>create read update delete execute</permissions>
+ <path>/rw-project:project/rw-image-mgmt:upload-jobs</path>
+ <path>/rw-image-mgmt:create-upload-job</path>
+ <path>/rw-image-mgmt:create-upload-job</path>
+ </authorize>
+ </role-definition>
+
+ <role-definition>
+ <role>rw-project:project-admin</role>
+ <keys-role>rw-project-mano:rw-image-mgmt-role</keys-role>
+ <authorize>
+ <permissions>create read update delete execute</permissions>
+ <path>/rw-image-mgmt:create-upload-job</path>
+ <path>/rw-image-mgmt:create-upload-job</path>
+ </authorize>
+ </role-definition>
+</config>
diff --git a/rwlaunchpad/plugins/yang/rw-image-mgmt.tailf.yang b/rwlaunchpad/plugins/yang/rw-image-mgmt.tailf.yang
index 0184a9a..66bcdbf 100644
--- a/rwlaunchpad/plugins/yang/rw-image-mgmt.tailf.yang
+++ b/rwlaunchpad/plugins/yang/rw-image-mgmt.tailf.yang
@@ -1,7 +1,7 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,7 +31,11 @@
prefix tailf;
}
- tailf:annotate "/rw-image-mgmt:upload-jobs" {
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ tailf:annotate "/rw-project:project/rw-image-mgmt:upload-jobs" {
tailf:callpoint rw_callpoint;
}
diff --git a/rwlaunchpad/plugins/yang/rw-image-mgmt.yang b/rwlaunchpad/plugins/yang/rw-image-mgmt.yang
index 833931f..34ec703 100644
--- a/rwlaunchpad/plugins/yang/rw-image-mgmt.yang
+++ b/rwlaunchpad/plugins/yang/rw-image-mgmt.yang
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,22 +33,35 @@
prefix "yang";
}
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import rw-cli-ext {
prefix "rwcli";
}
import rw-cloud {
- prefix "rwcloud";
+ prefix "rw-cloud";
}
import rwcal {
prefix "rwcal";
}
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ import rw-project-mano {
+ prefix "rw-project-mano";
+ }
+
+ import mano-types {
+ prefix "mano-types";
+ }
+
+ revision 2017-02-08 {
+ description
+ "Update model to support projects.";
+ }
+
revision 2016-06-01 {
description
"Initial revision.";
@@ -145,7 +158,7 @@
leaf cloud-account {
description "The cloud account to upload the image to";
type leafref {
- path "/rwcloud:cloud/rwcloud:account/rwcloud:name";
+ path "../../../../rw-cloud:cloud/rw-cloud:account/rw-cloud:name";
}
}
@@ -153,46 +166,46 @@
uses upload-task-status;
}
- container upload-jobs {
- rwpb:msg-new UploadJobs;
- description "Image upload jobs";
- config false;
+ augment "/rw-project:project" {
+ container upload-jobs {
+ description "Image upload jobs";
+ config false;
- list job {
- rwpb:msg-new UploadJob;
- key "id";
+ list job {
+ key "id";
- leaf id {
- description "Unique image upload job-id";
- type uint32;
- }
+ leaf id {
+ description "Unique image upload job-id";
+ type uint32;
+ }
- leaf status {
- description "Current job status";
- type job-status;
- }
+ leaf status {
+ description "Current job status";
+ type job-status;
+ }
- leaf start-time {
- description "The job start time (unix epoch)";
- type uint32;
- }
+ leaf start-time {
+ description "The job start time (unix epoch)";
+ type uint32;
+ }
- leaf stop-time {
- description "The job stop time (unix epoch)";
- type uint32;
- }
+ leaf stop-time {
+ description "The job stop time (unix epoch)";
+ type uint32;
+ }
- list upload-tasks {
- rwpb:msg-new UploadTask;
- description "The upload tasks that are part of this job";
- uses upload-task;
+ list upload-tasks {
+ description "The upload tasks that are part of this job";
+ uses upload-task;
+ }
}
}
}
rpc create-upload-job {
input {
- rwpb:msg-new CreateUploadJob;
+
+ uses mano-types:rpc-project-name;
choice image-selection {
case onboarded-image {
@@ -230,13 +243,13 @@
leaf-list cloud-account {
description "List of cloud accounts to upload the image to";
type leafref {
- path "/rwcloud:cloud/rwcloud:account/rwcloud:name";
+ path "/rw-project:project[rw-project:name=current()/.." +
+ "/project-name]/rw-cloud:cloud/rw-cloud:account/rw-cloud:name";
}
}
}
output {
- rwpb:msg-new CreateUploadJobOutput;
leaf job-id {
description "The upload job-id to cancel";
type uint32;
@@ -246,10 +259,11 @@
rpc cancel-upload-job {
input {
- rwpb:msg-new CancelUploadJob;
leaf job-id {
type uint32;
}
+
+ uses mano-types:rpc-project-name;
}
}
}
diff --git a/rwlaunchpad/plugins/yang/rw-launchpad.role.xml b/rwlaunchpad/plugins/yang/rw-launchpad.role.xml
new file mode 100644
index 0000000..c58326c
--- /dev/null
+++ b/rwlaunchpad/plugins/yang/rw-launchpad.role.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+<config xmlns="http://riftio.com/ns/riftware-1.0/rw-rbac-role-def">
+ <key-definition>
+ <role>rw-project-mano:rw-launchpad-role</role>
+ <key-set>
+ <name>project-name</name>
+ <path>/rw-project:project/rw-project:name</path>
+ </key-set>
+ </key-definition>
+
+ <role-definition>
+ <role>rw-project-mano:account-oper</role>
+ <keys-role>rw-project-mano:rw-launchpad-role</keys-role>
+ <authorize>
+ <permissions>read execute</permissions>
+ <path>/rw-project:project/rw-launchpad:datacenters</path>
+ </authorize>
+ </role-definition>
+
+ <role-definition>
+ <role>rw-project-mano:account-admin</role>
+ <keys-role>rw-project-mano:rw-launchpad-role</keys-role>
+ <authorize>
+ <permissions>read execute</permissions>
+ <path>/rw-project:project/rw-launchpad:datacenters</path>
+ </authorize>
+ </role-definition>
+
+ <role-definition>
+ <role>rw-project-mano:lcm-admin</role>
+ <keys-role>rw-project-mano:rw-launchpad-role</keys-role>
+ <authorize>
+ <permissions>read execute</permissions>
+ <path>/rw-project:project/rw-launchpad:datacenters</path>
+ </authorize>
+ </role-definition>
+</config>
diff --git a/rwlaunchpad/plugins/yang/rw-launchpad.tailf.yang b/rwlaunchpad/plugins/yang/rw-launchpad.tailf.yang
index 1fab791..04cfee4 100644
--- a/rwlaunchpad/plugins/yang/rw-launchpad.tailf.yang
+++ b/rwlaunchpad/plugins/yang/rw-launchpad.tailf.yang
@@ -1,7 +1,7 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
prefix tailf;
}
- tailf:annotate "/rw-launchpad:datacenters" {
- tailf:callpoint rw_callpoint;
+ import rw-project {
+ prefix "rw-project";
}
}
diff --git a/rwlaunchpad/plugins/yang/rw-launchpad.yang b/rwlaunchpad/plugins/yang/rw-launchpad.yang
index 0adaee9..660194b 100644
--- a/rwlaunchpad/plugins/yang/rw-launchpad.yang
+++ b/rwlaunchpad/plugins/yang/rw-launchpad.yang
@@ -1,7 +1,7 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,15 +36,10 @@
prefix "yang";
}
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import ietf-inet-types {
prefix "inet";
}
-
import rw-cli-ext {
prefix "rwcli";
}
@@ -57,16 +52,16 @@
prefix "rwcal";
}
- import rw-vnfd {
- prefix "rw-vnfd";
+ import rw-project-vnfd {
+ prefix "rw-project-vnfd";
}
import vld {
prefix "vld";
}
- import rw-nsd {
- prefix "rw-nsd";
+ import rw-project-nsd {
+ prefix "rw-project-nsd";
}
import rw-cloud {
@@ -102,115 +97,37 @@
prefix "manotypes";
}
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ import rw-project-mano {
+ prefix "rw-project-mano";
+ }
+
+ import rw-ro-account {
+ prefix "rw-ro-account";
+ }
+
+ revision 2017-02-08 {
+ description
+ "Update model to support projects.";
+ }
+
revision 2015-09-14 {
description
"Initial revision.";
}
- container datacenters {
- description "OpenMano data centers";
-
- rwpb:msg-new DataCenters;
- config false;
-
- list ro-accounts {
- description
- "A list of OpenMano cloud accounts that have data centers associated
- with them";
-
- rwpb:msg-new ROAccount;
- key "name";
-
- leaf name {
- description "The name of the cloud account";
- type leafref {
- path "/rw-launchpad:resource-orchestrator/rw-launchpad:name";
- }
- }
-
- list datacenters {
- rwpb:msg-new DataCenter;
- leaf uuid {
- description "The UUID of the data center";
- type yang:uuid;
- }
-
- leaf name {
- description "The name of the data center";
- type string;
- }
- }
- }
- }
-
- typedef resource-orchestrator-account-type {
- description "RO account type";
- type enumeration {
- enum rift-ro;
- enum openmano;
- }
- }
-
- container resource-orchestrator {
- rwpb:msg-new ResourceOrchestrator;
-
- leaf name {
- type string;
- }
-
- leaf account-type {
- type resource-orchestrator-account-type;
- }
-
- choice resource-orchestrator {
- description
- "The resource orchestrator to use by the Launchpad";
- default rift-ro;
-
- case rift-ro {
+ augment "/rw-project:project" {
+ container launchpad-config {
+ leaf public-ip {
description
- "Use the RIFT.io resource orchestrator";
-
- container rift-ro {
- leaf rift-ro {
- type empty;
- }
- }
- }
-
- case openmano {
- description
- "Use OpenMano as RO";
-
- container openmano {
- leaf host {
- type string;
- default "localhost";
- }
-
- leaf port {
- type uint16;
- default 9090;
- }
-
- leaf tenant-id {
- type string {
- length "36";
- }
- mandatory true;
- }
- }
- }
- }
- }
-
- container launchpad-config {
- leaf public-ip {
- description
"An IP address that can, at least, be reached by the host that the
launchpad is running on. This is not a mandatory but is required for
alarms to function correctly.";
- type string;
+ type string;
+ }
}
}
}
diff --git a/rwlaunchpad/plugins/yang/rw-monitor.yang b/rwlaunchpad/plugins/yang/rw-monitor.yang
index 559880d..9fda4ad 100644
--- a/rwlaunchpad/plugins/yang/rw-monitor.yang
+++ b/rwlaunchpad/plugins/yang/rw-monitor.yang
@@ -31,10 +31,6 @@
namespace "http://riftio.com/ns/riftware-1.0/rw-monitor";
prefix "rw-monitor";
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import rw-cli-ext {
prefix "rwcli";
}
@@ -63,6 +59,10 @@
prefix "yang";
}
+ import rw-project-mano {
+ prefix "rw-project-mano";
+ }
+
revision 2015-10-30 {
description
"Initial revision.";
diff --git a/rwlaunchpad/plugins/yang/rw-nsm.yang b/rwlaunchpad/plugins/yang/rw-nsm.yang
index 4e6d9aa..4a782a7 100644
--- a/rwlaunchpad/plugins/yang/rw-nsm.yang
+++ b/rwlaunchpad/plugins/yang/rw-nsm.yang
@@ -1,7 +1,7 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,10 +31,6 @@
namespace "http://riftio.com/ns/riftware-1.0/rw-nsm";
prefix "rw-nsm";
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import rw-cli-ext {
prefix "rwcli";
}
@@ -43,30 +39,38 @@
prefix "inet";
}
- import rw-nsd {
- prefix "rw-nsd";
+ import rw-project-nsd {
+ prefix "rw-project-nsd";
}
- import nsd {
- prefix "nsd";
+
+ import project-nsd {
+ prefix "project-nsd";
}
+
import rw-nsr {
prefix "rw-nsr";
}
+
import vld {
prefix "vld";
}
+
import rw-vlr {
prefix "rw-vlr";
}
+
import rw-vns {
prefix "rw-vns";
}
- import rw-vnfd {
- prefix "rw-vnfd";
+
+ import rw-project-vnfd {
+ prefix "rw-project-vnfd";
}
- import vnfd {
- prefix "vnfd";
+
+ import project-vnfd {
+ prefix "project-vnfd";
}
+
import rw-vnfr {
prefix "rw-vnfr";
}
@@ -91,6 +95,19 @@
prefix "rw-config-agent";
}
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ import rw-project-mano {
+ prefix "rw-project-mano";
+ }
+
+ revision 2017-02-08 {
+ description
+ "Update model to support projects.";
+ }
+
revision 2015-10-07 {
description
"Initial revision.";
@@ -110,24 +127,12 @@
leaf cm-username {
description "RO endpoint username";
type string;
- default "admin";
+ default "@rift";
}
leaf cm-password {
description "RO endpoint password";
type string;
- default "admin";
- }
- }
-
- container ro-config {
- description "Resource Orchestrator endpoint ip address";
- rwpb:msg-new "roConfig";
- rwcli:new-mode "ro-config";
-
- container cm-endpoint {
- description "Service Orchestrator endpoint ip address";
- rwpb:msg-new "SoEndpoint";
- uses cm-endpoint;
+ default "rift";
}
}
}
diff --git a/rwlaunchpad/plugins/yang/rw-pkg-mgmt.role.xml b/rwlaunchpad/plugins/yang/rw-pkg-mgmt.role.xml
new file mode 100644
index 0000000..9ecc2ce
--- /dev/null
+++ b/rwlaunchpad/plugins/yang/rw-pkg-mgmt.role.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" ?>
+<config xmlns="http://riftio.com/ns/riftware-1.0/rw-rbac-role-def">
+ <key-definition>
+ <role>rw-project-mano:rw-pkg-mgmt-role</role>
+ <key-set>
+ <name>project-name</name>
+ <path>/rw-project:project/rw-project:name</path>
+ </key-set>
+ </key-definition>
+
+ <role-definition>
+ <role>rw-project-mano:catalog-oper</role>
+ <keys-role>rw-project-mano:rw-pkg-mgmt-role</keys-role>
+ <authorize>
+ <permissions>read execute</permissions>
+ <path>/rw-project:project/rw-pkg-mgmt:download-jobs</path>
+ <path>/rw-project:project/rw-pkg-mgmt:copy-jobs</path>
+ <path>/rw-pkg-mgmt:get-package-endpoint</path>
+ <path>/rw-pkg-mgmt:get-package-schema</path>
+ </authorize>
+ </role-definition>
+
+ <role-definition>
+ <role>rw-project-mano:catalog-admin</role>
+ <keys-role>rw-project-mano:rw-pkg-mgmt-role</keys-role>
+ <authorize>
+ <permissions>create read update delete execute</permissions>
+ <path>/rw-project:project/rw-pkg-mgmt:download-jobs</path>
+ <path>/rw-project:project/rw-pkg-mgmt:copy-jobs</path>
+ <path>/rw-project:project/rw-pkg-mgmt:create-jobs</path>
+ <path>/rw-project:project/rw-pkg-mgmt:update-jobs</path>
+ <path>/rw-pkg-mgmt:get-package-endpoint</path>
+ <path>/rw-pkg-mgmt:get-package-schema</path>
+ <path>/rw-pkg-mgmt:package-copy</path>
+ <path>/rw-pkg-mgmt:package-file-add</path>
+ <path>/rw-pkg-mgmt:package-file-delete</path>
+ <path>/rw-pkg-mgmt:package-create</path>
+ <path>/rw-pkg-mgmt:package-update</path>
+ <path>/rw-pkg-mgmt:package-export</path>
+ </authorize>
+ </role-definition>
+
+ <role-definition>
+ <role>rw-project:project-admin</role>
+ <keys-role>rw-project-mano:rw-pkg-mgmt-role</keys-role>
+ <authorize>
+ <permissions>create read update delete execute</permissions>
+ <path>/rw-pkg-mgmt:get-package-endpoint</path>
+ <path>/rw-pkg-mgmt:get-package-schema</path>
+ <path>/rw-pkg-mgmt:package-copy</path>
+ <path>/rw-pkg-mgmt:package-file-add</path>
+ <path>/rw-pkg-mgmt:package-file-delete</path>
+ <path>/rw-pkg-mgmt:package-create</path>
+ <path>/rw-pkg-mgmt:package-update</path>
+ <path>/rw-pkg-mgmt:package-export</path>
+ </authorize>
+ </role-definition>
+</config>
diff --git a/rwlaunchpad/plugins/yang/rw-pkg-mgmt.tailf.yang b/rwlaunchpad/plugins/yang/rw-pkg-mgmt.tailf.yang
index e6e50c6..c5618ee 100644
--- a/rwlaunchpad/plugins/yang/rw-pkg-mgmt.tailf.yang
+++ b/rwlaunchpad/plugins/yang/rw-pkg-mgmt.tailf.yang
@@ -1,7 +1,7 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,11 +31,23 @@
prefix tailf;
}
- tailf:annotate "/rw-pkg-mgmt:download-jobs" {
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ tailf:annotate "/rw-project:project/rw-pkg-mgmt:download-jobs" {
tailf:callpoint rw_callpoint;
}
- tailf:annotate "/rw-pkg-mgmt:copy-jobs" {
+ tailf:annotate "/rw-project:project/rw-pkg-mgmt:copy-jobs" {
+ tailf:callpoint rw_callpoint;
+ }
+
+ tailf:annotate "/rw-project:project/rw-pkg-mgmt:create-jobs" {
+ tailf:callpoint rw_callpoint;
+ }
+
+ tailf:annotate "/rw-project:project/rw-pkg-mgmt:update-jobs" {
tailf:callpoint rw_callpoint;
}
diff --git a/rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang b/rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang
index b863caf..8f9fd71 100644
--- a/rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang
+++ b/rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,10 +33,6 @@
prefix "yang";
}
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import rw-cli-ext {
prefix "rwcli";
}
@@ -56,10 +52,32 @@
import rw-vnfd {
prefix "rwvnfd";
}
+
import rw-nsd {
prefix "rwnsd";
}
+ import rw-project-vnfd {
+ prefix "rw-project-vnfd";
+ }
+
+ import rw-project-nsd {
+ prefix "rw-project-nsd";
+ }
+
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ import rw-project-mano {
+ prefix "rw-project-mano";
+ }
+
+ revision 2017-02-08 {
+ description
+ "Update model to support projects.";
+ }
+
revision 2016-06-01 {
description
"Initial revision.";
@@ -95,6 +113,8 @@
enum IMAGES;
enum CLOUD_INIT;
enum README;
+ enum DOC;
+ enum TEST;
}
}
@@ -221,53 +241,85 @@
}
}
- container download-jobs {
- rwpb:msg-new DownloadJobs;
- description "Download jobs";
- config false;
+ augment "/rw-project:project" {
+ container download-jobs {
+ description "Download jobs";
+ config false;
- list job {
- rwpb:msg-new DownloadJob;
- key "download-id";
+ list job {
+ key "download-id";
- leaf download-id {
- description "Unique UUID";
- type string;
+ leaf download-id {
+ description "Unique UUID";
+ type string;
+ }
+
+ leaf url {
+ description "URL of the download";
+ type string;
+ }
+
+ uses package-file-identifer;
+ uses download-task-status;
}
+ }
- leaf url {
- description "URL of the download";
- type string;
+ container copy-jobs {
+ description "Copy jobs";
+ config false;
+
+ list job {
+ key "transaction-id";
+
+ leaf transaction-id {
+ description "Unique UUID";
+ type string;
+ }
+
+ uses copy-task-status;
}
+ }
- uses package-file-identifer;
- uses download-task-status;
+ container create-jobs {
+ description "Create jobs";
+ config false;
+
+ list job {
+ key "transaction-id";
+
+ leaf transaction-id {
+ description "Unique UUID";
+ type string;
+ }
+
+ uses copy-task-status;
+ }
+ }
+
+ container update-jobs {
+ description "Update jobs";
+ config false;
+
+ list job {
+ key "transaction-id";
+
+ leaf transaction-id {
+ description "Unique UUID";
+ type string;
+ }
+
+ uses copy-task-status;
+ }
}
}
- container copy-jobs {
- rwpb:msg-new CopyJobs;
- description "Copy jobs";
- config false;
-
- list job {
- rwpb:msg-new CopyJob;
- key "transaction-id";
-
- leaf transaction-id {
- description "Unique UUID";
- type string;
- }
-
- uses copy-task-status;
- }
- }
rpc get-package-endpoint {
description "Retrieves the endpoint for the descriptor";
input {
uses package-identifer;
+ uses manotypes:rpc-project-name;
}
output {
@@ -288,6 +340,8 @@
description "Name of destination package";
type string;
}
+
+ uses manotypes:rpc-project-name;
}
output {
@@ -308,6 +362,8 @@
description "Type of the package";
type manotypes:package-type;
}
+
+ uses manotypes:rpc-project-name;
}
output {
@@ -324,6 +380,7 @@
input {
uses package-identifer;
uses external-url-data;
+ uses manotypes:rpc-project-name;
}
output {
@@ -331,6 +388,7 @@
description "Valid ID to track the status of the task";
type string;
}
+ uses manotypes:rpc-project-name;
}
}
@@ -340,6 +398,7 @@
input {
uses package-identifer;
uses external-url-data;
+ uses manotypes:rpc-project-name;
}
output {
@@ -347,6 +406,7 @@
description "Valid ID to track the status of the task";
type string;
}
+ uses manotypes:rpc-project-name;
}
}
@@ -355,6 +415,7 @@
input {
uses package-identifer;
+ uses manotypes:rpc-project-name;
leaf export-schema {
description "Schema to export";
@@ -373,7 +434,6 @@
type export-format;
default YAML;
}
-
}
output {
@@ -386,6 +446,8 @@
description "Valid ID to track the status of the task";
type string;
}
+
+ uses manotypes:rpc-project-name;
}
}
@@ -395,6 +457,7 @@
input {
uses package-file-identifer;
uses external-url-data;
+ uses manotypes:rpc-project-name;
choice catalog-type {
mandatory true;
@@ -411,7 +474,6 @@
}
}
}
-
}
output {
@@ -419,6 +481,7 @@
description "Valid ID to track the status of the task";
type string;
}
+ uses manotypes:rpc-project-name;
}
}
@@ -427,6 +490,8 @@
input {
uses package-file-identifer;
+ uses manotypes:rpc-project-name;
+
choice catalog-type {
case VNFD {
leaf vnfd-file-type {
@@ -441,7 +506,6 @@
}
}
}
-
}
output {
@@ -455,6 +519,7 @@
type string;
}
+ uses manotypes:rpc-project-name;
}
}
diff --git a/rwlaunchpad/plugins/yang/rw-project-person-db.yang b/rwlaunchpad/plugins/yang/rw-project-person-db.yang
new file mode 100644
index 0000000..7339b65
--- /dev/null
+++ b/rwlaunchpad/plugins/yang/rw-project-person-db.yang
@@ -0,0 +1,52 @@
+/*
+ *
+ * Copyright 2017 RIFT.IO Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ *
+ */
+
+
+module rw-project-person-db
+{
+ namespace "http://riftio.com/ns/riftware-1.0/rw-project-person-db";
+ prefix "rw-project-person-db";
+
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ revision 2016-04-03 {
+ description
+ "Initial revision.
+ Test YANG for unit testing.";
+ }
+
+ augment "/rw-project:project" {
+ container person {
+
+ leaf name {
+ description
+ "This is the person's name.";
+ type string;
+ }
+ }
+
+ container flat-person {
+ leaf name {
+ type string;
+ }
+ }
+ }
+}
diff --git a/rwlaunchpad/plugins/yang/rw-resource-mgr.tailf.yang b/rwlaunchpad/plugins/yang/rw-resource-mgr.tailf.yang
index 6b6e8b1..a70088e 100644
--- a/rwlaunchpad/plugins/yang/rw-resource-mgr.tailf.yang
+++ b/rwlaunchpad/plugins/yang/rw-resource-mgr.tailf.yang
@@ -1,7 +1,7 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,11 +32,15 @@
prefix tailf;
}
- tailf:annotate "/rw-resource-mgr:resource-pool-records" {
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ tailf:annotate "/rw-project:project/rw-resource-mgr:resource-pool-records" {
tailf:callpoint rw_callpoint;
}
- tailf:annotate "/rw-resource-mgr:resource-mgmt" {
+ tailf:annotate "/rw-project:project/rw-resource-mgr:resource-mgmt" {
tailf:callpoint rw_callpoint;
}
}
diff --git a/rwlaunchpad/plugins/yang/rw-resource-mgr.yang b/rwlaunchpad/plugins/yang/rw-resource-mgr.yang
index 9bf914a..49e2036 100644
--- a/rwlaunchpad/plugins/yang/rw-resource-mgr.yang
+++ b/rwlaunchpad/plugins/yang/rw-resource-mgr.yang
@@ -1,7 +1,7 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,10 +24,6 @@
namespace "http://riftio.com/ns/riftware-1.0/rw-resource-mgr";
prefix "rw-resource-mgr";
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import rw-cli-ext {
prefix "rwcli";
}
@@ -37,7 +33,7 @@
}
import rw-cloud {
- prefix "rwcloud";
+ prefix "rw-cloud";
}
import rwcal {
@@ -52,6 +48,19 @@
prefix "manotypes";
}
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ import rw-project-mano {
+ prefix "rw-project-mano";
+ }
+
+ revision 2017-02-08 {
+ description
+ "Update model to support projects.";
+ }
+
revision 2015-10-16 {
description
"Initial revision.";
@@ -60,8 +69,6 @@
grouping resource-pool-info {
leaf name {
description "Name of the resource pool";
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
type string;
//mandatory true;
}
@@ -90,31 +97,29 @@
}
- container resource-mgr-config {
- description "Data model for configuration of resource-mgr";
- rwpb:msg-new ResourceManagerConfig;
- config true;
+ augment "/rw-project:project" {
+ container resource-mgr-config {
+ description "Data model for configuration of resource-mgr";
+ config true;
- container management-domain {
- leaf name {
- description "The management domain name this launchpad is associated with.";
- rwpb:field-inline "true";
- rwpb:field-string-max 64;
- type string;
- //mandatory true;
- }
- }
-
- container resource-pools {
- description "Resource Pool configuration";
- rwpb:msg-new ResourcePools;
- list cloud-account {
- key "name";
+ container management-domain {
leaf name {
- description
- "Resource pool for the configured cloud account";
- type leafref {
- path "/rwcloud:cloud/rwcloud:account/rwcloud:name";
+ description "The management domain name this launchpad is associated with.";
+ type string;
+ //mandatory true;
+ }
+ }
+
+ container resource-pools {
+ description "Resource Pool configuration";
+ list cloud-account {
+ key "name";
+ leaf name {
+ description
+ "Resource pool for the configured cloud account";
+ type leafref {
+ path "../../../../rw-cloud:cloud/rw-cloud:account/rw-cloud:name";
+ }
}
}
}
@@ -136,146 +141,96 @@
}
}
- container resource-mgmt {
- description "Resource management ";
- config false;
+ augment "/rw-project:project" {
+ container resource-mgmt {
+ description "Resource management ";
+ config false;
- container vdu-event {
- description "Events for VDU Management";
- rwpb:msg-new VDUEvent;
+ container vdu-event {
+ description "Events for VDU Management";
+
+ list vdu-event-data {
+ key "event-id";
- list vdu-event-data {
- rwpb:msg-new VDUEventData;
- key "event-id";
-
- leaf event-id {
- description "Identifier associated with the VDU transaction";
- type yang:uuid;
- }
-
- leaf cloud-account {
- description "The cloud account to use for this resource request";
- type leafref {
- path "/rwcloud:cloud/rwcloud:account/rwcloud:name";
+ leaf event-id {
+ description "Identifier associated with the VDU transaction";
+ type yang:uuid;
}
- }
- container request-info {
- description "Information about required resource";
-
- uses rwcal:vdu-create-params;
- }
-
- container resource-info {
- description "Information about allocated resource";
- leaf pool-name {
- type string;
+ leaf cloud-account {
+ description "The cloud account to use for this resource request";
+ type leafref {
+ path "../../../../rw-cloud:cloud/rw-cloud:account/rw-cloud:name";
+ }
}
- uses resource-state;
- uses rwcal:vdu-info-params;
+
+ container request-info {
+ description "Information about required resource";
+
+ uses rwcal:vdu-create-params;
+ }
+
+ container resource-info {
+ description "Information about allocated resource";
+ leaf pool-name {
+ type string;
+ }
+ uses resource-state;
+ uses rwcal:vdu-info-params;
+ }
}
}
- }
- container vlink-event {
- description "Events for Virtual Link management";
- rwpb:msg-new VirtualLinkEvent;
+ container vlink-event {
+ description "Events for Virtual Link management";
+
+ list vlink-event-data {
+
+ key "event-id";
- list vlink-event-data {
- rwpb:msg-new VirtualLinkEventData;
-
- key "event-id";
-
- leaf event-id {
- description "Identifier associated with the Virtual Link transaction";
- type yang:uuid;
- }
-
- leaf cloud-account {
- description "The cloud account to use for this resource request";
- type leafref {
- path "/rwcloud:cloud/rwcloud:account/rwcloud:name";
+ leaf event-id {
+ description "Identifier associated with the Virtual Link transaction";
+ type yang:uuid;
}
- }
- container request-info {
- description "Information about required resource";
-
- uses rwcal:virtual-link-create-params;
- }
-
- container resource-info {
- leaf pool-name {
- type string;
+ leaf cloud-account {
+ description "The cloud account to use for this resource request";
+ type leafref {
+ path "../../../../rw-cloud:cloud/rw-cloud:account/rw-cloud:name";
+ }
}
- uses resource-state;
- uses rwcal:virtual-link-info-params;
+
+ container request-info {
+ description "Information about required resource";
+
+ uses rwcal:virtual-link-create-params;
+ }
+
+ container resource-info {
+ leaf pool-name {
+ type string;
+ }
+ uses resource-state;
+ uses rwcal:virtual-link-info-params;
+ }
}
}
}
}
- container resource-pool-records {
- description "Resource Pool Records";
- rwpb:msg-new ResourcePoolRecords;
- config false;
+ augment "/rw-project:project" {
+ container resource-pool-records {
+ description "Resource Pool Records";
+ config false;
- list cloud-account {
- key "name";
- leaf name {
- description
- "The configured cloud account's pool records.";
- type leafref {
- path "/rwcloud:cloud/rwcloud:account/rwcloud:name";
- }
- }
-
- list records {
- rwpb:msg-new ResourceRecordInfo;
+ list cloud-account {
key "name";
- uses resource-pool-info;
-
- leaf pool-status {
- type enumeration {
- enum unknown;
- enum locked;
- enum unlocked;
- }
- }
-
- leaf total-resources {
- type uint32;
- }
-
- leaf free-resources {
- type uint32;
- }
-
- leaf allocated-resources {
- type uint32;
- }
- }
- }
- }
-
-
- container resource-mgr-data{
- description "Resource Manager operational data";
- config false;
-
- container pool-record {
- description "Resource Pool record";
-
- list cloud {
- key "name";
- max-elements 16;
- rwpb:msg-new "ResmgrCloudPoolRecords";
leaf name {
description
"The configured cloud account's pool records.";
type leafref {
- path "/rwcloud:cloud/rwcloud:account/rwcloud:name";
+ path "../../../rw-cloud:cloud/rw-cloud:account/rw-cloud:name";
}
}
@@ -283,27 +238,81 @@
key "name";
uses resource-pool-info;
- list free-vdu-list {
- key vdu-id;
- uses rwcal:vdu-info-params;
+ leaf pool-status {
+ type enumeration {
+ enum unknown;
+ enum locked;
+ enum unlocked;
+ }
}
- list in-use-vdu-list {
- key vdu-id;
- uses rwcal:vdu-info-params;
+ leaf total-resources {
+ type uint32;
}
- list free-vlink-list {
- key virtual-link-id;
- uses rwcal:virtual-link-info-params;
+ leaf free-resources {
+ type uint32;
}
- list in-use-vlink-list {
- key virtual-link-id;
- uses rwcal:virtual-link-info-params;
+ leaf allocated-resources {
+ type uint32;
}
}
}
}
}
+
+
+ augment "/rw-project:project" {
+ container resource-mgr-data {
+ description "Resource Manager operational data";
+ config false;
+
+ container pool-record {
+ description "Resource Pool record";
+
+ list cloud {
+ key "name";
+ max-elements 16;
+ leaf name {
+ description
+ "The configured cloud account's pool records.";
+ type leafref {
+ path "../../../../rw-cloud:cloud/rw-cloud:account/rw-cloud:name";
+ }
+ }
+
+ list records {
+ key "name";
+ uses resource-pool-info;
+
+ list free-vdu-list {
+ key vdu-id;
+ uses rwcal:vdu-info-params;
+ }
+
+ list in-use-vdu-list {
+ key vdu-id;
+ uses rwcal:vdu-info-params;
+ }
+
+ list free-vlink-list {
+ key virtual-link-id;
+ uses rwcal:virtual-link-info-params;
+ }
+
+ list in-use-vlink-list {
+ key virtual-link-id;
+ uses rwcal:virtual-link-info-params;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ augment "/rw-project:project/resource-mgmt/vdu-event/vdu-event-data/request-info/vm-flavor" {
+ uses manotypes:vm-flavor-name;
+ }
+
}
diff --git a/rwlaunchpad/plugins/yang/rw-staging-mgmt.role.xml b/rwlaunchpad/plugins/yang/rw-staging-mgmt.role.xml
new file mode 100644
index 0000000..d9a13f7
--- /dev/null
+++ b/rwlaunchpad/plugins/yang/rw-staging-mgmt.role.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<config xmlns="http://riftio.com/ns/riftware-1.0/rw-rbac-role-def">
+ <key-definition>
+ <role>rw-project-mano:rw-staging-mgmt-role</role>
+ <key-set>
+ <name>project-name</name>
+ <path>/rw-project:project/rw-project:name</path>
+ </key-set>
+ </key-definition>
+
+ <role-definition>
+ <role>rw-project-mano:catalog-oper</role>
+ <keys-role>rw-project-mano:rw-staging-mgmt-role</keys-role>
+ <authorize>
+ <permissions>read execute</permissions>
+ <path>/rw-project:project/rw-staging-mgmt:staging-areas</path>
+ <path>/rw-staging-mgmt:create-staging-area</path>
+ </authorize>
+ </role-definition>
+
+ <role-definition>
+ <role>rw-project-mano:catalog-admin</role>
+ <keys-role>rw-project-mano:rw-staging-mgmt-role</keys-role>
+ <authorize>
+ <permissions>create read update delete execute</permissions>
+ <path>/rw-project:project/rw-staging-mgmt:staging-areas</path>
+ <path>/rw-staging-mgmt:create-staging-area</path>
+ </authorize>
+ </role-definition>
+
+ <role-definition>
+ <role>rw-project:project-admin</role>
+ <keys-role>rw-project-mano:rw-staging-mgmt-role</keys-role>
+ <authorize>
+ <permissions>create read update delete execute</permissions>
+ <path>/rw-staging-mgmt:create-staging-area</path>
+ </authorize>
+ </role-definition>
+</config>
diff --git a/rwlaunchpad/plugins/yang/rw-staging-mgmt.tailf.yang b/rwlaunchpad/plugins/yang/rw-staging-mgmt.tailf.yang
index 9b35ff4..382515f 100644
--- a/rwlaunchpad/plugins/yang/rw-staging-mgmt.tailf.yang
+++ b/rwlaunchpad/plugins/yang/rw-staging-mgmt.tailf.yang
@@ -1,7 +1,7 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,11 +31,15 @@
prefix tailf;
}
+ import rw-project {
+ prefix "rw-project";
+ }
+
tailf:annotate "/rw-staging-mgmt:create-staging-area" {
tailf:actionpoint rw_actionpoint;
}
- tailf:annotate "/rw-staging-mgmt:staging-areas" {
+ tailf:annotate "/rw-project:project/rw-staging-mgmt:staging-areas" {
tailf:callpoint rw_callpoint;
}
diff --git a/rwlaunchpad/plugins/yang/rw-staging-mgmt.yang b/rwlaunchpad/plugins/yang/rw-staging-mgmt.yang
index d5722cd..fa3028c 100644
--- a/rwlaunchpad/plugins/yang/rw-staging-mgmt.yang
+++ b/rwlaunchpad/plugins/yang/rw-staging-mgmt.yang
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016-2017 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,10 +33,6 @@
prefix "yang";
}
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import rw-cli-ext {
prefix "rwcli";
}
@@ -53,6 +49,19 @@
prefix "manotypes";
}
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ import rw-project-mano {
+ prefix "rw-project-mano";
+ }
+
+ revision 2017-02-08 {
+ description
+ "Update model to support projects.";
+ }
+
revision 2016-06-01 {
description
"Initial revision.";
@@ -81,6 +90,13 @@
type uint64;
default 3600;
}
+
+ leaf project-name {
+ description "Project to which this belongs";
+ type leafref {
+ path "/rw-project:project/rw-project:name";
+ }
+ }
}
grouping staging-area-meta {
@@ -112,26 +128,25 @@
}
- container staging-areas {
- rwpb:msg-new StagingAreas;
- description "Staging Areas";
- config false;
+ augment "/rw-project:project" {
+ container staging-areas {
+ description "Staging Areas";
+ config false;
- list staging-area {
- rwpb:msg-new StagingArea;
- key "area-id";
+ list staging-area {
+ key "area-id";
- leaf area-id {
- description "Staging Area ID";
- type string;
+ leaf area-id {
+ description "Staging Area ID";
+ type string;
+ }
+
+ uses staging-area-config;
+ uses staging-area-meta;
}
-
- uses staging-area-config;
- uses staging-area-meta;
}
}
-
rpc create-staging-area {
description "Creates a staging area for the upload.";
diff --git a/rwlaunchpad/plugins/yang/rw-vnfm.yang b/rwlaunchpad/plugins/yang/rw-vnfm.yang
index 25e1abb..dc83a4c 100644
--- a/rwlaunchpad/plugins/yang/rw-vnfm.yang
+++ b/rwlaunchpad/plugins/yang/rw-vnfm.yang
@@ -47,8 +47,8 @@
prefix "rw-vns";
}
- import rw-vnfd {
- prefix "rw-vnfd";
+ import rw-project-vnfd {
+ prefix "rw-project-vnfd";
}
import rw-vnfr {
@@ -71,6 +71,10 @@
prefix "rw-launchpad";
}
+ import rw-project-mano {
+ prefix "rw-project-mano";
+ }
+
revision 2015-10-07 {
description
"Initial revision.";
diff --git a/rwlaunchpad/plugins/yang/rw-vns.yang b/rwlaunchpad/plugins/yang/rw-vns.yang
index 8dc63bb..6f84d68 100644
--- a/rwlaunchpad/plugins/yang/rw-vns.yang
+++ b/rwlaunchpad/plugins/yang/rw-vns.yang
@@ -31,11 +31,6 @@
namespace "http://riftio.com/ns/riftware-1.0/rw-vns";
prefix "rw-vns";
-
- import rw-pb-ext {
- prefix "rwpb";
- }
-
import rw-cli-ext {
prefix "rwcli";
}
@@ -89,6 +84,10 @@
prefix "rw-sdn";
}
+ import rw-project-mano {
+ prefix "rw-project-mano";
+ }
+
revision 2015-10-05 {
description
"Initial revision.";
diff --git a/rwlaunchpad/ra/CMakeLists.txt b/rwlaunchpad/ra/CMakeLists.txt
index cd07b92..0ab32dc 100644
--- a/rwlaunchpad/ra/CMakeLists.txt
+++ b/rwlaunchpad/ra/CMakeLists.txt
@@ -21,45 +21,96 @@
install(
PROGRAMS
+ pingpong_accounts_systest
pingpong_longevity_systest
pingpong_vnf_systest
pingpong_records_systest
pingpong_vnf_reload_systest
pingpong_lp_ha_systest
pingpong_recovery_systest
+ pingpong_floating_ip
pingpong_scaling_systest
+ pingpong_ha_systest
+ pingpong_mro_systest
+ pingpong_input_params_systest
+ primitives_systest
+ onboard_delete_vnfs_systest
+ accounts_creation_onboard_instatiate_systest
+ accounts_creation_onboard_instatiate_systest_repeat_option
+ accounts_creation_onboard_systest
scaling_systest
DESTINATION usr/rift/systemtest/pingpong_vnf
- COMPONENT ${PKG_LONG_NAME})
+ )
install(
PROGRAMS
multi_vm_vnf_slb_systest.sh
multi_vm_vnf_trafgen_systest.sh
DESTINATION usr/rift/systemtest/multi_vm_vnf
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ PROGRAMS
+ rbac_basics_systest
+ rbac_identity
+ rbac_roles_systest
+ rbac_usage_scenarios_systest
+ rbac_mano_xpaths_access
+ tbac_token
+ complex_scaling
+ DESTINATION usr/rift/systemtest/rbac
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ PROGRAMS
+ gui_test_launchpad_ui
+ DESTINATION usr/rift/systemtest/gui_tests
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ PROGRAMS
+ ha_basics_systest
+ ha_multiple_failovers_systest
+ DESTINATION usr/rift/systemtest/ha
COMPONENT ${PKG_LONG_NAME})
install(
+ PROGRAMS
+ accounts_creation_onboard_instatiate_systest
+ l2port_chaining_systest
+ metadata_vdud_systest
+ ns_instantiate_memory_check_systest
+ DESTINATION usr/rift/systemtest/mano
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
FILES
pytest/multivm_vnf/conftest.py
pytest/multivm_vnf/test_multi_vm_vnf_slb.py
pytest/multivm_vnf/test_multi_vm_vnf_trafgen.py
pytest/multivm_vnf/test_trafgen_data.py
DESTINATION usr/rift/systemtest/pytest/multi_vm_vnf
- COMPONENT ${PKG_LONG_NAME})
+ COMPONENT ${INSTALL_COMPONENT}
+ )
install(
PROGRAMS
launchpad_longevity_systest
launchpad_systest
DESTINATION usr/rift/systemtest/launchpad
- COMPONENT ${PKG_LONG_NAME})
+ COMPONENT ${INSTALL_COMPONENT}
+ )
install(
FILES
racfg/multi_tenant_systest_openstack.racfg
DESTINATION usr/rift/systemtest/launchpad
- COMPONENT ${PKG_LONG_NAME})
+ COMPONENT ${INSTALL_COMPONENT}
+ )
install(
FILES
@@ -69,44 +120,196 @@
pytest/test_start_standby.py
pytest/test_failover.py
DESTINATION usr/rift/systemtest/pytest/system
- COMPONENT ${PKG_LONG_NAME})
+ COMPONENT ${INSTALL_COMPONENT}
+ )
install(
FILES
pytest/ns/conftest.py
pytest/ns/test_onboard.py
+ pytest/ns/test_multiple_ns_instantiation.py
DESTINATION usr/rift/systemtest/pytest/system/ns
- COMPONENT ${PKG_LONG_NAME})
+ COMPONENT ${INSTALL_COMPONENT}
+ )
install(
FILES
+ pytest/ns/pingpong/test_accounts_framework.py
+ pytest/ns/pingpong/test_floating_ip.py
+ pytest/ns/pingpong/test_ha_pingpong.py
pytest/ns/pingpong/test_pingpong.py
pytest/ns/pingpong/test_pingpong_longevity.py
pytest/ns/pingpong/test_records.py
pytest/ns/pingpong/test_scaling.py
+ pytest/ns/pingpong/test_mro_pingpong.py
+ pytest/ns/pingpong/test_input_params.py
DESTINATION usr/rift/systemtest/pytest/system/ns/pingpong
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ FILES
+ pytest/ns/rbac/conftest.py
+ pytest/ns/rbac/test_rbac.py
+ pytest/ns/rbac/test_rbac_roles.py
+ pytest/ns/rbac/test_rbac_identity.py
+ pytest/ns/rbac/test_tbac_token.py
+ pytest/ns/rbac/test_rbac_usages.py
+ pytest/ns/rbac/test_rbac_mano_xpath_access.py
+ DESTINATION usr/rift/systemtest/pytest/system/ns/rbac
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ FILES
+ pytest/ns/ha/conftest.py
+ pytest/ns/ha/test_ha_basic.py
+ pytest/ns/ha/test_ha_operations.py
+ pytest/ns/ha/test_ha_multiple_failovers.py
+ DESTINATION usr/rift/systemtest/pytest/system/ns/ha
COMPONENT ${PKG_LONG_NAME})
install(
FILES
+ pytest/ns/gui_tests/conftest.py
+ pytest/ns/gui_tests/test_launchpad_ui.py
+ DESTINATION usr/rift/systemtest/pytest/system/ns/gui_tests
+ COMPONENT ${PKG_LONG_NAME})
+
+install(
+ FILES
+ pytest/ns/restapitest/test_project_restapi.py
+ DESTINATION usr/rift/systemtest/pytest/system/ns/restapitest
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ FILES
+ pytest/ns/restapitest/utils/__init__.py
+ pytest/ns/restapitest/utils/imports.py
+ pytest/ns/restapitest/utils/tbac_token_utils.py
+ pytest/ns/restapitest/utils/traversal_engine.py
+ pytest/ns/restapitest/utils/utils.py
+ DESTINATION usr/rift/systemtest/pytest/system/ns/restapitest/utils
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ FILES
+ pytest/ns/restapitest/test_inputs/test_inputs.json
+ DESTINATION usr/rift/systemtest/pytest/system/ns/restapitest/test_inputs
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ FILES
pytest/ns/haproxy/test_scaling.py
DESTINATION usr/rift/systemtest/pytest/system/ns/haproxy
- COMPONENT ${PKG_LONG_NAME})
+ COMPONENT ${INSTALL_COMPONENT}
+ )
install(
FILES
+ racfg/pingpong_accounts_systest.racfg
racfg/pingpong_vnf_systest_cloudsim.racfg
racfg/pingpong_vnf_systest_openstack.racfg
racfg/pingpong_scaling_systest_openstack.racfg
+ racfg/pingpong_ha_systest_openstack.racfg
racfg/pingpong_records_systest_cloudsim.racfg
racfg/pingpong_records_systest_openstack.racfg
racfg/pingpong_records_systest_openstack_xml.racfg
racfg/pingpong_vnf_reload_systest_openstack.racfg
racfg/pingpong_vnf_reload_systest_openstack_xml.racfg
+ racfg/pingpong_staticip_systest_openstack.racfg
+ racfg/pingpong_staticip_systest_openstack_ipv6.racfg
+ racfg/pingpong_portsecurity_systest_openstack.racfg
+ racfg/pingpong_port_sequencing_systest_openstack.racfg
+ racfg/pingpong_port_sequencing_systest_openstack_xml.racfg
+ racfg/pingpong_vnf_dependencies_systest_openstack.racfg
+ racfg/pingpong_vnf_dependencies_systest_openstack_xml.racfg
+ racfg/pingpong_input_params_systest.racfg
+ racfg/pingpong_mro_systest.racfg
+ racfg/primitives_systest.racfg
+ racfg/pingpong_floating_ip.racfg
racfg/scaling_systest.racfg
racfg/recovery_systest.racfg
racfg/pingpong_lp_ha_systest_openstack.racfg
+ racfg/pingpong_update_descriptors_instantiate_systest_openstack.racfg
+ racfg/onboard_delete_vnfs_systest_openstack.racfg
+ racfg/pingpong_metadata_vdud_systest_openstack.racfg
+ racfg/pingpong_multidisk_systest_openstack.racfg
+ racfg/pingpong_multidisk_systest_openstack_xml.racfg
+ racfg/embedded_images_vnf_multiple_accounts_systest_openstack.racfg
DESTINATION usr/rift/systemtest/pingpong_vnf
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ FILES
+ racfg/l2port_chaining_systest_openstack.racfg
+ racfg/metadata_vdud_systest_openstack.racfg
+ racfg/ns_instantiate_memory_check.racfg
+ DESTINATION usr/rift/systemtest/mano
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ FILES
+ racfg/gui_test_launchpad_ui.racfg
+ DESTINATION usr/rift/systemtest/gui_tests
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ FILES
+ racfg/rbac_basics_systest.racfg
+ racfg/rbac_identity.racfg
+ racfg/rbac_user_roles_systest.racfg
+ racfg/rbac_project_roles_systest.racfg
+ racfg/rbac_account_roles_systest.racfg
+ racfg/rbac_nsr_roles_systest.racfg
+ racfg/rbac_onboarding_roles_systest.racfg
+ racfg/rbac_syslog_server_roles_systest.racfg
+ racfg/rbac_redundancy_config_roles_systest.racfg
+ racfg/rbac_usage_scenarios_systest.racfg
+ racfg/rbac_mano_xpaths_access.racfg
+ racfg/rbac_account_roles_systest_restconf.racfg
+ racfg/rbac_basics_systest_restconf.racfg
+ racfg/rbac_mano_xpaths_access_restconf.racfg
+ racfg/rbac_usage_scenarios_systest_restconf.racfg
+ racfg/tbac_basics_systest.racfg
+ racfg/tbac_identity.racfg
+ racfg/tbac_token.racfg
+ racfg/tbac_user_roles_systest.racfg
+ racfg/tbac_project_roles_systest.racfg
+ racfg/tbac_account_roles_systest.racfg
+ racfg/tbac_nsr_roles_systest.racfg
+ racfg/tbac_onboarding_roles_systest.racfg
+ racfg/tbac_syslog_server_roles_systest.racfg
+ racfg/tbac_usage_scenarios_systest.racfg
+ racfg/tbac_mano_xpaths_access.racfg
+ racfg/tbac_basics_systest_xml.racfg
+ racfg/tbac_identity_xml.racfg
+ racfg/tbac_token_xml.racfg
+ racfg/tbac_user_roles_systest_xml.racfg
+ racfg/tbac_project_roles_systest_xml.racfg
+ racfg/tbac_account_roles_systest_xml.racfg
+ racfg/tbac_nsr_roles_systest_xml.racfg
+ racfg/tbac_onboarding_roles_systest_xml.racfg
+ racfg/tbac_syslog_server_roles_systest_xml.racfg
+ racfg/tbac_usage_scenarios_systest_xml.racfg
+ racfg/tbac_mano_xpaths_access_xml.racfg
+ racfg/complex_scaling.racfg
+ DESTINATION usr/rift/systemtest/rbac
+ COMPONENT ${INSTALL_COMPONENT}
+ )
+
+install(
+ FILES
+ racfg/ha_basics_systest.racfg
+ racfg/ha_nsr_systest.racfg
+ racfg/ha_multiple_failovers_systest.racfg
+ DESTINATION usr/rift/systemtest/ha
COMPONENT ${PKG_LONG_NAME})
install(
@@ -114,4 +317,5 @@
racfg/multivm_vnf_slb_systest.racfg
racfg/multivm_vnf_trafgen_systest.racfg
DESTINATION usr/rift/systemtest/multi_vm_vnf
- COMPONENT ${PKG_LONG_NAME})
+ COMPONENT ${INSTALL_COMPONENT}
+ )
diff --git a/rwlaunchpad/ra/accounts_creation_onboard_instatiate_systest b/rwlaunchpad/ra/accounts_creation_onboard_instatiate_systest
new file mode 100755
index 0000000..d1bc8ac
--- /dev/null
+++ b/rwlaunchpad/ra/accounts_creation_onboard_instatiate_systest
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/test_onboard.py \
+ ${PYTEST_DIR}/system/ns/pingpong/test_records.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/accounts_creation_onboard_instatiate_systest_repeat_option b/rwlaunchpad/ra/accounts_creation_onboard_instatiate_systest_repeat_option
new file mode 100755
index 0000000..bef1148
--- /dev/null
+++ b/rwlaunchpad/ra/accounts_creation_onboard_instatiate_systest_repeat_option
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/test_onboard.py \
+ ${PYTEST_DIR}/system/ns/pingpong/test_records.py --repeat 2"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/accounts_creation_onboard_systest b/rwlaunchpad/ra/accounts_creation_onboard_systest
new file mode 100755
index 0000000..093180f
--- /dev/null
+++ b/rwlaunchpad/ra/accounts_creation_onboard_systest
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/test_onboard.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/complex_scaling b/rwlaunchpad/ra/complex_scaling
new file mode 100755
index 0000000..6792f57
--- /dev/null
+++ b/rwlaunchpad/ra/complex_scaling
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider -k 'test_complex_scaling' \
+ ${PYTEST_DIR}/system/ns/rbac/test_rbac_usages.py"
+
+REBOOT_SCRIPT_TEST="py.test -x -v -p no:cacheprovider -k 'test_complex_scaling_verification' \
+ ${PYTEST_DIR}/system/ns/rbac/test_rbac_usages.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/gui_test_launchpad_ui b/rwlaunchpad/ra/gui_test_launchpad_ui
new file mode 100755
index 0000000..01f8504
--- /dev/null
+++ b/rwlaunchpad/ra/gui_test_launchpad_ui
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/ns/gui_tests/test_launchpad_ui.py"
+
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/ha_basics_systest b/rwlaunchpad/ra/ha_basics_systest
new file mode 100755
index 0000000..00e2303
--- /dev/null
+++ b/rwlaunchpad/ra/ha_basics_systest
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider ${PYTEST_DIR}/system/ns/ha/test_ha_basic.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
\ No newline at end of file
diff --git a/rwlaunchpad/ra/ha_deletion_operations b/rwlaunchpad/ra/ha_deletion_operations
new file mode 100755
index 0000000..03f5670
--- /dev/null
+++ b/rwlaunchpad/ra/ha_deletion_operations
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider ${PYTEST_DIR}/system/ns/ha/test_ha_operations.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
\ No newline at end of file
diff --git a/rwlaunchpad/ra/ha_multiple_failovers_systest b/rwlaunchpad/ra/ha_multiple_failovers_systest
new file mode 100755
index 0000000..7b81b27
--- /dev/null
+++ b/rwlaunchpad/ra/ha_multiple_failovers_systest
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider ${PYTEST_DIR}/system/ns/ha/test_ha_multiple_failovers.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/l2port_chaining_systest b/rwlaunchpad/ra/l2port_chaining_systest
new file mode 100755
index 0000000..e2444cd
--- /dev/null
+++ b/rwlaunchpad/ra/l2port_chaining_systest
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/test_onboard.py \
+ ${PYTEST_DIR}/system/ns/pingpong/test_records.py::TestRecordsData::test_l2_port_chaining"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/metadata_vdud_systest b/rwlaunchpad/ra/metadata_vdud_systest
new file mode 100755
index 0000000..0aaa952
--- /dev/null
+++ b/rwlaunchpad/ra/metadata_vdud_systest
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/test_onboard.py \
+ ${PYTEST_DIR}/system/ns/pingpong/test_records.py::TestRecordsData::test_wait_for_ns_configured \
+ ${PYTEST_DIR}/system/ns/pingpong/test_records.py::TestRecordsData::test_metadata_vdud"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/ns_instantiate_memory_check_systest b/rwlaunchpad/ra/ns_instantiate_memory_check_systest
new file mode 100755
index 0000000..fb0638f
--- /dev/null
+++ b/rwlaunchpad/ra/ns_instantiate_memory_check_systest
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/test_onboard.py::TestNsrStart::test_upload_images \
+ ${PYTEST_DIR}/system/ns/test_multiple_ns_instantiation.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/onboard_delete_vnfs_systest b/rwlaunchpad/ra/onboard_delete_vnfs_systest
new file mode 100755
index 0000000..02daba9
--- /dev/null
+++ b/rwlaunchpad/ra/onboard_delete_vnfs_systest
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/test_onboard.py::TestNsrStart::test_upload_delete_descriptors"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/pingpong_accounts_systest b/rwlaunchpad/ra/pingpong_accounts_systest
new file mode 100755
index 0000000..7286cf2
--- /dev/null
+++ b/rwlaunchpad/ra/pingpong_accounts_systest
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Author(s): Paul Laidler
+# Creation Date: 2017/06/21
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+restconf=true
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/pingpong/test_accounts_framework.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/pingpong_floating_ip b/rwlaunchpad/ra/pingpong_floating_ip
new file mode 100755
index 0000000..2baba5a
--- /dev/null
+++ b/rwlaunchpad/ra/pingpong_floating_ip
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/ns/pingpong/test_floating_ip.py"
+
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
\ No newline at end of file
diff --git a/rwlaunchpad/ra/pingpong_ha_systest b/rwlaunchpad/ra/pingpong_ha_systest
new file mode 100755
index 0000000..831c01f
--- /dev/null
+++ b/rwlaunchpad/ra/pingpong_ha_systest
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Copyright 2016 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Author(s): Paul Laidler
+# Creation Date: 2017/04/27
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+SCRIPT_TEST="py.test -x -s -p no:cacheprovider \
+ ${PYTEST_DIR}/system/ns/pingpong/test_ha_pingpong.py"
+
+test_prefix="pingpong_ha_systest"
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
+exit $?
+
diff --git a/rwlaunchpad/ra/pingpong_input_params_systest b/rwlaunchpad/ra/pingpong_input_params_systest
new file mode 100755
index 0000000..66710cc
--- /dev/null
+++ b/rwlaunchpad/ra/pingpong_input_params_systest
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# Copyright 2016 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Author(s): Paul Laidler
+# Creation Date: 2017/06/22
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/pingpong/test_input_params.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/pingpong_mro_systest b/rwlaunchpad/ra/pingpong_mro_systest
new file mode 100755
index 0000000..c6da5df
--- /dev/null
+++ b/rwlaunchpad/ra/pingpong_mro_systest
@@ -0,0 +1,40 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Author(s): Paul Laidler
+# Creation Date: 2017/06/21
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+restconf=true
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/pingpong/test_mro_pingpong.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/pingpong_scaling_systest b/rwlaunchpad/ra/pingpong_scaling_systest
index eca3ee6..9696fb4 100755
--- a/rwlaunchpad/ra/pingpong_scaling_systest
+++ b/rwlaunchpad/ra/pingpong_scaling_systest
@@ -37,6 +37,9 @@
# Parse commonline argument and set test variables
parse_args "${@}"
+# We want to run in expanded mode
+collapsed_mode=false
+
# Construct the test command based on the test variables
construct_test_command
@@ -44,7 +47,10 @@
cd "${PYTEST_DIR}"
eval ${test_cmd}
+test_rc=$?
# display scaling log
scaling_log="${RIFT_ARTIFACTS}/scaling_${AUTO_TASK_ID}.log"
cat ${scaling_log}
+
+exit $test_rc
diff --git a/rwlaunchpad/ra/pingpong_vnf_reload_systest b/rwlaunchpad/ra/pingpong_vnf_reload_systest
index 609b1d4..6a09ac9 100755
--- a/rwlaunchpad/ra/pingpong_vnf_reload_systest
+++ b/rwlaunchpad/ra/pingpong_vnf_reload_systest
@@ -26,7 +26,7 @@
${PYTEST_DIR}/system/ns/test_onboard.py \
${PYTEST_DIR}/system/ns/pingpong/test_records.py"
-REBOOT_SCRIPT_TEST="py.test -x -v -p no:cacheprovider -k 'test_wait_for_launchpad_started or test_wait_for_pingpong_configured or test_wait_for_pingpong_configured or Teardown' \
+REBOOT_SCRIPT_TEST="py.test -x -v -p no:cacheprovider -k 'test_wait_for_nsr_started or test_wait_for_nsr_configured or Teardown' \
${PYTEST_DIR}/system/test_launchpad.py \
${PYTEST_DIR}/system/ns/test_onboard.py \
${PYTEST_DIR}/system/ns/pingpong/test_records.py"
diff --git a/rwlaunchpad/ra/primitives_systest b/rwlaunchpad/ra/primitives_systest
new file mode 100755
index 0000000..0408d7c
--- /dev/null
+++ b/rwlaunchpad/ra/primitives_systest
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/test_launchpad.py \
+ ${PYTEST_DIR}/system/ns/test_onboard.py \
+ ${PYTEST_DIR}/system/ns/pingpong/test_records.py::TestRecordsData::test_primitives"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/pytest/conftest.py b/rwlaunchpad/ra/pytest/conftest.py
index 80d739f..35a91d7 100644
--- a/rwlaunchpad/ra/pytest/conftest.py
+++ b/rwlaunchpad/ra/pytest/conftest.py
@@ -15,21 +15,61 @@
# limitations under the License.
#
-import pytest
+import gi
+import itertools
+import logging
import os
+import pytest
+import random
+import re
+import rwlogger
+import rw_peas
import subprocess
import sys
+import rift.auto.accounts
import rift.auto.log
import rift.auto.session
-import rift.vcs.vcs
import rift.rwcal.openstack
-import logging
+import rift.vcs.vcs
-import gi
-gi.require_version('RwCloudYang', '1.0')
+from gi import require_version
+require_version('RwCloudYang', '1.0')
+require_version('RwTypes', '1.0')
+require_version('RwRbacPlatformYang', '1.0')
+require_version('RwUserYang', '1.0')
+require_version('RwProjectYang', '1.0')
+require_version('RwConmanYang', '1.0')
+require_version('RwRbacInternalYang', '1.0')
+require_version('RwRoAccountYang', '1.0')
-from gi.repository import RwCloudYang
+from gi.repository import (
+ RwCloudYang,
+ RwTypes,
+ RwUserYang,
+ RwProjectYang,
+ RwRbacPlatformYang,
+ RwConmanYang,
+ RwRbacInternalYang,
+ RwRoAccountYang
+)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+@pytest.fixture(scope='session')
+def use_accounts():
+ account_names = os.environ.get('RW_AUTO_ACCOUNTS')
+ if account_names:
+ return account_names.split(":")
+ return []
+
+@pytest.fixture(scope='session')
+def account_storage():
+ return rift.auto.accounts.Storage()
+
+@pytest.fixture(scope='session')
+def stored_accounts(account_storage):
+ return account_storage.list_cloud_accounts()
@pytest.fixture(scope='session')
def cloud_name_prefix():
@@ -37,9 +77,9 @@
return 'cloud'
@pytest.fixture(scope='session')
-def cloud_account_name(cloud_name_prefix):
+def cloud_account_name(cloud_account):
'''fixture which returns the name used to identify the cloud account'''
- return '{prefix}-0'.format(prefix=cloud_name_prefix)
+ return cloud_account.name
@pytest.fixture(scope='session')
def sdn_account_name():
@@ -47,6 +87,11 @@
return 'sdn-0'
@pytest.fixture(scope='session')
+def openstack_sdn_account_name():
+ '''fixture which returns the name used to identify the sdn account'''
+ return 'openstack-sdn-0'
+
+@pytest.fixture(scope='session')
def sdn_account_type():
'''fixture which returns the account type used by the sdn account'''
return 'odl'
@@ -65,87 +110,405 @@
Returns:
xpath to be used when configure a cloud account
'''
- return '/cloud/account'
+ return '/rw-project:project[rw-project:name="default"]/cloud/account'
@pytest.fixture(scope='session')
-def cloud_accounts(cloud_module, cloud_name_prefix, cloud_host, cloud_user, cloud_tenants, cloud_type):
+def cloud_accounts(request, cloud_module, cloud_name_prefix, cloud_host, cloud_user, cloud_tenants, cloud_type, stored_accounts, use_accounts, vim_host_override, vim_ssl_enabled, vim_user_domain_override, vim_project_domain_override, logger):
'''fixture which returns a list of CloudAccounts. One per tenant provided
Arguments:
- cloud_module - fixture: module defining cloud account
- cloud_name_prefix - fixture: name prefix used for cloud account
- cloud_host - fixture: cloud host address
- cloud_user - fixture: cloud account user key
- cloud_tenants - fixture: list of tenants to create cloud accounts on
- cloud_type - fixture: cloud account type
+ cloud_module - fixture: module defining cloud account
+ cloud_name_prefix - fixture: name prefix used for cloud account
+ cloud_host - fixture: cloud host address
+ cloud_user - fixture: cloud account user key
+ cloud_tenants - fixture: list of tenants to create cloud accounts on
+ cloud_type - fixture: cloud account type
+ stored_accounts - fixture: account storage
+ use_accounts - fixture: use accounts from account storage
+ vim_host_override - fixture: use specified vim instead of account's vim
+ vim_ssl_enabled - fixture: enable or disable ssl regardless of accounts setting
+ vim_user_domain_override - fixture: use specified user domain instead of account's user domain
+ vim_project_domain_override - fixture: use specified project domain instead of account's project domain
Returns:
A list of CloudAccounts
'''
- accounts = []
- for idx, cloud_tenant in enumerate(cloud_tenants):
- cloud_account_name = "{prefix}-{idx}".format(prefix=cloud_name_prefix, idx=idx)
- if cloud_type == 'lxc':
- accounts.append(
- cloud_module.CloudAccount.from_dict({
- "name": cloud_account_name,
- "account_type": "cloudsim_proxy"})
- )
- elif cloud_type == 'openstack':
- password = 'mypasswd'
- auth_url = 'http://{cloud_host}:5000/v3/'.format(cloud_host=cloud_host)
- mgmt_network = os.getenv('MGMT_NETWORK', 'private')
- accounts.append(
- cloud_module.CloudAccount.from_dict({
- 'name': cloud_account_name,
- 'account_type': 'openstack',
- 'openstack': {
- 'admin': True,
- 'key': cloud_user,
- 'secret': password,
- 'auth_url': auth_url,
- 'tenant': cloud_tenant,
- 'mgmt_network': mgmt_network}})
- )
- elif cloud_type == 'mock':
- accounts.append(
- cloud_module.CloudAccount.from_dict({
- "name": cloud_account_name,
- "account_type": "mock"})
- )
+
+ accounts = []
+
+ if use_accounts:
+ for account_name in stored_accounts:
+ if account_name in use_accounts:
+ if vim_host_override and stored_accounts[account_name].account_type == 'openstack':
+ old_auth = stored_accounts[account_name].openstack.auth_url
+ stored_accounts[account_name].openstack.auth_url = re.sub('(?:(?<=https://)|(?<=http://)).*?(?=:)', vim_host_override, old_auth)
+ if vim_ssl_enabled == False:
+ stored_accounts[account_name].openstack.auth_url = re.sub(
+ '^https',
+ 'http',
+ stored_accounts[account_name].openstack.auth_url
+ )
+ elif vim_ssl_enabled == True:
+ stored_accounts[account_name].openstack.auth_url = re.sub(
+ '^http(?=:)',
+ 'https',
+ stored_accounts[account_name].openstack.auth_url
+ )
+ if vim_user_domain_override:
+ stored_accounts[account_name].openstack.user_domain = vim_user_domain_override
+ if vim_project_domain_override:
+ stored_accounts[account_name].openstack.project_domain = vim_project_domain_override
+ accounts.append(stored_accounts[account_name])
+ else:
+ def account_name_generator(prefix):
+ '''Generator of unique account names for a given prefix
+ Arguments:
+ prefix - prefix of account name
+ '''
+ idx=0
+ while True:
+ yield "{prefix}-{idx}".format(prefix=prefix, idx=idx)
+ idx+=1
+ name_gen = account_name_generator(cloud_name_prefix)
+
+ for cloud_tenant in cloud_tenants:
+ if cloud_type == 'lxc':
+ accounts.append(
+ cloud_module.CloudAcc.from_dict({
+ "name": next(name_gen),
+ "account_type": "cloudsim_proxy"})
+ )
+ elif cloud_type == 'openstack':
+ hosts = [cloud_host]
+ if request.config.option.upload_images_multiple_accounts:
+ hosts.append('10.66.4.32')
+ for host in hosts:
+ password = 'mypasswd'
+ auth_url = 'http://{host}:5000/v3/'.format(host=host)
+ if vim_ssl_enabled == True:
+ auth_url = 'https://{host}:5000/v3/'.format(host=host)
+ mgmt_network = os.getenv('MGMT_NETWORK', 'private')
+ accounts.append(
+ cloud_module.YangData_RwProject_Project_Cloud_Account.from_dict({
+ 'name': next(name_gen),
+ 'account_type': 'openstack',
+ 'openstack': {
+ 'admin': True,
+ 'key': cloud_user,
+ 'secret': password,
+ 'auth_url': auth_url,
+ 'tenant': cloud_tenant,
+ 'mgmt_network': mgmt_network,
+ 'floating_ip_pool': 'public',
+ }}))
+ elif cloud_type == 'mock':
+ accounts.append(
+ cloud_module.CloudAcc.from_dict({
+ "name": next(name_gen),
+ "account_type": "mock"})
+ )
return accounts
@pytest.fixture(scope='session', autouse=True)
def cloud_account(cloud_accounts):
- '''fixture which returns an instance of CloudAccount
+ '''fixture which returns an instance of RwCloudYang.CloudAcc
Arguments:
cloud_accounts - fixture: list of generated cloud accounts
Returns:
- An instance of CloudAccount
+ An instance of RwCloudYang.CloudAcc
'''
return cloud_accounts[0]
@pytest.fixture(scope='class')
-def openstack_client(cloud_host, cloud_user, cloud_tenant):
- """Fixture which returns a session to openstack host.
+def vim_clients(cloud_accounts):
+ """Fixture which returns sessions to VIMs"""
+ vim_sessions = {}
+ for cloud_account in cloud_accounts:
+ if cloud_account.account_type == 'openstack':
+ vim_sessions[cloud_account.name] = rift.rwcal.openstack.OpenstackDriver(**{
+ 'username': cloud_account.openstack.key,
+ 'password': cloud_account.openstack.secret,
+ 'auth_url': cloud_account.openstack.auth_url,
+ 'project': cloud_account.openstack.tenant,
+ 'mgmt_network': cloud_account.openstack.mgmt_network,
+ 'cert_validate': cloud_account.openstack.cert_validate,
+ 'user_domain': cloud_account.openstack.user_domain,
+ 'project_domain': cloud_account.openstack.project_domain,
+ 'region': cloud_account.openstack.region
+ })
+ # Add initialization for other VIM types
+ return vim_sessions
- Returns:
- Session to an openstack host.
- """
- password = 'mypasswd'
- auth_url = 'http://{cloud_host}:5000/v3/'.format(cloud_host=cloud_host)
- mgmt_network = os.getenv('MGMT_NETWORK', 'private')
- return rift.rwcal.openstack.OpenstackDriver(**{'username': cloud_user,
- 'password': password,
- 'auth_url': auth_url,
- 'project' : cloud_tenant,
- 'mgmt_network': mgmt_network,
- 'cert_validate': False,
- 'user_domain': 'Default',
- 'project_domain':'Default',
- 'region': 'RegionOne'})
+@pytest.fixture(scope='session')
+def openmano_prefix():
+ '''Fixture that returns the prefix to be used for openmano resource names'''
+ return 'openmano'
+
+@pytest.fixture(scope='session')
+def openmano_hosts(sut_host_names):
+ '''Fixture that returns the set of host logical names to be used for openmano'''
+ return [name for name in sut_host_names if 'openmano' in name]
+
+@pytest.fixture(scope='session')
+def openmano_accounts(openmano_hosts, sut_host_addrs, cloud_accounts, openmano_prefix, logger):
+ """Fixture that returns a list of Openmano accounts. One per host, and tenant provided"""
+ accounts=[]
+
+ if not openmano_hosts:
+ return accounts
+
+ host_cycle = itertools.cycle(openmano_hosts)
+ for cloud_account in cloud_accounts:
+ if cloud_account.account_type not in ['openstack']:
+ logger.warning('Skipping creating ro datacenter for cloud account [%s] - unsupported account type [%s]', cloud_account.name, cloud_account.account_type)
+ continue
+
+ try:
+ host = next(host_cycle)
+ except StopIteration:
+ break
+
+ if cloud_account.account_type == 'openstack':
+ accounts.append({
+ 'account_name': "vim_%s" % cloud_account.name,
+ 'openmano_tenant': host,
+ 'openmano_addr': sut_host_addrs[host],
+ 'openmano_port': 9090,
+ 'datacenter': 'dc_%s' % (cloud_account.name),
+ 'vim_account': cloud_account,
+ 'vim_name': cloud_account.name,
+ 'vim_type': cloud_account.account_type,
+ 'vim_auth_url': cloud_account.openstack.auth_url,
+ 'vim_user':cloud_account.openstack.key,
+ 'vim_password':cloud_account.openstack.secret,
+ 'vim_tenant':cloud_account.openstack.tenant,
+ })
+
+ return accounts
+
+@pytest.fixture(scope='session')
+def ro_account_info(openmano_accounts):
+ ro_account_info = {}
+ for account in openmano_accounts:
+ ssh_cmd = (
+ 'ssh {openmano_addr} -q -n -o BatchMode=yes -o StrictHostKeyChecking=no -- '
+ ).format(
+ openmano_addr=account['openmano_addr']
+ )
+
+ if account['account_name'] not in ro_account_info:
+ tenant_create_cmd = (
+ '{ssh_cmd} openmano tenant-create {name}'
+ ).format(
+ ssh_cmd=ssh_cmd,
+ name=account['account_name']
+ )
+ tenant_info = subprocess.check_output(tenant_create_cmd, shell=True).decode('ascii')
+ (tenant_id, tenant_name) = tenant_info.split()
+ ro_account_info[account['account_name']] = {
+ 'tenant_id':tenant_id,
+ 'account': account,
+ 'account_type':'openmano',
+ 'host':account['openmano_addr'],
+ 'port':9090,
+ 'datacenters':[],
+ }
+ else:
+ tenant_id = ro_account_info[account['account_name']]['tenant_id']
+
+ datacenter_create_cmd = (
+ '{ssh_cmd} openmano datacenter-create --type {vim_type} {datacenter} {vim_auth_url}'
+ ).format(
+ ssh_cmd=ssh_cmd,
+ vim_type=account['vim_type'],
+ datacenter=account['datacenter'],
+ vim_auth_url=account['vim_auth_url']
+ )
+ datacenter_attach_cmd = (
+ '{ssh_cmd} OPENMANO_TENANT={tenant_id} openmano datacenter-attach {datacenter} --user={vim_user} '
+ '--password={vim_password} --vim-tenant-name={vim_tenant}'
+ ).format(
+ ssh_cmd=ssh_cmd,
+ tenant_id=tenant_id,
+ datacenter=account['datacenter'],
+ vim_user=account['vim_user'],
+ vim_password=account['vim_password'],
+ vim_tenant=account['vim_tenant']
+ )
+ subprocess.check_call(datacenter_create_cmd, shell=True)
+ subprocess.check_call(datacenter_attach_cmd, shell=True)
+
+ ro_account_info[account['account_name']]['datacenters'].append(account['datacenter'])
+ return ro_account_info
+
+
+@pytest.fixture(scope='session')
+def ro_accounts(ro_account_info):
+ '''Fixture that returns a map of RwRoAccountYang.ROAccount objects for each
+ account in ro_account_info
+ '''
+ ro_accounts = {}
+ for name, account_info in ro_account_info.items():
+ ro_accounts[name] = RwRoAccountYang.YangData_RwProject_Project_RoAccount_Account.from_dict({
+ 'name':name,
+ 'ro_account_type':account_info['account_type'],
+ 'openmano':{
+ 'host':account_info['host'],
+ 'port':account_info['port'],
+ 'tenant_id':account_info['tenant_id'],
+ }
+ })
+ return ro_accounts
+
+@pytest.fixture(scope='session')
+def ro_map(ro_account_info, ro_accounts):
+ '''Fixture that returns a map of vim name to datacenter / ro name tuples for each account in ro_account_info
+ '''
+ ro_map = {}
+ for account_name, account_info in ro_account_info.items():
+ vim_name = account_info['account']['vim_account'].name
+ datacenter_name = account_info['account']['datacenter']
+ ro_map[vim_name] = (account_name, datacenter_name)
+ return ro_map
+
+@pytest.fixture(scope='session')
+def cal(cloud_account):
+ """Fixture which returns cal interface"""
+ if cloud_account.account_type == 'openstack':
+ plugin = rw_peas.PeasPlugin('rwcal_openstack', 'RwCal-1.0')
+ elif cloud_account.account_type == 'openvim':
+ plugin = rw_peas.PeasPlugin('rwcal_openmano_vimconnector', 'RwCal-1.0')
+ elif cloud_account.account_type == 'aws':
+ plugin = rw_peas.PeasPlugin('rwcal_aws', 'RwCal-1.0')
+ elif cloud_account.account_type == 'vsphere':
+ plugin = rw_peas.PeasPlugin('rwcal-python', 'RwCal-1.0')
+
+ engine, info, extension = plugin()
+ cal = plugin.get_interface("Cloud")
+ rwloggerctx = rwlogger.RwLog.Ctx.new("Cal-Log")
+ rc = cal.init(rwloggerctx)
+ assert rc == RwTypes.RwStatus.SUCCESS
+
+ return cal
+
+@pytest.fixture(scope='session')
+def rbac_user_passwd():
+ """A common password being used for all rbac users."""
+ return 'mypasswd'
+
+@pytest.fixture(scope='session')
+def user_domain(tbac):
+ """user-domain being used in this rbac test."""
+ if tbac:
+ return 'tbacdomain'
+ return 'system'
+
+@pytest.fixture(scope='session')
+def platform_roles():
+ """Returns a tuple of platform roles"""
+ return ('rw-rbac-platform:platform-admin', 'rw-rbac-platform:platform-oper', 'rw-rbac-platform:super-admin')
+
+@pytest.fixture(scope='session')
+def user_roles():
+ """Returns a tuple of user roles"""
+ return ('rw-project:project-admin', 'rw-project:project-oper', 'rw-project-mano:catalog-oper', 'rw-project-mano:catalog-admin',
+ 'rw-project-mano:lcm-admin', 'rw-project-mano:lcm-oper', 'rw-project-mano:account-admin', 'rw-project-mano:account-oper',)
+
+@pytest.fixture(scope='session')
+def all_roles(platform_roles, user_roles):
+ """Returns a tuple of platform roles plus user roles"""
+ return platform_roles + user_roles
+
+@pytest.fixture(scope='session')
+def rw_user_proxy(mgmt_session):
+ return mgmt_session.proxy(RwUserYang)
+
+@pytest.fixture(scope='session')
+def rw_project_proxy(mgmt_session):
+ return mgmt_session.proxy(RwProjectYang)
+
+@pytest.fixture(scope='session')
+def rw_rbac_int_proxy(mgmt_session):
+ return mgmt_session.proxy(RwRbacInternalYang)
+
+@pytest.fixture(scope='session')
+def rw_ro_account_proxy(mgmt_session):
+ return mgmt_session.proxy(RwRoAccountYang)
+
+@pytest.fixture(scope='session')
+def rw_conman_proxy(mgmt_session):
+ return mgmt_session.proxy(RwConmanYang)
+
+@pytest.fixture(scope='session')
+def rbac_platform_proxy(mgmt_session):
+ return mgmt_session.proxy(RwRbacPlatformYang)
+
+@pytest.fixture(scope='session')
+def project_keyed_xpath():
+ return '/project[name={project_name}]'
+
+@pytest.fixture(scope='session')
+def user_keyed_xpath():
+ return "/user-config/user[user-name={user}][user-domain={domain}]"
+
+@pytest.fixture(scope='session')
+def platform_config_keyed_xpath():
+ return "/rbac-platform-config/user[user-name={user}][user-domain={domain}]"
+
+@pytest.fixture(scope='session')
+def fmt_vnfd_catalog_xpath():
+ """Fixture that returns vnfd-catalog keyed xpath"""
+ xpath = '/project[name={project}]/vnfd-catalog'
+ return xpath
+
+@pytest.fixture(scope='session')
+def fmt_vnfd_id_xpath():
+ """Fixture that returns vnfd id xpath"""
+ xpath = '/rw-project:project[rw-project:name={project}]/project-vnfd:vnfd-catalog/project-vnfd:vnfd[project-vnfd:id={vnfd_id}]'
+ return xpath
+
+@pytest.fixture(scope='session')
+def fmt_nsd_catalog_xpath():
+ """Fixture that returns nsd-catalog keyed xpath"""
+ xpath = '/project[name={project}]/nsd-catalog'
+ return xpath
+
+@pytest.fixture(scope='session')
+def fmt_nsd_id_xpath():
+ """Fixture that returns nsd id xpath"""
+ xpath = '/rw-project:project[rw-project:name={project}]/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id={nsd_id}]'
+ return xpath
+
+@pytest.fixture(scope='session')
+def fmt_prefixed_cloud_xpath():
+ """Fixture that returns cloud keyed xpath"""
+ xpath = '/rw-project:project[rw-project:name={project}]/rw-cloud:cloud/rw-cloud:account[rw-cloud:name={account_name}]'
+ return xpath
+
+@pytest.fixture(scope='session')
+def fmt_cloud_xpath():
+ """Fixture that returns cloud keyed xpath without yang prefix"""
+ xpath = '/project[name={project}]/cloud/account[name={account_name}]'
+ return xpath
+
+@pytest.fixture(scope='session', autouse=True)
+def launchpad_glance_api_log():
+ log_file = os.path.join(
+ os.environ.get('HOME_RIFT', os.environ.get('RIFT_INSTALL')),
+ 'var','rift','log','glance','glance-api.log'
+ )
+ return log_file
+
+@pytest.fixture(scope='session', autouse=True)
+def _glance_api_scraper_session(request, log_manager, confd_host, launchpad_glance_api_log):
+ '''Fixture which returns an instance of rift.auto.log.FileSource to scrape
+ the glance api logs of the launchpad host
+ '''
+ scraper = rift.auto.log.FileSource(host=confd_host, path=launchpad_glance_api_log)
+ log_manager.source(source=scraper)
+ return scraper
diff --git a/rwlaunchpad/ra/pytest/multivm_vnf/conftest.py b/rwlaunchpad/ra/pytest/multivm_vnf/conftest.py
index a3c565b..b8dcf6c 100644
--- a/rwlaunchpad/ra/pytest/multivm_vnf/conftest.py
+++ b/rwlaunchpad/ra/pytest/multivm_vnf/conftest.py
@@ -1,5 +1,5 @@
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,13 +23,13 @@
import tempfile
from gi.repository import (
- NsdYang,
+ ProjectNsdYang as NsdYang,
NsrYang,
RwNsrYang,
RwVnfrYang,
VnfrYang,
VldYang,
- RwVnfdYang,
+ RwProjectVnfdYang as RwVnfdYang,
RwLaunchpadYang,
RwBaseYang
)
diff --git a/rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_slb.py b/rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_slb.py
index 557518b..69a9716 100755
--- a/rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_slb.py
+++ b/rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_slb.py
@@ -22,6 +22,7 @@
@brief Scriptable load-balancer test with multi-vm VNFs
"""
+import gi
import json
import logging
import os
@@ -33,15 +34,17 @@
import uuid
from gi.repository import (
- NsdYang,
+ RwProjectNsdYang,
NsrYang,
RwNsrYang,
VnfrYang,
VldYang,
- RwVnfdYang,
+ RwProjectVnfdYang,
RwLaunchpadYang,
RwBaseYang
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
import rift.auto.mano
@@ -71,7 +74,7 @@
Return:
NSR object
"""
- nsr = RwNsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsr = RwNsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = rift.auto.mano.resource_name(nsr.id)
@@ -80,7 +83,7 @@
nsr.nsd_ref = nsd_id
nsr.admin_status = "ENABLED"
nsr.input_parameter.extend(input_param_list)
- nsr.cloud_account = cloud_account_name
+ nsr.datacenter = cloud_account_name
return nsr
@@ -103,10 +106,10 @@
pass
-def wait_onboard_transaction_finished(logger, transaction_id, timeout=10, host="127.0.0.1"):
+def wait_onboard_transaction_finished(logger, transaction_id, timeout=10, host="127.0.0.1", project="default"):
logger.info("Waiting for onboard trans_id %s to complete", transaction_id)
def check_status_onboard_status():
- uri = 'http://%s:4567/api/upload/%s/state' % (host, transaction_id)
+ uri = 'http://%s:8008/api/operational/project/%s/create-jobs/job/%s' % (host, project, transaction_id)
curl_cmd = 'curl --insecure {uri}'.format(
uri=uri
)
@@ -151,7 +154,7 @@
trans_id = upload_descriptor(logger, trafgen_vnfd_package_file, launchpad_host)
wait_onboard_transaction_finished(logger, trans_id, host=launchpad_host)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 1, "There should only be a single vnfd"
vnfd = vnfds[0]
@@ -163,7 +166,7 @@
trans_id = upload_descriptor(logger, trafsink_vnfd_package_file, launchpad_host)
wait_onboard_transaction_finished(logger, trans_id, host=launchpad_host)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 2, "There should be two vnfds"
assert "multivm_trafsink_vnfd" in [vnfds[0].name, vnfds[1].name]
@@ -174,7 +177,7 @@
trans_id = upload_descriptor(logger, slb_vnfd_package_file, launchpad_host)
wait_onboard_transaction_finished(logger, trans_id, host=launchpad_host)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 3, "There should be two vnfds"
assert "multivm_slb_vnfd" in [vnfds[0].name, vnfds[1].name]
@@ -184,7 +187,7 @@
trans_id = upload_descriptor(logger, multi_vm_vnf_nsd_package_file, launchpad_host)
wait_onboard_transaction_finished(logger, trans_id, host=launchpad_host)
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsds = catalog.nsd
assert len(nsds) == 1, "There should only be a single nsd"
nsd = nsds[0]
@@ -206,15 +209,15 @@
config_param.value,
running_nsr_config.input_parameter))
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
input_parameters = []
- descr_xpath = "/nsd:nsd-catalog/nsd:nsd[nsd:id='%s']/nsd:description" % nsd.id
+ descr_xpath = "/rw-project:project/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id=%s]/project-nsd:description" % quoted_key(nsd.id)
descr_value = "New NSD Description"
in_param_id = str(uuid.uuid4())
- input_param_1= NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter(
+ input_param_1= NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter(
xpath=descr_xpath,
value=descr_value)
@@ -223,20 +226,20 @@
nsr = create_nsr(nsd.id, input_parameters, cloud_account_name)
logger.info("Instantiating the Network Service")
- rwnsr_proxy.create_config('/ns-instance-config/nsr', nsr)
+ rwnsr_proxy.create_config('/rw-project:project[rw-project:name="default"]/ns-instance-config/nsr', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
# Verify the input parameter configuration
- running_config = rwnsr_proxy.get_config("/ns-instance-config/nsr[id='%s']" % nsr.id)
+ running_config = rwnsr_proxy.get_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id=%s]" % quoted_key(nsr.id))
for input_param in input_parameters:
verify_input_parameters(running_config, input_param)
assert len(nsrs) == 1
assert nsrs[0].ns_instance_config_ref == nsr.id
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/operational-status".format(nsr.id)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/operational-status".format(quoted_key(nsr.id))
rwnsr_proxy.wait_for(xpath, "running", fail_on=['failed'], timeout=360)
@@ -254,11 +257,11 @@
"""
logger.debug("Terminating Multi VM VNF's NSR")
- nsr_path = "/ns-instance-config"
+ nsr_path = "/rw-project:project[rw-project:name='default']/ns-instance-config"
nsr = rwnsr_proxy.get_config(nsr_path)
ping_pong = nsr.nsr[0]
- rwnsr_proxy.delete_config("/ns-instance-config/nsr[id='{}']".format(ping_pong.id))
+ rwnsr_proxy.delete_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id={}]".format(quoted_key(ping_pong.id)))
time.sleep(30)
@@ -268,19 +271,19 @@
Asserts:
The records are deleted.
"""
- nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
for nsd in nsds.nsd:
- xpath = "/nsd-catalog/nsd[id='{}']".format(nsd.id)
+ xpath = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd[id={}]".format(quoted_key(nsd.id))
nsd_proxy.delete_config(xpath)
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
for vnfd_record in vnfds.vnfd:
- xpath = "/vnfd-catalog/vnfd[id='{}']".format(vnfd_record.id)
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_record.id))
vnfd_proxy.delete_config(xpath)
time.sleep(5)
- nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
assert nsds is None or len(nsds.nsd) == 0
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
assert vnfds is None or len(vnfds.vnfd) == 0
diff --git a/rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_trafgen.py b/rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_trafgen.py
index ca6e9b5..4c030d7 100755
--- a/rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_trafgen.py
+++ b/rwlaunchpad/ra/pytest/multivm_vnf/test_multi_vm_vnf_trafgen.py
@@ -22,6 +22,7 @@
@brief Scriptable load-balancer test with multi-vm VNFs
"""
+import gi
import json
import logging
import os
@@ -33,15 +34,17 @@
import uuid
from gi.repository import (
- NsdYang,
+ RwProjectNsdYang,
NsrYang,
RwNsrYang,
VnfrYang,
VldYang,
- RwVnfdYang,
+ RwProjectVnfdYang,
RwLaunchpadYang,
RwBaseYang
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
import rift.auto.mano
@@ -78,7 +81,7 @@
Return:
NSR object
"""
- nsr = RwNsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsr = RwNsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = rift.auto.mano.resource_name(nsr.id)
@@ -87,7 +90,7 @@
nsr.nsd_ref = nsd_id
nsr.admin_status = "ENABLED"
nsr.input_parameter.extend(input_param_list)
- nsr.cloud_account = cloud_account_name
+ nsr.datacenter = cloud_account_name
return nsr
@@ -110,10 +113,10 @@
pass
-def wait_onboard_transaction_finished(logger, transaction_id, timeout=10, host="127.0.0.1"):
+def wait_onboard_transaction_finished(logger, transaction_id, timeout=10, host="127.0.0.1", project="default"):
logger.info("Waiting for onboard trans_id %s to complete", transaction_id)
def check_status_onboard_status():
- uri = 'http://%s:4567/api/upload/%s/state' % (host, transaction_id)
+ uri = 'http://%s:8008/api/operational/project/%s/create-jobs/job/%s' % (host, project, transaction_id)
curl_cmd = 'curl --insecure {uri}'.format(
uri=uri
)
@@ -158,7 +161,7 @@
trans_id = upload_descriptor(logger, trafgen_vnfd_package_file, launchpad_host)
wait_onboard_transaction_finished(logger, trans_id, host=launchpad_host)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 1, "There should only be a single vnfd"
vnfd = vnfds[0]
@@ -170,7 +173,7 @@
trans_id = upload_descriptor(logger, trafsink_vnfd_package_file, launchpad_host)
wait_onboard_transaction_finished(logger, trans_id, host=launchpad_host)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 2, "There should be two vnfds"
assert "multivm_trafsink_vnfd" in [vnfds[0].name, vnfds[1].name]
@@ -180,7 +183,7 @@
trans_id = upload_descriptor(logger, multi_vm_vnf_nsd_package_file, launchpad_host)
wait_onboard_transaction_finished(logger, trans_id, host=launchpad_host)
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsds = catalog.nsd
assert len(nsds) == 1, "There should only be a single nsd"
nsd = nsds[0]
@@ -202,15 +205,15 @@
config_param.value,
running_nsr_config.input_parameter))
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
input_parameters = []
- descr_xpath = "/nsd:nsd-catalog/nsd:nsd[nsd:id='%s']/nsd:description" % nsd.id
+ descr_xpath = "/rw-project:project/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id=%s]/project-nsd:description" % quoted_key(nsd.id)
descr_value = "New NSD Description"
in_param_id = str(uuid.uuid4())
- input_param_1= NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter(
+ input_param_1= NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter(
xpath=descr_xpath,
value=descr_value)
@@ -219,20 +222,20 @@
nsr = create_nsr(nsd.id, input_parameters, cloud_account_name)
logger.info("Instantiating the Network Service")
- rwnsr_proxy.create_config('/ns-instance-config/nsr', nsr)
+ rwnsr_proxy.create_config('/rw-project:project[rw-project:name="default"]/ns-instance-config/nsr', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
# Verify the input parameter configuration
- running_config = rwnsr_proxy.get_config("/ns-instance-config/nsr[id='%s']" % nsr.id)
+ running_config = rwnsr_proxy.get_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id=%s]" % quoted_key(nsr.id))
for input_param in input_parameters:
verify_input_parameters(running_config, input_param)
assert len(nsrs) == 1
assert nsrs[0].ns_instance_config_ref == nsr.id
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/operational-status".format(nsr.id)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/operational-status".format(quoted_key(nsr.id))
rwnsr_proxy.wait_for(xpath, "running", fail_on=['failed'], timeout=360)
@@ -250,11 +253,11 @@
"""
logger.debug("Terminating Multi VM VNF's NSR")
- nsr_path = "/ns-instance-config"
+ nsr_path = "/rw-project:project[rw-project:name='default']/ns-instance-config"
nsr = rwnsr_proxy.get_config(nsr_path)
ping_pong = nsr.nsr[0]
- rwnsr_proxy.delete_config("/ns-instance-config/nsr[id='{}']".format(ping_pong.id))
+ rwnsr_proxy.delete_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id={}]".format(quoted_key(ping_pong.id)))
time.sleep(30)
@@ -264,19 +267,19 @@
Asserts:
The records are deleted.
"""
- nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
for nsd in nsds.nsd:
- xpath = "/nsd-catalog/nsd[id='{}']".format(nsd.id)
+ xpath = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd[id={}]".format(quoted_key(nsd.id))
nsd_proxy.delete_config(xpath)
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
for vnfd_record in vnfds.vnfd:
- xpath = "/vnfd-catalog/vnfd[id='{}']".format(vnfd_record.id)
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_record.id))
vnfd_proxy.delete_config(xpath)
time.sleep(5)
- nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
assert nsds is None or len(nsds.nsd) == 0
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
assert vnfds is None or len(vnfds.vnfd) == 0
diff --git a/rwlaunchpad/ra/pytest/multivm_vnf/test_trafgen_data.py b/rwlaunchpad/ra/pytest/multivm_vnf/test_trafgen_data.py
index 197e95c..958df6e 100644
--- a/rwlaunchpad/ra/pytest/multivm_vnf/test_trafgen_data.py
+++ b/rwlaunchpad/ra/pytest/multivm_vnf/test_trafgen_data.py
@@ -22,6 +22,7 @@
@brief Scriptable load-balancer test with multi-vm VNFs
"""
+import gi
import ipaddress
import pytest
import re
@@ -37,11 +38,13 @@
RwVnfBaseConfigYang,
RwTrafgenYang
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
@pytest.fixture(scope='session')
def trafgen_vnfr(request, rwvnfr_proxy, session_type):
- vnfr = "/vnfr-catalog/vnfr"
+ vnfr = "/rw-project:project[rw-project:name='default']/vnfr-catalog/vnfr"
vnfrs = rwvnfr_proxy.get(vnfr, list_obj=True)
for vnfr in vnfrs.vnfr:
if 'trafgen' in vnfr.short_name:
@@ -94,7 +97,7 @@
Arguments:
vnf_name - vnf name of configuration
'''
- xpath = "/vnf-config/vnf[name='%s'][instance='0']" % vnf_name
+ xpath = "/rw-project:project[rw-project:name='default']/vnf-config/vnf[name=%s][instance='0']" % quoted_key(vnf_name)
for _ in range(24):
tg_config = tgcfg_proxy.get_config(xpath)
if tg_config is not None:
@@ -154,8 +157,8 @@
'''
return (int(current_sample) - int(previous_sample)) > threshold
- xpath = "/vnf-opdata/vnf[name='{}'][instance='0']/port-state[portname='{}']/counters/{}"
- vnfdata_proxy.wait_for_interval(xpath.format(vnf_name, port_name, 'input-packets'),
+ xpath = "/rw-project:project[rw-project:name='default']/vnf-opdata/vnf[name={}][instance='0']/port-state[portname={}]/counters/{}"
+ vnfdata_proxy.wait_for_interval(xpath.format(quoted_key(vnf_name), quoted_key(port_name), quoted_key('input-packets')),
value_incremented, timeout=timeout, interval=interval)
@@ -178,8 +181,8 @@
'''
return (int(current_sample) - int(previous_sample)) < threshold
- xpath = "/vnf-opdata/vnf[name='{}'][instance='0']/port-state[portname='{}']/counters/{}"
- vnfdata_proxy.wait_for_interval(xpath.format(vnf_name, port_name, 'input-packets'), value_unchanged, timeout=timeout, interval=interval)
+ xpath = "/rw-project:project[rw-project:name='default']/vnf-opdata/vnf[name={}][instance='0']/port-state[portname={}]/counters/{}"
+ vnfdata_proxy.wait_for_interval(xpath.format(quoted_key(vnf_name), quoted_key(port_name), quoted_key('input-packets')), value_unchanged, timeout=timeout, interval=interval)
@pytest.mark.depends('multivmvnf')
@pytest.mark.incremental
diff --git a/rwlaunchpad/ra/pytest/ns/conftest.py b/rwlaunchpad/ra/pytest/ns/conftest.py
index a1fa446..a2a9434 100644
--- a/rwlaunchpad/ra/pytest/ns/conftest.py
+++ b/rwlaunchpad/ra/pytest/ns/conftest.py
@@ -22,19 +22,41 @@
import tempfile
import shutil
import subprocess
+import random
import gi
+import rift.auto.descriptor
import rift.auto.session
-import rift.mano.examples.ping_pong_nsd as ping_pong
+import rift.mano.examples.ping_pong_nsd as ping_pong_example
import rift.vcs.vcs
class PackageError(Exception):
pass
@pytest.fixture(scope='session', autouse=True)
-def cloud_account_name(request):
- '''fixture which returns the name used to identify the cloud account'''
- return 'cloud-0'
+def multidisk_testdata(request, descriptor_images, path_ping_image, path_pong_image):
+ """fixture which returns test data related to multidisk test"""
+
+ if not request.config.option.multidisk:
+ return None
+
+ iso_img, qcow2_img = [os.path.basename(image) for image in descriptor_images]
+
+ ping_ = {'vda': ['disk', 'virtio', 5, os.path.basename(path_ping_image), 0],
+ 'sda': ['cdrom', 'scsi', 5, iso_img, 1],
+ 'hda': ['disk', 'ide', 5, None, None],
+ }
+
+ pong_ = {'vda': ['disk', 'virtio', 5, os.path.basename(path_pong_image), 0],
+ 'hda': ['cdrom', 'ide', 5, iso_img, 1],
+ 'hdb': ['disk', 'ide', 5, qcow2_img, 2],
+ }
+ return ping_, pong_
+
+@pytest.fixture(scope='session')
+def port_sequencing_intf_positions():
+ """fixture which returns a list of ordered positions for pong interfaces related to port sequencing test"""
+ return random.sample(range(1, 2**32-1), 3)
@pytest.fixture(scope='session')
def ping_pong_install_dir():
@@ -116,6 +138,11 @@
return image_dirs
@pytest.fixture(scope='session')
+def random_image_name(image_dirs):
+ """Fixture which returns a random image name"""
+ return 'image_systemtest_{}.qcow2'.format(random.randint(100, 9999))
+
+@pytest.fixture(scope='session')
def image_paths(image_dirs):
''' Fixture containing a mapping of image names to their path images
@@ -147,12 +174,92 @@
'''
return image_paths["Fedora-x86_64-20-20131211.1-sda-pong.qcow2"]
+@pytest.fixture(scope='session')
+def rsyslog_userdata(rsyslog_host, rsyslog_port):
+ ''' Fixture providing rsyslog user data
+ Arguments:
+ rsyslog_host - host of the rsyslog process
+ rsyslog_port - port of the rsyslog process
+ '''
+ if rsyslog_host and rsyslog_port:
+ return '''
+rsyslog:
+ - "$ActionForwardDefaultTemplate RSYSLOG_ForwardFormat"
+ - "*.* @{host}:{port}"
+ '''.format(
+ host=rsyslog_host,
+ port=rsyslog_port,
+ )
+
+ return None
+
+@pytest.fixture(scope='session')
+def descriptors_pingpong_vnf_input_params():
+ return ping_pong_example.generate_ping_pong_descriptors(
+ pingcount=1,
+ nsd_name='pp_input_nsd',
+ vnfd_input_params=True,
+ )
+
+@pytest.fixture(scope='session')
+def packages_pingpong_vnf_input_params(descriptors_pingpong_vnf_input_params):
+ return rift.auto.descriptor.generate_descriptor_packages(descriptors_pingpong_vnf_input_params)
+
+@pytest.fixture(scope='session')
+def ping_script_userdata():
+ userdata = '''#cloud-config
+password: fedora
+chpasswd: { expire: False }
+ssh_pwauth: True
+runcmd:
+ - [ systemctl, daemon-reload ]
+ - [ systemctl, enable, {{ CI-script-init-data }}.service ]
+ - [ systemctl, start, --no-block, {{ CI-script-init-data }}.service ]
+ - [ ifup, eth1 ]
+'''
+ return userdata
+
+@pytest.fixture(scope='session')
+def pong_script_userdata():
+ userdata = '''#!/bin/bash
+sed 's/^.*PasswordAuthentication.*$/PasswordAuthentication yes/' < /etc/ssh/sshd_config > /etc/ssh/sshd_config
+systemctl daemon-reload
+systemctl enable {{ CI-script-init-data }}.service
+systemctl start --no-block {{ CI-script-init-data }}.service
+ifup eth1
+'''
+ return userdata
+
+@pytest.fixture(scope='session')
+def descriptors_pingpong_script_input_params(ping_script_userdata, pong_script_userdata):
+ return ping_pong_example.generate_ping_pong_descriptors(
+ pingcount=1,
+ nsd_name='pp_script_nsd',
+ script_input_params=True,
+ ping_userdata=ping_script_userdata,
+ pong_userdata=pong_script_userdata,
+ )
+
+@pytest.fixture(scope='session')
+def packages_pingpong_script_input_params(descriptors_pingpong_script_input_params):
+ return rift.auto.descriptor.generate_descriptor_packages(descriptors_pingpong_script_input_params)
+
class PingPongFactory:
- def __init__(self, path_ping_image, path_pong_image, rsyslog_host, rsyslog_port):
+ def __init__(self, path_ping_image, path_pong_image, static_ip, vnf_dependencies, rsyslog_userdata, port_security, metadata_vdud, multidisk, ipv6, port_sequencing, service_primitive):
+
self.path_ping_image = path_ping_image
self.path_pong_image = path_pong_image
- self.rsyslog_host = rsyslog_host
- self.rsyslog_port = rsyslog_port
+ self.rsyslog_userdata = rsyslog_userdata
+ self.static_ip = static_ip
+ self.service_primitive = service_primitive
+ self.use_vca_conf = vnf_dependencies
+ self.port_security = port_security
+ self.port_sequencing = port_sequencing
+ self.metadata_vdud = metadata_vdud
+ self.multidisk = multidisk
+ self.ipv6 = ipv6
+ if not port_security:
+ self.port_security = None # Not to disable port security if its not specific to --port-security feature.
def generate_descriptors(self):
'''Return a new set of ping and pong descriptors
@@ -167,32 +274,29 @@
ping_md5sum = md5sum(self.path_ping_image)
pong_md5sum = md5sum(self.path_pong_image)
- ex_userdata = None
- if self.rsyslog_host and self.rsyslog_port:
- ex_userdata = '''
-rsyslog:
- - "$ActionForwardDefaultTemplate RSYSLOG_ForwardFormat"
- - "*.* @{host}:{port}"
- '''.format(
- host=self.rsyslog_host,
- port=self.rsyslog_port,
- )
-
- descriptors = ping_pong.generate_ping_pong_descriptors(
+ descriptors = ping_pong_example.generate_ping_pong_descriptors(
pingcount=1,
ping_md5sum=ping_md5sum,
pong_md5sum=pong_md5sum,
- ex_ping_userdata=ex_userdata,
- ex_pong_userdata=ex_userdata,
+ ex_ping_userdata=self.rsyslog_userdata,
+ ex_pong_userdata=self.rsyslog_userdata,
+ use_static_ip=self.static_ip,
+ port_security=self.port_security,
+ explicit_port_seq=self.port_sequencing,
+ metadata_vdud=self.metadata_vdud,
+ use_vca_conf=self.use_vca_conf,
+ multidisk=self.multidisk,
+ use_ipv6=self.ipv6,
+ primitive_test=self.service_primitive,
)
return descriptors
@pytest.fixture(scope='session')
-def ping_pong_factory(path_ping_image, path_pong_image, rsyslog_host, rsyslog_port):
+def ping_pong_factory(path_ping_image, path_pong_image, static_ip, vnf_dependencies, rsyslog_userdata, port_security, metadata_vdud, multidisk_testdata, ipv6, port_sequencing, service_primitive):
'''Fixture returns a factory capable of generating ping and pong descriptors
'''
- return PingPongFactory(path_ping_image, path_pong_image, rsyslog_host, rsyslog_port)
+ return PingPongFactory(path_ping_image, path_pong_image, static_ip, vnf_dependencies, rsyslog_userdata, port_security, metadata_vdud, multidisk_testdata, ipv6, port_sequencing, service_primitive)
@pytest.fixture(scope='session')
def ping_pong_records(ping_pong_factory):
@@ -202,7 +306,7 @@
@pytest.fixture(scope='session')
-def descriptors(request, ping_pong_records):
+def descriptors(request, ping_pong_records, random_image_name):
def pingpong_descriptors(with_images=True):
"""Generated the VNFDs & NSD files for pingpong NS.
@@ -232,8 +336,7 @@
'images/Fedora-x86_64-20-20131211.1-sda-pong.qcow2')
for descriptor in [ping_vnfd, pong_vnfd, ping_pong_nsd]:
- descriptor.write_to_file(output_format='xml', outdir=tmpdir)
-
+ descriptor.write_to_file(output_format='yaml', outdir=tmpdir)
ping_img_path = os.path.join(tmpdir, "{}/images/".format(ping_vnfd.name))
pong_img_path = os.path.join(tmpdir, "{}/images/".format(pong_vnfd.name))
@@ -243,9 +346,13 @@
shutil.copy(ping_img, ping_img_path)
shutil.copy(pong_img, pong_img_path)
+ if request.config.option.upload_images_multiple_accounts:
+ with open(os.path.join(ping_img_path, random_image_name), 'wb') as image_bin_file:
+ image_bin_file.seek(1024*1024*512) # image file of size 512 MB
+ image_bin_file.write(b'0')
+
for dir_name in [ping_vnfd.name, pong_vnfd.name, ping_pong_nsd.name]:
subprocess.call([
- "sh",
"{rift_install}/usr/rift/toolchain/cmake/bin/generate_descriptor_pkg.sh".format(rift_install=os.environ['RIFT_INSTALL']),
tmpdir,
dir_name])
@@ -266,8 +373,43 @@
return files
+ def l2portchain_descriptors():
+ """L2 port chaining packages"""
+ files = [
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/vnffg_demo_nsd/vnffg_l2portchain_dpi_vnfd.tar.gz"),
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/vnffg_demo_nsd/vnffg_l2portchain_firewall_vnfd.tar.gz"),
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/vnffg_demo_nsd/vnffg_l2portchain_nat_vnfd.tar.gz"),
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/vnffg_demo_nsd/vnffg_l2portchain_pgw_vnfd.tar.gz"),
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/vnffg_demo_nsd/vnffg_l2portchain_router_vnfd.tar.gz"),
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/vnffg_demo_nsd/vnffg_l2portchain_sff_vnfd.tar.gz"),
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/vnffg_demo_nsd/vnffg_l2portchain_demo_nsd.tar.gz")
+ ]
+
+ return files
+
+ def metadata_vdud_cfgfile_descriptors():
+ """Metadata-vdud feature related packages"""
+ files = [
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/cfgfile/cirros_cfgfile_vnfd.tar.gz"),
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/cfgfile/fedora_cfgfile_vnfd.tar.gz"),
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/cfgfile/ubuntu_cfgfile_vnfd.tar.gz"),
+ os.path.join(os.getenv('RIFT_BUILD'), "modules/ext/vnfs/src/ext_vnfs-build/cfgfile/cfgfile_nsd.tar.gz")
+ ]
+
+ return files
+
+ if request.config.option.vnf_onboard_delete:
+ return haproxy_descriptors() + l2portchain_descriptors() + list(pingpong_descriptors())
+ if request.config.option.multiple_ns_instantiate:
+ return haproxy_descriptors() + metadata_vdud_cfgfile_descriptors() + list(pingpong_descriptors())
+ if request.config.option.l2_port_chaining:
+ return l2portchain_descriptors()
+ if request.config.option.metadata_vdud_cfgfile:
+ return metadata_vdud_cfgfile_descriptors()
if request.config.option.network_service == "pingpong":
return pingpong_descriptors()
+ elif request.config.option.ha_multiple_failovers:
+ return {'pingpong': pingpong_descriptors(), 'haproxy': haproxy_descriptors(), 'vdud_cfgfile': metadata_vdud_cfgfile_descriptors()}
elif request.config.option.network_service == "pingpong_noimg":
return pingpong_descriptors(with_images=False)
elif request.config.option.network_service == "haproxy":
@@ -286,7 +428,37 @@
return images
+ def l2portchain_images():
+ """HAProxy images."""
+ images = [os.path.join(os.getenv('RIFT_ROOT'), "images/ubuntu_trusty_1404.qcow2")]
+ return images
+
+ def multidisk_images():
+ images = [
+ os.path.join(os.getenv('RIFT_ROOT'), 'images/ubuntu-16.04-mini-64.iso'),
+ os.path.join(os.getenv('RIFT_ROOT'), "images/ubuntu_trusty_1404.qcow2"),
+ ]
+ return images
+
+ def metadata_vdud_cfgfile_images():
+ """Metadata-vdud feature related images."""
+ images = [
+ os.path.join(os.getenv('RIFT_ROOT'), "images/cirros-0.3.4-x86_64-disk.img"),
+ os.path.join(os.getenv('RIFT_ROOT'), "images/Fedora-x86_64-20-20131211.1-sda.qcow2"),
+ os.path.join(os.getenv('RIFT_ROOT'), "images/UbuntuXenial")
+ ]
+
+ return images
+
+ if request.config.option.l2_port_chaining:
+ return l2portchain_images()
+ if request.config.option.multidisk:
+ return multidisk_images()
+ if request.config.option.metadata_vdud_cfgfile:
+ return metadata_vdud_cfgfile_images()
if request.config.option.network_service == "haproxy":
return haproxy_images()
+ if request.config.option.multiple_ns_instantiate:
+ return haproxy_images() + metadata_vdud_cfgfile_images()
return []
diff --git a/rwlaunchpad/ra/pytest/ns/gui_tests/conftest.py b/rwlaunchpad/ra/pytest/ns/gui_tests/conftest.py
new file mode 100755
index 0000000..77261e9
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/gui_tests/conftest.py
@@ -0,0 +1,92 @@
+#!/usr/bin/env python
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import gi
+import pytest
+import os
+from pyvirtualdisplay import Display
+from selenium import webdriver
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.common.by import By
+
+gi.require_version('RwCloudYang', '1.0')
+gi.require_version('RwConfigAgentYang', '1.0')
+gi.require_version('RwSdnYang', '1.0')
+
+from gi.repository import (
+ RwSdnYang,
+ RwCloudYang,
+ RwConfigAgentYang,
+)
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+
+@pytest.fixture(scope='session')
+def cloud_proxy(mgmt_session):
+ """cloud_proxy."""
+ return mgmt_session.proxy(RwCloudYang)
+
+
+@pytest.fixture(scope='session')
+def sdn_proxy(mgmt_session):
+ """sdn_proxy."""
+ return mgmt_session.proxy(RwSdnYang)
+
+
+@pytest.fixture(scope='session')
+def config_agent_proxy(mgmt_session):
+ """config_agent_proxy."""
+ return mgmt_session.proxy(RwConfigAgentYang)
+
+
+@pytest.fixture(scope='session')
+def driver(request, confd_host, logger):
+ """Set up virtual diplay and browser driver."""
+ # Set up the virtual display
+ display = Display(visible=0, size=(1024, 768))
+ display.start()
+
+ logger.info("Initializing the chrome web driver")
+ root_dir = os.environ.get('RIFT_ROOT')
+ webdriver_path = '{}/chromedriver'.format(root_dir)
+ # webdriver_path = os.environ["webdriver.chrome.driver"]
+ # Something like this should be implemented.
+
+ driver_ = webdriver.Chrome(executable_path=webdriver_path)
+ driver_.implicitly_wait(5)
+ url = "http://{}:8000/".format(confd_host)
+ logger.info("Getting the URL {}".format(url))
+ driver_.get(url)
+ WebDriverWait(driver_, 10).until(
+ EC.presence_of_element_located((By.CLASS_NAME, "logo"))
+ )
+
+ logger.info("Signing into the Rift home page")
+ driver_.find_element_by_name("username").send_keys("admin")
+ driver_.find_element_by_name("password").send_keys("admin")
+ driver_.find_element_by_id("submit").click()
+ WebDriverWait(driver_, 10).until(
+ EC.presence_of_element_located((By.CLASS_NAME, "skyquakeNav"))
+ )
+
+ def teardown():
+ driver_.quit()
+ display.stop()
+
+ yield driver_
diff --git a/rwlaunchpad/ra/pytest/ns/gui_tests/test_launchpad_ui.py b/rwlaunchpad/ra/pytest/ns/gui_tests/test_launchpad_ui.py
new file mode 100755
index 0000000..dd4e32e
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/gui_tests/test_launchpad_ui.py
@@ -0,0 +1,114 @@
+#!/usr/bin/env python
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+import gi
+
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.common.by import By
+
+
+gi.require_version('RwUserYang', '1.0')
+gi.require_version('RwProjectYang', '1.0')
+gi.require_version('RwConmanYang', '1.0')
+
+from gi.repository import (
+ RwUserYang,
+ RwProjectYang,
+ RwConmanYang
+)
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+
+class TestGUI(object):
+ """TestGUI."""
+
+ def click_element_and_wait(self, driver, key_word, wait=True):
+ """Click and wait for that element to appear."""
+ path = "//a[text()={}]".format(quoted_key(key_word))
+ driver.find_element_by_xpath(path).click()
+ if wait is True:
+ WebDriverWait(driver, 10).until(
+ EC.presence_of_element_located((
+ By.XPATH, path)))
+
+ def click_button(self, driver, key_word):
+ """Click a button."""
+ path = "//div[text()={}]".format(quoted_key(key_word))
+ driver.find_element_by_xpath(path).click()
+
+ def input_value(self, driver, data_reactid, value):
+ """Input values to field."""
+ path = "//input[@data-reactid={}]".format(quoted_key(data_reactid))
+ driver.find_element_by_xpath(path).send_keys(value)
+
+ def test_basic_checks(
+ self, driver, logger, rw_project_proxy, rw_user_proxy):
+ """test_basic_checks."""
+ logger.debug('Check access to all basic pages.')
+ basic_pages = (
+ ['Accounts', 'Catalog', 'Launchpad', 'ADMINISTRATION',
+ 'PROJECT: default', 'admin'])
+ for key_word in basic_pages:
+ self.click_element_and_wait(driver, key_word)
+
+ logger.debug('Create a test project.')
+ self.click_element_and_wait(driver, 'ADMINISTRATION')
+ self.click_element_and_wait(driver, 'Project Management', wait=False)
+ self.click_button(driver, 'Add Project')
+ self.input_value(driver, '.0.4.0.1.0.4.0.0.1.0.1', 'test_project')
+ self.click_button(driver, 'Create')
+
+ logger.debug('Verify test project is created in ui.')
+ path = "//div[text()={}]".format(quoted_key('test_project'))
+ WebDriverWait(driver, 10).until(
+ EC.presence_of_element_located((
+ By.XPATH, path)))
+
+ logger.debug('Verify test project is created in config.')
+ project_cm_config_xpath = '/project[name={}]/project-state'
+ project_ = rw_project_proxy.get_config(
+ project_cm_config_xpath.format(
+ quoted_key('test_project')), list_obj=True)
+ assert project_
+
+ logger.debug('Create a test user.')
+ self.click_element_and_wait(driver, 'ADMINISTRATION')
+ self.click_element_and_wait(driver, 'User Management', wait=False)
+ self.click_button(driver, 'Add User')
+ self.input_value(driver, '.0.4.0.1.1.0.4.0.0.1.0.1', 'test_user')
+ self.input_value(driver, '.0.4.0.1.1.0.4.0.3.1.0.1', 'mypasswd')
+ self.input_value(driver, '.0.4.0.1.1.0.4.0.3.1.1.1', 'mypasswd')
+ self.click_button(driver, 'Create')
+
+ logger.debug('Verify test user is created in ui.')
+ path = "//div[text()={}]".format(quoted_key('test_user'))
+ WebDriverWait(driver, 10).until(
+ EC.presence_of_element_located((
+ By.XPATH, path)))
+
+ logger.debug('Verify test user is created in config.')
+ user_config_xpath = (
+ '/user-config/user[user-name={user_name}][user-domain={domain}]')
+ user_ = rw_user_proxy.get_config(
+ user_config_xpath.format(
+ user_name=quoted_key('test_user'),
+ domain=quoted_key('system')))
+ assert user_
diff --git a/rwlaunchpad/ra/pytest/ns/ha/conftest.py b/rwlaunchpad/ra/pytest/ns/ha/conftest.py
new file mode 100644
index 0000000..973f447
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/ha/conftest.py
@@ -0,0 +1,182 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+
+import pytest
+import subprocess
+import os
+import time
+
+import rift.vcs.vcs
+import rift.auto.mano as mano
+
+from gi.repository import (
+ RwConmanYang,
+ RwUserYang,
+ RwProjectYang,
+ RwRbacInternalYang,
+ RwRbacPlatformYang,
+ RwCloudYang,
+)
+
+@pytest.fixture(scope='session')
+def ha_mgmt_sessions(sut_host_addrs, session_type):
+ """Fixture that returns mgmt sessions for active, standby LPs"""
+ sessions = {}
+ for name,addr in sut_host_addrs.items():
+ if session_type == 'netconf':
+ mgmt_session = rift.auto.session.NetconfSession(host=addr)
+ elif session_type == 'restconf':
+ mgmt_session = rift.auto.session.RestconfSession(host=addr)
+
+ if 'standby' in name:
+ sessions['standby'] = mgmt_session
+ elif 'active' in name:
+ sessions['active'] = mgmt_session
+ mgmt_session.connect()
+ rift.vcs.vcs.wait_until_system_started(mgmt_session)
+
+ return sessions
+
+@pytest.fixture(scope='session')
+def active_mgmt_session(ha_mgmt_sessions):
+ """Fixture that returns mgmt sessions for active LP"""
+ return ha_mgmt_sessions['active']
+
+@pytest.fixture(scope='session')
+def standby_mgmt_session(ha_mgmt_sessions):
+ """Fixture that returns mgmt sessions for standby LP"""
+ return ha_mgmt_sessions['standby']
+
+@pytest.fixture(scope='session')
+def active_confd_host(active_mgmt_session):
+ """Fixture that returns mgmt sessions for active LP"""
+ return active_mgmt_session.host
+
+@pytest.fixture(scope='session')
+def standby_confd_host(standby_mgmt_session):
+ """Fixture that returns mgmt sessions for standby LP"""
+ return standby_mgmt_session.host
+
+@pytest.fixture(scope='session')
+def revertive_pref_host(active_mgmt_session):
+ """Fixture that returns mgmt sessions for active LP"""
+ return active_mgmt_session.host
+
+@pytest.fixture(scope='session')
+def active_site_name(active_mgmt_session):
+ """Fixture that returns mgmt sessions for active LP"""
+ return 'site-a'
+
+@pytest.fixture(scope='session')
+def standby_site_name(standby_mgmt_session):
+ """Fixture that returns mgmt sessions for standby LP"""
+ return 'site-b'
+
+@pytest.fixture(scope='session', autouse=True)
+def redundancy_config_setup(logger, active_confd_host, standby_confd_host, active_mgmt_session):
+ """Fixture that prepares the rw-redundancy-config.xml file and copies it to RVR of active, standby systems;
+ starts the mock dns script in the revertive-preference host.
+ It assumes system-tests are running containers where launchpad runs in production mode"""
+
+ # Starts the mock dns script in revertive-preference host which is the active system.
+ ssh_mock_dns_cmd = 'ssh -n -o BatchMode=yes -o StrictHostKeyChecking=no {revertive_pref_host} -- "python3 /usr/rift/usr/rift/systemtest/util/test_mock_dns.py --active-site site-a {active_host} --standby-site site-b {standby_host}"'.format(
+ revertive_pref_host=active_confd_host, active_host=active_confd_host, standby_host=standby_confd_host)
+ logger.debug('Running mock dns script in host {host}; cmd: {ssh_cmd}'.format(host=active_confd_host,
+ ssh_cmd=ssh_mock_dns_cmd))
+ subprocess.Popen(ssh_mock_dns_cmd, shell=True)
+ # Have to check if the script ran fine
+
+ # Prepares the rw-redundancy-config.xml file
+ redundancy_cfg_file_path = os.path.join(os.getenv('RIFT_INSTALL'),
+ 'usr/rift/systemtest/config/rw-redundancy-config.xml')
+ with open(redundancy_cfg_file_path) as f:
+ file_content = f.read()
+
+ with open(redundancy_cfg_file_path+'.auto', 'w') as f:
+ new_content = file_content.replace('1.1.1.1', active_confd_host).replace('2.2.2.2', standby_confd_host)
+ logger.debug('redundancy config file content: {}'.format(new_content))
+ f.write(new_content)
+
+ # Copies the redundancy config file to active, standby systems
+ for host_addr in (active_confd_host, standby_confd_host):
+ scp_cmd = 'scp -o StrictHostkeyChecking=no {file_path} {host}:/usr/rift/var/rift/rw-redundancy-config.xml'.format(
+ file_path=redundancy_cfg_file_path+'.auto', host=host_addr)
+ logger.debug(
+ 'Copying redundancy config xml to host {host}; scp cmd: {scp_cmd}'.format(host=host_addr, scp_cmd=scp_cmd))
+ assert os.system(scp_cmd) == 0
+
+ # Restart the launchpad service in active, standby systems
+ for host_addr in (active_confd_host, standby_confd_host):
+ ssh_launchpad_restart_cmd = 'ssh -n -o BatchMode=yes -o StrictHostKeyChecking=no {host} -- "sudo pkill rwmain"'.format(
+ host=host_addr)
+ logger.debug('Restarting launchpad service in host {host}. cmd: {ssh_cmd}'.format(host=host_addr,
+ ssh_cmd=ssh_launchpad_restart_cmd))
+ assert os.system(ssh_launchpad_restart_cmd.format(host=host_addr)) == 0
+ time.sleep(30)
+
+ active_mgmt_session.connect()
+ rift.vcs.vcs.wait_until_system_started(active_mgmt_session)
+ mano.verify_ha_redundancy_state(active_mgmt_session)
+
+@pytest.fixture(scope='session')
+def ha_lp_nodes(sut_host_addrs, session_type):
+ """Fixture that returns rift.auto.mano.LpNode objects for active, standby LPs"""
+ lp_nodes = {}
+ for name,addr in sut_host_addrs.items():
+ lp_node = mano.LpNode(host=addr, session_type=session_type, connect=False)
+ if 'standby' in name:
+ lp_nodes['standby'] = lp_node
+ elif 'active' in name:
+ lp_nodes['active'] = lp_node
+
+ return lp_nodes
+
+@pytest.fixture(scope='session')
+def active_lp_node_obj(ha_lp_nodes):
+ """Fixture that returns rift.auto.mano.LpNode object for active LP"""
+ return ha_lp_nodes['active']
+
+@pytest.fixture(scope='session')
+def standby_lp_node_obj(ha_lp_nodes):
+ """Fixture that returns rift.auto.mano.LpNode object for standby LP"""
+ return ha_lp_nodes['standby']
+
+@pytest.fixture(scope='session')
+def rw_active_user_proxy(active_mgmt_session):
+ return active_mgmt_session.proxy(RwUserYang)
+
+@pytest.fixture(scope='session')
+def rw_active_project_proxy(active_mgmt_session):
+ return active_mgmt_session.proxy(RwProjectYang)
+
+@pytest.fixture(scope='session')
+def rw_active_rbac_int_proxy(active_mgmt_session):
+ return active_mgmt_session.proxy(RwRbacInternalYang)
+
+@pytest.fixture(scope='session')
+def rw_active_conman_proxy(active_mgmt_session):
+ return active_mgmt_session.proxy(RwConmanYang)
+
+@pytest.fixture(scope='session')
+def rbac_active_platform_proxy(active_mgmt_session):
+ return active_mgmt_session.proxy(RwRbacPlatformYang)
+
+@pytest.fixture(scope='session')
+def rw_active_cloud_pxy(active_mgmt_session):
+ return active_mgmt_session.proxy(RwCloudYang)
diff --git a/rwlaunchpad/ra/pytest/ns/ha/test_ha_basic.py b/rwlaunchpad/ra/pytest/ns/ha/test_ha_basic.py
new file mode 100644
index 0000000..102c61b
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/ha/test_ha_basic.py
@@ -0,0 +1,261 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+
+import gi
+import pytest
+import random
+import time
+
+import rift.auto.mano as mano
+import rift.auto.descriptor
+from gi.repository.RwKeyspec import quoted_key
+
+from gi.repository import (
+ RwProjectNsdYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwVlrYang,
+ RwCloudYang,
+ RwConmanYang,
+)
+
+@pytest.fixture(scope='module')
+def test_projects():
+ projects = ['default']
+ for idx in range(1, 4):
+ projects.append('project_ha_'+str(idx))
+ return projects
+
+
+@pytest.mark.setup('active_configuration')
+@pytest.mark.incremental
+class TestActiveLpConfiguration(object):
+ """sets up the configuration as per RIFT-17854"""
+ def test_create_project_users(self, rbac_user_passwd, user_domain, rw_active_user_proxy, logger,
+ rw_active_project_proxy, rw_active_rbac_int_proxy, rw_active_conman_proxy, test_projects, user_roles):
+ # Create test users
+ user_name_pfx = 'user_ha_'
+ users = []
+ for idx in range(1, 9):
+ users.append(user_name_pfx+str(idx))
+ mano.create_user(rw_active_user_proxy, user_name_pfx+str(idx), rbac_user_passwd, user_domain)
+
+ # Create projects and assign roles to users in the newly created project
+ for project_name in test_projects:
+ if project_name == 'default':
+ continue
+ logger.debug('Creating project {}'.format(project_name))
+ mano.create_project(rw_active_conman_proxy, project_name)
+
+ for project_name in test_projects:
+ for _ in range(2):
+ role = random.choice(user_roles)
+ user = users.pop()
+ logger.debug('Assinging role {} to user {} in project {}'.format(role, user, project_name))
+ mano.assign_project_role_to_user(rw_active_project_proxy, role, user, project_name, user_domain,
+ rw_active_rbac_int_proxy)
+
+ def test_create_cloud_accounts(self, cloud_account, fmt_prefixed_cloud_xpath, fmt_cloud_xpath, rw_active_cloud_pxy,
+ test_projects, logger):
+ for project_name in test_projects:
+ logger.debug('Creating cloud account {} for project {}'.format(cloud_account.name, project_name))
+ xpath = fmt_prefixed_cloud_xpath.format(project=quoted_key(project_name),
+ account_name=quoted_key(cloud_account.name))
+ rw_active_cloud_pxy.replace_config(xpath, cloud_account)
+ xpath_no_pfx = fmt_cloud_xpath.format(project=quoted_key(project_name),
+ account_name=quoted_key(cloud_account.name))
+ response = rw_active_cloud_pxy.get(xpath_no_pfx)
+ assert response.name == cloud_account.name
+ assert response.account_type == cloud_account.account_type
+
+ rw_active_cloud_pxy.wait_for(fmt_cloud_xpath.format(project=quoted_key(project_name), account_name=quoted_key(
+ cloud_account.name)) + '/connection-status/status', 'success', timeout=30, fail_on=['failure'])
+
+ def test_onboard_descriptors(self, descriptors, test_projects, active_mgmt_session, fmt_nsd_catalog_xpath, logger):
+ # Uploads the descriptors
+ for project_name in test_projects:
+ for descriptor in descriptors:
+ logger.debug('Onboarding descriptor {} for project {}'.format(descriptor, project_name))
+ rift.auto.descriptor.onboard(active_mgmt_session, descriptor, project=project_name)
+
+ # Verify whether the descriptors uploaded successfully
+ nsd_pxy = active_mgmt_session.proxy(RwProjectNsdYang)
+ for project_name in test_projects:
+ nsd_xpath = fmt_nsd_catalog_xpath.format(project=quoted_key(project_name))
+ nsd_catalog = nsd_pxy.get_config(nsd_xpath)
+ assert nsd_catalog
+
+ @pytest.mark.skipif(not pytest.config.getoption("--nsr-test"), reason="need --nsr-test option to run")
+ def test_instantiate_nsr(self, fmt_nsd_catalog_xpath, cloud_account, active_mgmt_session, logger, test_projects):
+ nsd_pxy = active_mgmt_session.proxy(RwProjectNsdYang)
+ rwnsr_pxy = active_mgmt_session.proxy(RwNsrYang)
+
+ for project_name in test_projects:
+ nsd_xpath = fmt_nsd_catalog_xpath.format(project=quoted_key(project_name))
+ nsd_catalog = nsd_pxy.get_config(nsd_xpath)
+ assert nsd_catalog
+ nsd = nsd_catalog.nsd[0]
+ nsr = rift.auto.descriptor.create_nsr(cloud_account.name, nsd.name, nsd)
+
+ logger.debug('Instantiating NS for project {}'.format(project_name))
+ rift.auto.descriptor.instantiate_nsr(nsr, rwnsr_pxy, logger, project=project_name)
+
+
+@pytest.mark.depends('active_configuration')
+@pytest.mark.setup('first-failover')
+@pytest.mark.incremental
+class TestHaFirstFailover(object):
+ def test_collect_active_lp_data(self, active_lp_node_obj, active_confd_host, standby_confd_host, logger):
+ mano.verify_hagr_endpoints(active_confd_host, standby_confd_host)
+ active_lp_node_obj.collect_data()
+
+ def test_attempt_indirect_failover(self, revertive_pref_host, active_confd_host, standby_confd_host,
+ active_site_name, standby_site_name, logger):
+ # Wait for redundancy poll interval though collecting data on active LP takes more than 5 secs
+ time.sleep(5)
+ logger.debug('Attempting first failover. Host {} will be new active'.format(standby_confd_host))
+ mano.indirect_failover(revertive_pref_host, new_active_ip=standby_confd_host, new_active_site=standby_site_name,
+ new_standby_ip=active_confd_host, new_standby_site=active_site_name)
+
+ def test_wait_for_standby_to_comeup(self, standby_mgmt_session, active_confd_host, standby_confd_host):
+ """Wait for the standby to come up; Wait for endpoint 'ha/geographic/active' to return 200"""
+ mano.wait_for_standby_to_become_active(standby_mgmt_session)
+ # mano.verify_hagr_endpoints(active_host=standby_confd_host, standby_host=active_confd_host)
+
+ def test_collect_standby_lp_data(self, standby_lp_node_obj, standby_mgmt_session, cloud_account,
+ fmt_cloud_xpath, test_projects, fmt_nsd_catalog_xpath):
+ time.sleep(180)
+ rw_new_active_cloud_pxy = standby_mgmt_session.proxy(RwCloudYang)
+ nsd_pxy = standby_mgmt_session.proxy(RwProjectNsdYang)
+ rwnsr_proxy = standby_mgmt_session.proxy(RwNsrYang)
+
+ for project_name in test_projects:
+ rw_new_active_cloud_pxy.wait_for(
+ fmt_cloud_xpath.format(project=quoted_key(project_name), account_name=quoted_key(
+ cloud_account.name)) + '/connection-status/status', 'success', timeout=60, fail_on=['failure'])
+
+ # nsd_catalog = nsd_pxy.get_config(fmt_nsd_catalog_xpath.format(project=quoted_key(project_name)))
+ # assert nsd_catalog
+
+ if pytest.config.getoption("--nsr-test"):
+ nsr_opdata = rwnsr_proxy.get(
+ '/rw-project:project[rw-project:name={project}]/ns-instance-opdata'.format(
+ project=quoted_key(project_name)))
+ assert nsr_opdata
+ nsrs = nsr_opdata.nsr
+
+ for nsr in nsrs:
+ xpath = "/rw-project:project[rw-project:name={project}]/ns-instance-opdata/nsr[ns-instance-config-ref={config_ref}]/config-status".format(
+ project=quoted_key(project_name), config_ref=quoted_key(nsr.ns_instance_config_ref))
+ rwnsr_proxy.wait_for(xpath, "configured", fail_on=['failed'], timeout=400)
+
+ standby_lp_node_obj.collect_data()
+
+ def test_match_active_standby(self, active_lp_node_obj, standby_lp_node_obj):
+ active_lp_node_obj.compare(standby_lp_node_obj)
+
+
+@pytest.mark.depends('first-failover')
+@pytest.mark.setup('active-teardown')
+@pytest.mark.incremental
+class TestHaTeardown(object):
+ """It terminates the NS & deletes descriptors, cloud accounts, projects"""
+ @pytest.mark.skipif(not pytest.config.getoption("--nsr-test"), reason="need --nsr-test option to run")
+ def test_terminate_nsr(self, test_projects, standby_mgmt_session, logger):
+ rwnsr_pxy = standby_mgmt_session.proxy(RwNsrYang)
+ rwvnfr_pxy = standby_mgmt_session.proxy(RwVnfrYang)
+ rwvlr_pxy = standby_mgmt_session.proxy(RwVlrYang)
+
+ for project_name in test_projects:
+ logger.debug("Trying to terminate NSR in project {}".format(project_name))
+ rift.auto.descriptor.terminate_nsr(rwvnfr_pxy, rwnsr_pxy, rwvlr_pxy, logger, project_name)
+
+ def test_delete_descriptors(self, standby_mgmt_session, test_projects, logger):
+ for project_name in test_projects:
+ logger.info("Trying to delete the descriptors in project {}".format(project_name))
+ rift.auto.descriptor.delete_descriptors(standby_mgmt_session, project_name)
+
+ def test_delete_cloud_accounts(self, standby_mgmt_session, logger, test_projects, cloud_account):
+ for project_name in test_projects:
+ logger.info("Trying to delete the cloud-account in project {}".format(project_name))
+ rift.auto.mano.delete_cloud_account(standby_mgmt_session, cloud_account.name, project_name)
+
+ def test_delete_projects(self, standby_mgmt_session, test_projects, logger):
+ rw_conman_proxy = standby_mgmt_session.proxy(RwConmanYang)
+ for project_name in test_projects:
+ if project_name == 'default':
+ continue
+ logger.debug('Deleting project {}'.format(project_name))
+ rift.auto.mano.delete_project(rw_conman_proxy, project_name)
+
+
+@pytest.mark.depends('active-teardown')
+@pytest.mark.incremental
+class TestHaFailoverToOriginalActive(object):
+ """Does a failover to original active and verifies the config"""
+ def test_collect_current_active_lp_data(self, standby_lp_node_obj, logger):
+ time.sleep(30)
+ logger.debug('Collecting data for host {}'.format(standby_lp_node_obj.host))
+ standby_lp_node_obj.collect_data()
+
+ def test_attempt_indirect_failover(self, revertive_pref_host, active_confd_host, standby_confd_host,
+ active_site_name, standby_site_name, logger):
+ # Wait for redundancy poll interval.
+ time.sleep(5)
+ logger.debug('Attempting second failover. Host {} will be new active'.format(active_confd_host))
+ mano.indirect_failover(revertive_pref_host, new_active_ip=active_confd_host, new_active_site=active_site_name,
+ new_standby_ip=standby_confd_host, new_standby_site=standby_site_name)
+
+ def test_wait_for_standby_to_comeup(self, active_mgmt_session, active_confd_host, standby_confd_host):
+ """Wait for the standby to come up; Wait for endpoint 'ha/geographic/active' to return 200"""
+ mano.wait_for_standby_to_become_active(active_mgmt_session)
+ # mano.verify_hagr_endpoints(active_host=standby_confd_host, standby_host=active_confd_host)
+
+ def test_collect_original_active_lp_data(self, active_lp_node_obj, logger):
+ active_lp_node_obj.session = None
+ logger.debug('Collecting data for host {}'.format(active_lp_node_obj.host))
+ active_lp_node_obj.collect_data()
+
+ def test_match_active_standby(self, active_lp_node_obj, standby_lp_node_obj):
+ standby_lp_node_obj.compare(active_lp_node_obj)
+
+ def test_delete_default_project(self, rw_active_conman_proxy):
+ rift.auto.mano.delete_project(rw_active_conman_proxy, 'default')
+
+ def test_users_presence_in_active(self, rw_active_user_proxy, user_keyed_xpath, user_domain):
+ """Users were not deleted as part of Teardown; Check those users should be present and delete them"""
+ user_config = rw_active_user_proxy.get_config('/user-config')
+ current_users_list = [user.user_name for user in user_config.user]
+
+ user_name_pfx = 'user_ha_'
+ original_test_users_list = [user_name_pfx+str(idx) for idx in range(1,9)]
+
+ assert set(original_test_users_list).issubset(current_users_list)
+
+ # Delete the users
+ for idx in range(1,9):
+ rw_active_user_proxy.delete_config(
+ user_keyed_xpath.format(user=quoted_key(user_name_pfx + str(idx)), domain=quoted_key(user_domain)))
+
+ def test_projects_deleted(self, test_projects, project_keyed_xpath, rw_active_conman_proxy):
+ """There should only be the default project; all other test projects are already deleted as part of Teardown"""
+ for project_name in test_projects:
+ project_ = rw_active_conman_proxy.get_config(
+ project_keyed_xpath.format(project_name=quoted_key(project_name)) + '/name')
+ assert project_ is None
\ No newline at end of file
diff --git a/rwlaunchpad/ra/pytest/ns/ha/test_ha_multiple_failovers.py b/rwlaunchpad/ra/pytest/ns/ha/test_ha_multiple_failovers.py
new file mode 100644
index 0000000..6b09485
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/ha/test_ha_multiple_failovers.py
@@ -0,0 +1,219 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+
+import gi
+import pytest
+import random
+import time
+
+import rift.auto.mano as mano
+import rift.auto.descriptor
+from gi.repository.RwKeyspec import quoted_key
+
+from gi.repository import (
+ RwProjectNsdYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwVlrYang,
+ RwCloudYang,
+ RwConmanYang,
+)
+
+@pytest.fixture(scope='module')
+def test_project():
+ return 'project_ha'
+
+@pytest.mark.setup('active-configuration')
+@pytest.mark.incremental
+class TestMutipleFailoverActiveSetup(object):
+ def test_create_project_users(self, rbac_user_passwd, user_domain, rw_active_user_proxy, logger,
+ rw_active_project_proxy, rw_active_rbac_int_proxy, rw_active_conman_proxy, test_project, user_roles):
+ # Create test users
+ user_name_pfx = 'user_ha_'
+ users = []
+ for idx in range(1, 9):
+ users.append(user_name_pfx+str(idx))
+ mano.create_user(rw_active_user_proxy, user_name_pfx+str(idx), rbac_user_passwd, user_domain)
+
+ # Create a test project and assign roles to users in the newly created project
+ logger.debug('Creating project {}'.format(test_project))
+ mano.create_project(rw_active_conman_proxy, test_project)
+
+ for _ in range(8):
+ role = random.choice(user_roles)
+ user = users.pop()
+ logger.debug('Assinging role {} to user {} in project {}'.format(role, user, test_project))
+ mano.assign_project_role_to_user(rw_active_project_proxy, role, user, test_project, user_domain,
+ rw_active_rbac_int_proxy)
+
+ def test_create_cloud_account(self, cloud_account, fmt_prefixed_cloud_xpath, fmt_cloud_xpath, rw_active_cloud_pxy,
+ test_project, logger):
+ logger.debug('Creating cloud account {} for project {}'.format(cloud_account.name, test_project))
+ xpath = fmt_prefixed_cloud_xpath.format(project=quoted_key(test_project),
+ account_name=quoted_key(cloud_account.name))
+ rw_active_cloud_pxy.replace_config(xpath, cloud_account)
+ xpath_no_pfx = fmt_cloud_xpath.format(project=quoted_key(test_project),
+ account_name=quoted_key(cloud_account.name))
+ response = rw_active_cloud_pxy.get(xpath_no_pfx)
+ assert response.name == cloud_account.name
+ assert response.account_type == cloud_account.account_type
+
+ rw_active_cloud_pxy.wait_for(fmt_cloud_xpath.format(project=quoted_key(test_project), account_name=quoted_key(
+ cloud_account.name)) + '/connection-status/status', 'success', timeout=30, fail_on=['failure'])
+
+ def test_onboard_descriptors(self, descriptors, test_project, active_mgmt_session, fmt_nsd_catalog_xpath, logger):
+ # Uploads the descriptors
+ pingpong_descriptors = descriptors['pingpong']
+ for descriptor in pingpong_descriptors:
+ logger.debug('Onboarding descriptor {} for project {}'.format(descriptor, test_project))
+ rift.auto.descriptor.onboard(active_mgmt_session, descriptor, project=test_project)
+
+ # Verify whether the descriptors uploaded successfully
+ nsd_pxy = active_mgmt_session.proxy(RwProjectNsdYang)
+ nsd_xpath = fmt_nsd_catalog_xpath.format(project=quoted_key(test_project))
+ nsd_catalog = nsd_pxy.get_config(nsd_xpath)
+ assert nsd_catalog
+
+ def test_instantiate_nsr(self, fmt_nsd_catalog_xpath, cloud_account, active_mgmt_session, logger, test_project):
+ nsd_pxy = active_mgmt_session.proxy(RwProjectNsdYang)
+ rwnsr_pxy = active_mgmt_session.proxy(RwNsrYang)
+
+ nsd_xpath = fmt_nsd_catalog_xpath.format(project=quoted_key(test_project))
+ nsd_catalog = nsd_pxy.get_config(nsd_xpath)
+ assert nsd_catalog
+ nsd = nsd_catalog.nsd[0]
+ nsr = rift.auto.descriptor.create_nsr(cloud_account.name, nsd.name, nsd)
+
+ logger.debug('Instantiating NS for project {}'.format(test_project))
+ rift.auto.descriptor.instantiate_nsr(nsr, rwnsr_pxy, logger, project=test_project)
+
+
+@pytest.mark.depends('active-configuration')
+@pytest.mark.setup('multiple-failovers')
+@pytest.mark.incremental
+class TestHaMultipleFailovers(object):
+ def test_ha_multiple_failovers(self, revertive_pref_host, active_confd_host, standby_confd_host, standby_lp_node_obj, active_lp_node_obj, logger,
+ fmt_cloud_xpath, cloud_account, test_project, active_site_name, standby_site_name, standby_mgmt_session, active_mgmt_session, descriptors):
+ count, failover_count = 1, 10
+ current_actv_mgmt_session, current_stdby_mgmt_session = active_mgmt_session, standby_mgmt_session
+ current_actv_lp_node_obj = active_lp_node_obj
+
+ descriptor_list = descriptors['haproxy'][::-1] + descriptors['vdud_cfgfile'][::-1]
+
+ original_active_as_standby_kwargs = {'revertive_pref_host': revertive_pref_host, 'new_active_ip': standby_confd_host, 'new_active_site': standby_site_name,
+ 'new_standby_ip': active_confd_host, 'new_standby_site': active_site_name}
+ original_active_as_active_kwargs = {'revertive_pref_host': revertive_pref_host, 'new_active_ip':active_confd_host, 'new_active_site': active_site_name,
+ 'new_standby_ip': standby_confd_host, 'new_standby_site': standby_site_name}
+
+ while count <= failover_count:
+ kwargs = original_active_as_active_kwargs
+ if count%2 == 1:
+ kwargs = original_active_as_standby_kwargs
+
+ # upload descriptor
+ if count not in [5,6,7,8]:
+ descriptor = descriptor_list.pop()
+ rift.auto.descriptor.onboard(current_actv_mgmt_session, descriptor, project=test_project)
+
+ # Collect config, op-data from current active before doing a failover
+ current_actv_lp_node_obj.session = None
+ current_actv_lp_node_obj.collect_data()
+
+ time.sleep(5)
+ logger.debug('Failover Iteration - {}. Current standby {} will be the new active'.format(count, current_stdby_mgmt_session.host))
+ mano.indirect_failover(**kwargs)
+
+ last_actv_lp_node_obj = current_actv_lp_node_obj
+ current_actv_mgmt_session, current_stdby_mgmt_session = active_mgmt_session, standby_mgmt_session
+ current_actv_lp_node_obj = active_lp_node_obj
+ if count%2 == 1:
+ current_actv_lp_node_obj = standby_lp_node_obj
+ current_actv_mgmt_session, current_stdby_mgmt_session = standby_mgmt_session, active_mgmt_session
+
+ logger.debug('Waiting for the new active {} to come up'.format(current_actv_mgmt_session.host))
+ mano.wait_for_standby_to_become_active(current_actv_mgmt_session)
+
+ # Wait for NSR to become active
+ rw_new_active_cloud_pxy = current_actv_mgmt_session.proxy(RwCloudYang)
+ rwnsr_proxy = current_actv_mgmt_session.proxy(RwNsrYang)
+
+ rw_new_active_cloud_pxy.wait_for(
+ fmt_cloud_xpath.format(project=quoted_key(test_project), account_name=quoted_key(
+ cloud_account.name)) + '/connection-status/status', 'success', timeout=60, fail_on=['failure'])
+
+ nsr_opdata = rwnsr_proxy.get(
+ '/rw-project:project[rw-project:name={project}]/ns-instance-opdata'.format(
+ project=quoted_key(test_project)))
+ assert nsr_opdata
+ nsrs = nsr_opdata.nsr
+
+ for nsr in nsrs:
+ xpath = "/rw-project:project[rw-project:name={project}]/ns-instance-opdata/nsr[ns-instance-config-ref={config_ref}]/config-status".format(
+ project=quoted_key(test_project), config_ref=quoted_key(nsr.ns_instance_config_ref))
+ rwnsr_proxy.wait_for(xpath, "configured", fail_on=['failed'], timeout=400)
+
+ # Collect config, op-data from new active
+ current_actv_lp_node_obj.session = None
+ current_actv_lp_node_obj.collect_data()
+
+ # Compare data between last active and current active
+ current_actv_lp_node_obj.compare(last_actv_lp_node_obj)
+ count += 1
+
+
+@pytest.mark.depends('multiple-failovers')
+@pytest.mark.incremental
+class TestHaOperationPostMultipleFailovers(object):
+ def test_instantiate_nsr(self, fmt_nsd_catalog_xpath, cloud_account, active_mgmt_session, logger, test_project):
+ """Check if a new NS instantiation goes through after multiple HA failovers.
+ It uses metadata cfgfile nsd for the instantiation.
+ There alreasy exists ping pong NS instantiation"""
+ nsd_pxy = active_mgmt_session.proxy(RwProjectNsdYang)
+ rwnsr_pxy = active_mgmt_session.proxy(RwNsrYang)
+
+ nsd_xpath = fmt_nsd_catalog_xpath.format(project=quoted_key(test_project))
+ nsd_catalog = nsd_pxy.get_config(nsd_xpath)
+ assert nsd_catalog
+ cfgfile_nsd = [nsd for nsd in nsd_catalog.nsd if 'cfgfile_nsd' in nsd.name][0]
+ nsr = rift.auto.descriptor.create_nsr(cloud_account.name, cfgfile_nsd.name, cfgfile_nsd)
+
+ logger.debug('Instantiating cfgfile NS for project {}'.format(test_project))
+ rift.auto.descriptor.instantiate_nsr(nsr, rwnsr_pxy, logger, project=test_project)
+
+ def test_nsr_terminate(self, active_mgmt_session, logger, test_project):
+ """"""
+ rwnsr_pxy = active_mgmt_session.proxy(RwNsrYang)
+ rwvnfr_pxy = active_mgmt_session.proxy(RwVnfrYang)
+ rwvlr_pxy = active_mgmt_session.proxy(RwVlrYang)
+
+ logger.debug("Trying to terminate ping pong, cfgfile NSRs in project {}".format(test_project))
+ rift.auto.descriptor.terminate_nsr(rwvnfr_pxy, rwnsr_pxy, rwvlr_pxy, logger, test_project)
+
+ def test_delete_descriptors(self, active_mgmt_session, test_project, logger):
+ logger.info("Trying to delete the descriptors in project {}".format(test_project))
+ rift.auto.descriptor.delete_descriptors(active_mgmt_session, test_project)
+
+ def test_delete_cloud_accounts(self, active_mgmt_session, logger, test_project, cloud_account):
+ logger.info("Trying to delete the cloud-account in project {}".format(test_project))
+ rift.auto.mano.delete_cloud_account(active_mgmt_session, cloud_account.name, test_project)
+
+ def test_delete_projects(self, active_mgmt_session, test_project, logger):
+ rw_conman_proxy = active_mgmt_session.proxy(RwConmanYang)
+ logger.debug('Deleting project {}'.format(test_project))
+ rift.auto.mano.delete_project(rw_conman_proxy, test_project)
\ No newline at end of file
diff --git a/rwlaunchpad/ra/pytest/ns/ha/test_ha_operations.py b/rwlaunchpad/ra/pytest/ns/ha/test_ha_operations.py
new file mode 100644
index 0000000..5372a1e
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/ha/test_ha_operations.py
@@ -0,0 +1,274 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+
+import gi
+import pytest
+import random
+import time
+
+import rift.auto.mano as mano
+import rift.auto.descriptor
+from gi.repository.RwKeyspec import quoted_key
+
+from gi.repository import (
+ RwProjectNsdYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwVlrYang,
+ RwProjectVnfdYang,
+ RwCloudYang
+)
+
+
+@pytest.mark.setup('active_configuration')
+@pytest.mark.incremental
+class TestActiveLpConfiguration(object):
+ """Setting up the configuration."""
+
+ def collect_active_lp_data(
+ self, active_lp_node_obj, active_confd_host,
+ standby_confd_host, logger):
+ """Collect active lp data."""
+ mano.verify_hagr_endpoints(active_confd_host, standby_confd_host)
+ active_lp_node_obj.collect_data()
+
+ def wait_for_standby_to_comeup(
+ self, standby_mgmt_session, active_confd_host, standby_confd_host):
+ """Wait for the standby to come up.
+
+ Wait for endpoint 'ha/geographic/active' to return 200
+ """
+ mano.wait_for_standby_to_become_active(standby_mgmt_session)
+ # mano.verify_hagr_endpoints(
+ # active_host=standby_confd_host, standby_host=active_confd_host)
+
+ def collect_standby_lp_data(
+ self, standby_lp_node_obj, standby_mgmt_session, cloud_account,
+ fmt_cloud_xpath, projects, fmt_nsd_catalog_xpath):
+ """Collect standby lp data."""
+ time.sleep(180)
+ rw_new_active_cloud_pxy = standby_mgmt_session.proxy(RwCloudYang)
+ nsd_pxy = standby_mgmt_session.proxy(RwProjectNsdYang)
+ rwnsr_proxy = standby_mgmt_session.proxy(RwNsrYang)
+
+ for project_name in projects:
+ rw_new_active_cloud_pxy.wait_for(
+ fmt_cloud_xpath.format(
+ project=quoted_key(project_name),
+ account_name=quoted_key(cloud_account.name)) +
+ '/connection-status/status', 'success',
+ timeout=60, fail_on=['failure'])
+
+ # nsd_catalog = nsd_pxy.get_config(
+ # fmt_nsd_catalog_xpath.format(project=quoted_key(project_name)))
+ # assert nsd_catalog
+
+ if pytest.config.getoption("--nsr-test"):
+ nsr_opdata = rwnsr_proxy.get(
+ '/rw-project:project[rw-project:name={project}]' +
+ '/ns-instance-opdata'.format(
+ project=quoted_key(project_name))
+ )
+
+ assert nsr_opdata
+ nsrs = nsr_opdata.nsr
+
+ for nsr in nsrs:
+ xpath = (
+ '/rw-project:project[rw-project:name={project}]' +
+ '/ns-instance-opdata/nsr[ns-instance-config-ref=' +
+ '{config_ref}]/config-status'.format(
+ project=quoted_key(project_name),
+ config_ref=quoted_key(nsr.ns_instance_config_ref))
+ )
+
+ rwnsr_proxy.wait_for(
+ xpath, "configured", fail_on=['failed'], timeout=400)
+
+ standby_lp_node_obj.collect_data()
+
+ def attempt_indirect_failover(
+ self, revertive_pref_host, active_confd_host, standby_confd_host,
+ active_site_name, standby_site_name, logger):
+ """Try indirect failover."""
+ time.sleep(5)
+ logger.debug(
+ 'Attempting first failover. Host {} will be new active'.format(
+ standby_confd_host))
+
+ mano.indirect_failover(
+ revertive_pref_host, new_active_ip=standby_confd_host,
+ new_active_site=standby_site_name,
+ new_standby_ip=active_confd_host,
+ new_standby_site=active_site_name)
+
+ def match_active_standby(self, active_lp_node_obj, standby_lp_node_obj):
+ """Compare active standby."""
+ active_lp_node_obj.compare(standby_lp_node_obj)
+
+ def test_create_project_users_cloud_acc(
+ self, rbac_user_passwd, user_domain, rw_active_user_proxy, logger,
+ rw_active_project_proxy, rw_active_rbac_int_proxy, cloud_account,
+ rw_active_conman_proxy, rw_active_cloud_pxy, user_roles,
+ fmt_prefixed_cloud_xpath, fmt_cloud_xpath, descriptors,
+ active_mgmt_session, fmt_nsd_catalog_xpath, active_lp_node_obj,
+ standby_lp_node_obj, active_confd_host, standby_confd_host,
+ revertive_pref_host, active_site_name, standby_site_name,
+ standby_mgmt_session):
+ """Create 3 of users, projects, cloud accounts, decriptors & nsrs."""
+ def failover_and_match():
+ """Try an indirect failover.
+
+ Match active and standby data
+ """
+ self.collect_active_lp_data(
+ active_lp_node_obj, active_confd_host,
+ standby_confd_host, logger)
+ self.attempt_indirect_failover(
+ revertive_pref_host, active_confd_host, standby_confd_host,
+ active_site_name, standby_site_name, logger)
+ self.wait_for_standby_to_comeup(
+ standby_mgmt_session, active_confd_host, standby_confd_host)
+ self.collect_standby_lp_data(
+ standby_lp_node_obj, standby_mgmt_session, cloud_account,
+ fmt_cloud_xpath, projects, fmt_nsd_catalog_xpath)
+ self.match_active_standby(active_lp_node_obj, standby_lp_node_obj)
+
+ def delete_data_set(idx):
+
+ rift.auto.descriptor.terminate_nsr(
+ rwvnfr_pxy, rwnsr_pxy, rwvlr_pxy, logger,
+ project=projects[idx])
+
+ rift.auto.descriptor.delete_descriptors(
+ active_mgmt_session, project_name)
+
+ rw_active_cloud_pxy.delete_config(
+ fmt_prefixed_cloud_xpath.format(
+ project=quoted_key(projects[idx]),
+ account_name=quoted_key(cloud_account.name)
+ )
+ )
+ response = rw_active_cloud_pxy.get(
+ fmt_cloud_xpath.format(
+ project=quoted_key(projects[idx]),
+ account_name=quoted_key(cloud_account.name)
+ )
+ )
+ assert response is None
+
+ mano.delete_project(rw_active_conman_proxy, projects[idx])
+ projects.pop()
+ mano.delete_user(rw_active_user_proxy, users[idx], user_domain)
+ users.pop()
+
+ # Create test users
+ user_name_pfx = 'user_ha_'
+ users = []
+ for idx in range(1, 4):
+ users.append(user_name_pfx + str(idx))
+
+ mano.create_user(
+ rw_active_user_proxy, user_name_pfx + str(idx),
+ rbac_user_passwd, user_domain)
+
+ # Create projects and assign roles to users
+ prj_name_pfx = 'prj_ha_'
+ projects = []
+ for idx in range(1, 4):
+ project_name = prj_name_pfx + str(idx)
+ projects.append(project_name)
+ mano.create_project(
+ rw_active_conman_proxy, project_name)
+
+ for idx in range(0, 3):
+ project_name = projects[idx]
+ role = random.choice(user_roles)
+ user = users[idx]
+ logger.debug(
+ 'Assinging role {} to user {} in project {}'.format(
+ role, user, project_name))
+
+ mano.assign_project_role_to_user(
+ rw_active_project_proxy, role, user, project_name,
+ user_domain, rw_active_rbac_int_proxy)
+
+ logger.debug(
+ 'Creating cloud account {} for project {}'.format(
+ cloud_account.name, project_name))
+
+ xpath = fmt_prefixed_cloud_xpath.format(
+ project=quoted_key(project_name),
+ account_name=quoted_key(cloud_account.name))
+
+ rw_active_cloud_pxy.replace_config(xpath, cloud_account)
+
+ xpath_no_pfx = fmt_cloud_xpath.format(
+ project=quoted_key(project_name),
+ account_name=quoted_key(cloud_account.name))
+
+ response = rw_active_cloud_pxy.get(xpath_no_pfx)
+ assert response.name == cloud_account.name
+ assert response.account_type == cloud_account.account_type
+
+ rw_active_cloud_pxy.wait_for(
+ fmt_cloud_xpath.format(
+ project=quoted_key(project_name),
+ account_name=quoted_key(cloud_account.name)) +
+ '/connection-status/status', 'success', timeout=30,
+ fail_on=['failure'])
+
+ # Uploads the descriptors
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(
+ active_mgmt_session, descriptor, project=project_name)
+
+ # Verify whether the descriptors uploaded successfully
+ logger.debug(
+ 'Onboarding descriptors for project {}'.format(project_name))
+
+ nsd_pxy = active_mgmt_session.proxy(RwProjectNsdYang)
+ rwnsr_pxy = active_mgmt_session.proxy(RwNsrYang)
+ rwvnfr_pxy = active_mgmt_session.proxy(RwVnfrYang)
+ rwvlr_pxy = active_mgmt_session.proxy(RwVlrYang)
+
+ nsd_xpath = fmt_nsd_catalog_xpath.format(
+ project=quoted_key(project_name))
+ nsd_catalog = nsd_pxy.get_config(nsd_xpath)
+ assert nsd_catalog
+
+ nsd_xpath = fmt_nsd_catalog_xpath.format(
+ project=quoted_key(project_name))
+ nsd_catalog = nsd_pxy.get_config(nsd_xpath)
+ assert nsd_catalog
+ nsd = nsd_catalog.nsd[0]
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account.name, nsd.name, nsd)
+
+ logger.debug(
+ 'Instantiating NS for project {}'.format(project_name))
+ rift.auto.descriptor.instantiate_nsr(
+ nsr, rwnsr_pxy, logger, project=project_name)
+
+ delete_data_set(2)
+ failover_and_match()
+ delete_data_set(1)
+ failover_and_match()
+
+
diff --git a/rwlaunchpad/ra/pytest/ns/haproxy/test_scaling.py b/rwlaunchpad/ra/pytest/ns/haproxy/test_scaling.py
index 846ef2e..ec472a9 100644
--- a/rwlaunchpad/ra/pytest/ns/haproxy/test_scaling.py
+++ b/rwlaunchpad/ra/pytest/ns/haproxy/test_scaling.py
@@ -15,18 +15,26 @@
# limitations under the License.
#
+import gi
import pytest
-from gi.repository import NsrYang, RwNsrYang, RwVnfrYang, NsdYang, RwNsdYang
+from gi.repository import (
+ NsrYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwProjectNsdYang,
+ )
import rift.auto.session
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
@pytest.fixture(scope='module')
def proxy(request, mgmt_session):
return mgmt_session.proxy
-ScalingGroupInstance = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_ScalingGroup_Instance
-ScalingGroup = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_ScalingGroup
+ScalingGroupInstance = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_ScalingGroup_Instance
+ScalingGroup = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_ScalingGroup
INSTANCE_ID = 1
@@ -41,9 +49,9 @@
proxy (Callable): Proxy for launchpad session.
state (str): Expected state
"""
- nsr_opdata = proxy(RwNsrYang).get('/ns-instance-opdata')
+ nsr_opdata = proxy(RwNsrYang).get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsr = nsr_opdata.nsr[0]
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/operational-status".format(nsr.ns_instance_config_ref)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/operational-status".format(quoted_key(nsr.ns_instance_config_ref))
proxy(RwNsrYang).wait_for(xpath, state, timeout=240)
def verify_scaling_group(self, proxy, group_name, expected_records_count, scale_out=True):
@@ -58,12 +66,12 @@
2. Status of the scaling group
3. New vnfr record has been created.
"""
- nsr_opdata = proxy(RwNsrYang).get('/ns-instance-opdata')
+ nsr_opdata = proxy(RwNsrYang).get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsr_id = nsr_opdata.nsr[0].ns_instance_config_ref
- xpath = ('/ns-instance-opdata/nsr[ns-instance-config-ref="{}"]'
- '/scaling-group-record[scaling-group-name-ref="{}"]').format(
- nsr_id, group_name)
+ xpath = ('/rw-project:project[rw-project:name="default"]/ns-instance-opdata/nsr[ns-instance-config-ref={}]'
+ '/scaling-group-record[scaling-group-name-ref={}]').format(
+ quoted_key(nsr_id), quoted_key(group_name))
scaling_record = proxy(NsrYang).get(xpath)
@@ -74,7 +82,7 @@
for vnfr in instance.vnfrs:
vnfr_record = proxy(RwVnfrYang).get(
- "/vnfr-catalog/vnfr[id='{}']".format(vnfr))
+ "/rw-project:project[rw-project:name='default']/vnfr-catalog/vnfr[id={}]".format(quoted_key(vnfr)))
assert vnfr_record is not None
def verify_scale_up(self, proxy, group_name, expected):
@@ -105,38 +113,38 @@
"""Wait till the NSR state moves to configured before starting scaling
tests.
"""
- nsr_opdata = proxy(RwNsrYang).get('/ns-instance-opdata')
+ nsr_opdata = proxy(RwNsrYang).get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
assert len(nsrs) == 1
current_nsr = nsrs[0]
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/config-status".format(current_nsr.ns_instance_config_ref)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status".format(quoted_key(current_nsr.ns_instance_config_ref))
proxy(RwNsrYang).wait_for(xpath, "configured", timeout=240)
def test_min_max_scaling(self, proxy):
- nsr_opdata = proxy(RwNsrYang).get('/ns-instance-opdata')
+ nsr_opdata = proxy(RwNsrYang).get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
nsd_id = nsrs[0].nsd_ref
nsr_id = nsrs[0].ns_instance_config_ref
# group_name = "http_client_group"
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/scaling-group-record".format(nsr_id)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/scaling-group-record".format(quoted_key(nsr_id))
scaling_records = proxy(RwNsrYang).get(xpath, list_obj=True)
for scaling_record in scaling_records.scaling_group_record:
group_name = scaling_record.scaling_group_name_ref
- xpath = "/nsd-catalog/nsd[id='{}']/scaling-group-descriptor[name='{}']".format(
- nsd_id, group_name)
- scaling_group_desc = proxy(NsdYang).get(xpath)
+ xpath = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd[id={}]/scaling-group-descriptor[name={}]".format(
+ quoted_key(nsd_id), quoted_key(group_name))
+ scaling_group_desc = proxy(RwProjectNsdYang).get(xpath)
# Add + 1 to go beyond the threshold
for instance_id in range(1, scaling_group_desc.max_instance_count + 1):
- xpath = '/ns-instance-config/nsr[id="{}"]/scaling-group[scaling-group-name-ref="{}"]'.format(
- nsr_id,
- group_name)
+ xpath = '/rw-project:project[rw-project:name="default"]/ns-instance-config/nsr[id={}]/scaling-group[scaling-group-name-ref={}]'.format(
+ quoted_key(nsr_id),
+ quoted_key(group_name))
instance = ScalingGroupInstance.from_dict({"id": instance_id})
scaling_group = proxy(NsrYang).get(xpath)
@@ -155,10 +163,10 @@
assert instance_id == scaling_group_desc.max_instance_count
for instance_id in range(1, scaling_group_desc.max_instance_count):
- xpath = ('/ns-instance-config/nsr[id="{}"]/scaling-group'
- '[scaling-group-name-ref="{}"]/'
- 'instance[id="{}"]').format(
- nsr_id, group_name, instance_id)
+ xpath = ('/rw-project:project[rw-project:name="default"]/ns-instance-config/nsr[id={}]/scaling-group'
+ '[scaling-group-name-ref={}]/'
+ 'instance[id={}]').format(
+ quoted_key(nsr_id), quoted_key(group_name), quoted_key(instance_id))
proxy(NsrYang).delete_config(xpath)
self.verify_scale_in(proxy, group_name, instance_id)
diff --git a/rwlaunchpad/ra/pytest/ns/pingpong/test_accounts_framework.py b/rwlaunchpad/ra/pytest/ns/pingpong/test_accounts_framework.py
new file mode 100644
index 0000000..b69192b
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/pingpong/test_accounts_framework.py
@@ -0,0 +1,138 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+@file test_accounts_framework.py
+@author Paul Laidler (Paul.Laidler@riftio.com)
+@date 06/21/2017
+@brief Test logical account usage with vim and ro
+"""
+
+import gi
+import logging
+import os
+import pytest
+import random
+import re
+import subprocess
+import sys
+import time
+import uuid
+
+from contextlib import contextmanager
+
+import rift.auto.mano
+import rift.auto.session
+import rift.auto.descriptor
+
+import rift.mano.examples.ping_pong_nsd
+
+gi.require_version('RwVnfrYang', '1.0')
+from gi.repository import (
+ NsrYang,
+ RwProjectNsdYang,
+ VnfrYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwBaseYang,
+)
+
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+
+@pytest.fixture(scope='session')
+def descriptors_pingpong():
+ return rift.mano.examples.ping_pong_nsd.generate_ping_pong_descriptors(pingcount=1)
+
+@pytest.fixture(scope='session')
+def packages_pingpong(descriptors_pingpong):
+ return rift.auto.descriptor.generate_descriptor_packages(descriptors_pingpong)
+
+def VerifyAllInstancesRunning(mgmt_session):
+ ''' Verifies all network service instances reach running operational status '''
+ nsr_opdata = mgmt_session.proxy(RwNsrYang).get("/rw-project:project[rw-project:name='default']/ns-instance-opdata")
+ nsrs = nsr_opdata.nsr
+ for nsr in nsrs:
+ xpath = (
+ "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref='{ns_instance_config_ref}']/operational-status"
+ ).format(
+ ns_instance_config_ref=nsr.ns_instance_config_ref
+ )
+ mgmt_session.proxy(RwNsrYang).wait_for(xpath, "running", fail_on=['failed'], timeout=300)
+
+def VerifyAllInstancesConfigured(mgmt_session):
+ ''' Verifies all network service instances reach configured config status '''
+ nsr_opdata = mgmt_session.proxy(RwNsrYang).get("/rw-project:project[rw-project:name='default']/ns-instance-opdata")
+ nsrs = nsr_opdata.nsr
+ for nsr in nsrs:
+ xpath = (
+ "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/config-status"
+ ).format(
+ nsr.ns_instance_config_ref
+ )
+ mgmt_session.proxy(RwNsrYang).wait_for(xpath, "configured", fail_on=['failed'], timeout=300)
+
+@pytest.mark.depends('launchpad')
+@pytest.mark.setup('descriptors')
+@pytest.mark.incremental
+class TestSetupPingpong(object):
+ def test_onboard(self, mgmt_session, packages_pingpong):
+ for descriptor_package in packages_pingpong:
+ rift.auto.descriptor.onboard(mgmt_session, descriptor_package)
+
+@pytest.mark.depends('descriptors')
+@pytest.mark.incremental
+class TestInstantiateVim:
+ def test_instantiate_vim(self, mgmt_session, cloud_account_name):
+ nsd_catalog = mgmt_session.proxy(RwProjectNsdYang).get_config("/rw-project:project[rw-project:name='default']/nsd-catalog")
+ nsd = nsd_catalog.nsd[0]
+
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account_name,
+ "pp_vim",
+ nsd,
+ )
+ mgmt_session.proxy(RwNsrYang).create_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr", nsr)
+
+ def test_verify_running(self, mgmt_session):
+ VerifyAllInstancesRunning(mgmt_session)
+
+ def test_verify_configured(self, mgmt_session):
+ VerifyAllInstancesConfigured(mgmt_session)
+
+@pytest.mark.depends('descriptors')
+@pytest.mark.incremental
+class TestInstantiateRo:
+ def test_instantiate_ro(self, mgmt_session, cloud_account_name, ro_map):
+ nsd_catalog = mgmt_session.proxy(RwProjectNsdYang).get_config("/rw-project:project[rw-project:name='default']/nsd-catalog")
+ nsd = nsd_catalog.nsd[0]
+
+ resource_orchestrator, datacenter = ro_map[cloud_account_name]
+ nsr = rift.auto.descriptor.create_nsr(
+ datacenter,
+ "pp_ro",
+ nsd,
+ resource_orchestrator=resource_orchestrator
+ )
+ mgmt_session.proxy(RwNsrYang).create_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr", nsr)
+
+ def test_verify_running(self, mgmt_session):
+ VerifyAllInstancesRunning(mgmt_session)
+
+ def test_verify_configured(self, mgmt_session):
+ VerifyAllInstancesConfigured(mgmt_session)
+
diff --git a/rwlaunchpad/ra/pytest/ns/pingpong/test_floating_ip.py b/rwlaunchpad/ra/pytest/ns/pingpong/test_floating_ip.py
new file mode 100644
index 0000000..5d3a6a3
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/pingpong/test_floating_ip.py
@@ -0,0 +1,160 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+
+import gi
+import os
+
+import rift.auto.descriptor
+import rift.auto.mano as mano
+
+gi.require_version('RwNsrYang', '1.0')
+gi.require_version('RwProjectNsdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
+gi.require_version('RwVnfrYang', '1.0')
+gi.require_version('RwCloudYang', '1.0')
+
+from gi.repository import (
+ RwProjectNsdYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwProjectVnfdYang,
+ RwCloudYang
+)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+
+class TestFloatingIP(object):
+ """TestFloatingIP."""
+
+ # After RIFTIT-909 is completed this test will be set to working
+ valid_pool_names = ['FIP_SYSTEST_POOL_LARGE', 'public']
+ invalid_pool_names = ['', 'FIP_SYSTEST_POOL_EMPTY', 'invalid']
+
+ def create_cloud_account(
+ self, cloud_host, cloud_user, cloud_tenants, vim_ssl_enabled,
+ idx, mgmt_session):
+ """create_cloud_account."""
+ for cloud_tenant in cloud_tenants:
+ floating_ip_pool_names = (
+ self.valid_pool_names + self.invalid_pool_names)
+ project_name = 'float_project_{}'.format(idx)
+ password = 'mypasswd'
+ auth_url = 'http://{host}:5000/v3/'.format(host=cloud_host)
+ if vim_ssl_enabled is True:
+ auth_url = 'https://{host}:5000/v3/'.format(host=cloud_host)
+ mgmt_network = os.getenv('MGMT_NETWORK', 'private')
+ cloud_acc_name = 'cloud_account'
+ pool_name = floating_ip_pool_names[idx - 1]
+ cloud_account = (
+ RwCloudYang.
+ YangData_RwProject_Project_Cloud_Account.from_dict({
+ 'name': cloud_acc_name,
+ 'account_type': 'openstack',
+ 'openstack': {
+ 'admin': True,
+ 'key': cloud_user,
+ 'secret': password,
+ 'auth_url': auth_url,
+ 'tenant': cloud_tenant,
+ 'mgmt_network': mgmt_network,
+ 'floating_ip_pool': pool_name,
+ }
+ }))
+ mano.create_cloud_account(
+ mgmt_session, cloud_account, project_name=project_name)
+
+ def yield_vnfd_vnfr_pairs(self, proxy, nsr=None):
+ """
+ Yield tuples of vnfd & vnfr entries.
+
+ Args:
+ proxy (callable): Launchpad proxy
+ nsr (optional): If specified, only the vnfr & vnfd records of the
+ NSR are returned
+
+ Yields:
+ Tuple: VNFD and its corresponding VNFR entry
+ """
+ def get_vnfd(vnfd_id):
+ xpath = (
+ "/rw-project:project[rw-project:name='default']/" +
+ "vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_id)))
+ return proxy(RwProjectVnfdYang).get(xpath)
+
+ vnfr = (
+ "/rw-project:project[rw-project:name='default']/vnfr-catalog/vnfr")
+ vnfrs = proxy(RwVnfrYang).get(vnfr, list_obj=True)
+ for vnfr in vnfrs.vnfr:
+
+ if nsr:
+ const_vnfr_ids = [const_vnfr.vnfr_id for const_vnfr in nsr.constituent_vnfr_ref]
+ if vnfr.id not in const_vnfr_ids:
+ continue
+
+ vnfd = get_vnfd(vnfr.vnfd.id)
+ yield vnfd, vnfr
+
+ def test_floating_ip(
+ self, rw_user_proxy, rbac_user_passwd, user_domain, logger,
+ rw_project_proxy, rw_rbac_int_proxy, descriptors, mgmt_session,
+ cloud_user, cloud_tenants, vim_ssl_enabled, cloud_host,
+ fmt_nsd_catalog_xpath):
+ """test_floating_ip."""
+ proxy = mgmt_session.proxy
+ no_of_pool_name_cases = (
+ len(self.valid_pool_names + self.invalid_pool_names) + 1)
+ for idx in range(1, no_of_pool_name_cases):
+ project_name = 'float_project_{}'.format(idx)
+ user_name = 'float_user_{}'.format(idx)
+ project_role = 'rw-project:project-admin'
+ cloud_acc_name = 'cloud_account'
+ mano.create_user(
+ rw_user_proxy, user_name, rbac_user_passwd, user_domain)
+ mano.assign_project_role_to_user(
+ rw_project_proxy, project_role, user_name, project_name,
+ user_domain, rw_rbac_int_proxy)
+
+ self.create_cloud_account(
+ cloud_host, cloud_user, cloud_tenants,
+ vim_ssl_enabled, idx, mgmt_session)
+
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(
+ mgmt_session, descriptor, project=project_name)
+
+ nsd_pxy = mgmt_session.proxy(RwProjectNsdYang)
+ nsd_catalog = nsd_pxy.get_config(
+ fmt_nsd_catalog_xpath.format(project=quoted_key(project_name)))
+ assert nsd_catalog
+ nsd = nsd_catalog.nsd[0]
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_acc_name, nsd.name, nsd)
+ rwnsr_pxy = mgmt_session.proxy(RwNsrYang)
+
+ try:
+ rift.auto.descriptor.instantiate_nsr(
+ nsr, rwnsr_pxy, logger, project=project_name)
+ except(Exception):
+ continue
+ for vnfd, vnfr in self.yield_vnfd_vnfr_pairs(proxy):
+ if idx > len(self.valid_pool_names):
+ assert vnfr.vdur[0].management_ip is None
+ else:
+ vnfr.vdur[0].management_ip is not None
diff --git a/rwlaunchpad/ra/pytest/ns/pingpong/test_ha_pingpong.py b/rwlaunchpad/ra/pytest/ns/pingpong/test_ha_pingpong.py
new file mode 100644
index 0000000..02ed3a5
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/pingpong/test_ha_pingpong.py
@@ -0,0 +1,329 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2016 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+@file test_launchpad.py
+@author Paul Laidler (Paul.Laidler@riftio.com)
+@date 07/07/2016
+@brief High-availibility system test that runs ping pong workflow
+"""
+
+import gi
+import logging
+import os
+import pytest
+import random
+import re
+import subprocess
+import sys
+import time
+import uuid
+
+from contextlib import contextmanager
+
+import rift.auto.mano
+import rift.auto.session
+import rift.auto.descriptor
+
+gi.require_version('RwVnfrYang', '1.0')
+from gi.repository import (
+ NsrYang,
+ RwProjectNsdYang,
+ VnfrYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwBaseYang,
+)
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+
+@pytest.mark.setup('seed_random')
+class TestSeedRandom:
+ def test_seed_random(self, random_seed):
+ logger.info("Seeding number generator with seed {}".format(random_seed))
+ random.seed(random_seed)
+
+class MaxRetriesExceededException(Exception):
+ '''Indicates the maximum allowed number of retries has been exceeded for an operation
+ '''
+ pass
+
+class HAVerifyException(Exception):
+ '''Indicates a failure to verify correct HA behaviour
+ '''
+ pass
+
+
+class HASession:
+ ''' Wrapper around management session, which kills off system components
+ in order to trigger HA functionality
+ '''
+
+ DEFAULT_ATTEMPTS=3
+ DEFAULT_MIN_DELAY=0.0
+ DEFAULT_MAX_DELAY=1
+ DEFAULT_FREQUENCY=1
+ DEFAULT_RECOVERY_TIMEOUT=120
+
+ def __init__(self, session):
+ ''' Create a new HASession instance
+
+ Returns:
+ instance of HASession
+ '''
+ self.session = session
+ self.set_config()
+
+ @contextmanager
+ def config(self, *args, **kwargs):
+ ''' Context manager to allow HASession to temporarily have its config modified
+ '''
+ current_config = self.get_config()
+ self.set_config(*args, **kwargs)
+ yield
+ self.set_config(*current_config)
+
+ def get_config(self):
+ ''' Returns the current HA session config
+ '''
+ return (self.attempts, self.min_delay, self.max_delay, self.ha_frequency, self.recovery_timeout)
+
+ def set_config(self, attempts=None, min_delay=None, max_delay=None, ha_frequency=None, recovery_timeout=None):
+ ''' Set the HA session config, set default values for all config options not provided
+
+ Arguments:
+ attempts - Number of times to attempt an operation before failing
+ min_delay - minimum time that must elapse before session is allowed to kill a component
+ max_delay - maximum time that may elapse before killing a component
+ ha_frequency - frequency at which operations are tested for ha
+ recovery_timeout - time allowed for system to recovery after a component is killed
+ '''
+ if not attempts:
+ attempts = HASession.DEFAULT_ATTEMPTS
+ if not min_delay:
+ min_delay = HASession.DEFAULT_MIN_DELAY
+ if not max_delay:
+ max_delay = HASession.DEFAULT_MAX_DELAY
+ if not ha_frequency:
+ ha_frequency = HASession.DEFAULT_FREQUENCY
+ if not recovery_timeout:
+ recovery_timeout = HASession.DEFAULT_RECOVERY_TIMEOUT
+
+ self.attempts = attempts
+ self.min_delay = min_delay
+ self.max_delay = max_delay
+ self.ha_frequency = ha_frequency
+ self.recovery_timeout = recovery_timeout
+
+ def call(self, operation, *args, **kwargs):
+ ''' Call an operation using the wrapped management session, then
+ kill off a system component, and verify the operation still succeeds
+
+ Arguments:
+ operation - operation to be invoked
+ '''
+ # Choose to make the normal session call or do the HA test
+ if random.choice(range(0,int(1/self.ha_frequency))) != 0:
+ return operation(*args, **kwargs)
+
+ # Make sure we're starting from a running system
+ rift.vcs.vcs.wait_until_system_started(self.session)
+
+ def choose_any_tasklet(vcs_info):
+ tasklets = [component_info.component_name for component_info in vcs_info.components.component_info]
+ return random.choice(tasklets)
+
+ def choose_restartable_tasklet(vcs_info):
+ restartable_tasklets = [
+ component_info.component_name
+ for component_info in vcs_info.components.component_info
+ if component_info.recovery_action == 'RESTART'
+ and component_info.component_type == 'RWTASKLET'
+ ]
+ return random.choice(restartable_tasklets)
+
+ vcs_info = self.session.proxy(RwBaseYang).get('/vcs/info')
+ component_name = choose_restartable_tasklet(vcs_info)
+
+ ssh_cmd = 'ssh {} -o StrictHostKeyChecking=no -o BatchMode=yes'.format(self.session.host)
+ def get_component_process_pid(component_name):
+ cmd = '{} -- \'ps -ef | grep -v "grep" | grep rwmain | grep "{}" | tr -s " " | cut -d " " -f 2\''.format(ssh_cmd, component_name)
+ logger.info("Finding component [{}] pid using cmd: {}".format(component_name, cmd))
+ output = subprocess.check_output(cmd, shell=True)
+ return output.decode('ascii').strip()
+ process_pid = get_component_process_pid(component_name)
+ logger.info('{} has pid {}'.format(component_name, process_pid))
+
+ # Kick off a background process to kill the tasklet after some delay
+ delay = self.min_delay + (self.max_delay-self.min_delay)*random.random()
+ logger.info("Killing {} [{}] in {}".format(component_name, process_pid, delay))
+ cmd = '(sleep {} && {} -- "sudo kill -9 {}") &'.format(delay, ssh_cmd, process_pid)
+ os.system(cmd)
+
+ # Invoke session operation
+ now = time.time()
+ result = None
+ attempt = 0
+ while attempt < self.attempts:
+ try:
+ result = operation(*args, **kwargs)
+ # Possible improvement: implement optional verify step here
+ break
+ except Exception:
+ logger.error('operation failed - {}'.format(operation))
+ attempt += 1
+ # If the operation failed, wait until recovery occurs to re-attempt
+ rift.vcs.vcs.wait_until_system_started(self.session)
+
+ if attempt >= self.attempts:
+ raise MaxRetriesExceededException("Killed %s [%d] - Subsequently failed operation : %s %s %s", component_name, process_pid, operation, args, kwargs )
+
+ # Wait until kill has definitely happened
+ elapsed = now - time.time()
+ remaining = delay - elapsed
+ if remaining > 0:
+ time.sleep(remaining)
+ time.sleep(3)
+
+ # Verify system reaches running status again
+ rift.vcs.vcs.wait_until_system_started(self.session)
+
+ # TODO: verify the tasklet process was actually restarted (got a new pid)
+ new_pid = get_component_process_pid(component_name)
+ if process_pid == new_pid:
+ raise HAVerifyException("Process pid unchanged : %d == %d ~ didn't die?" % (process_pid, new_pid))
+
+ return result
+
+@pytest.fixture
+def ha_session(mgmt_session):
+ return HASession(mgmt_session)
+
+@pytest.mark.depends('seed_random')
+@pytest.mark.setup('launchpad')
+@pytest.mark.incremental
+class TestLaunchpadSetup:
+ def test_create_cloud_accounts(self, ha_session, mgmt_session, cloud_module, cloud_xpath, cloud_accounts):
+ '''Configure cloud accounts
+
+ Asserts:
+ Cloud name and cloud type details
+ '''
+ for cloud_account in cloud_accounts:
+ xpath = "{cloud_xpath}[name={cloud_account_name}]".format(
+ cloud_xpath=cloud_xpath,
+ cloud_account_name=quoted_key(cloud_account.name)
+ )
+ ha_session.call(mgmt_session.proxy(cloud_module).replace_config, xpath, cloud_account)
+ response = ha_session.call(mgmt_session.proxy(cloud_module).get, xpath)
+ assert response.name == cloud_account.name
+ assert response.account_type == cloud_account.account_type
+
+@pytest.mark.teardown('launchpad')
+@pytest.mark.incremental
+class TestLaunchpadTeardown:
+ def test_delete_cloud_accounts(self, ha_session, mgmt_session, cloud_module, cloud_xpath, cloud_accounts):
+ '''Unconfigure cloud_account'''
+ for cloud_account in cloud_accounts:
+ xpath = "{cloud_xpath}[name={cloud_account_name}]".format(
+ cloud_xpath=cloud_xpath,
+ cloud_account_name=quoted_key(cloud_account.name)
+ )
+ ha_session.call(mgmt_session.proxy(cloud_module).delete_config, xpath)
+
+@pytest.mark.setup('pingpong')
+@pytest.mark.depends('launchpad')
+@pytest.mark.incremental
+class TestSetupPingpong(object):
+ def test_onboard(self, ha_session, mgmt_session, descriptors):
+ for descriptor in descriptors:
+ with ha_session.config(max_delay=15):
+ ha_session.call(rift.auto.descriptor.onboard, mgmt_session, descriptor)
+
+ def test_instantiate(self, ha_session, mgmt_session, cloud_account_name):
+ catalog = ha_session.call(mgmt_session.proxy(RwProjectNsdYang).get_config, '/nsd-catalog')
+ nsd = catalog.nsd[0]
+ nsr = rift.auto.descriptor.create_nsr(cloud_account_name, "pingpong_1", nsd)
+ ha_session.call(mgmt_session.proxy(RwNsrYang).create_config, '/ns-instance-config/nsr', nsr)
+
+@pytest.mark.depends('pingpong')
+@pytest.mark.teardown('pingpong')
+@pytest.mark.incremental
+class TestTeardownPingpong(object):
+ def test_teardown(self, ha_session, mgmt_session):
+ ns_instance_config = ha_session.call(mgmt_session.proxy(RwNsrYang).get_config, '/ns-instance-config')
+ for nsr in ns_instance_config.nsr:
+ ha_session.call(mgmt_session.proxy(RwNsrYang).delete_config, "/ns-instance-config/nsr[id={}]".format(quoted_key(nsr.id)))
+
+ time.sleep(60)
+ vnfr_catalog = ha_session.call(mgmt_session.proxy(RwVnfrYang).get, '/vnfr-catalog')
+ assert vnfr_catalog is None or len(vnfr_catalog.vnfr) == 0
+
+@pytest.mark.depends('launchpad')
+@pytest.mark.incremental
+class TestLaunchpad:
+ def test_account_connection_status(self, ha_session, mgmt_session, cloud_module, cloud_xpath, cloud_accounts):
+ '''Verify connection status on each cloud account
+
+ Asserts:
+ Cloud account is successfully connected
+ '''
+ for cloud_account in cloud_accounts:
+ with ha_session.config(attempts=2):
+ ha_session.call(
+ mgmt_session.proxy(cloud_module).wait_for,
+ '{}[name={}]/connection-status/status'.format(cloud_xpath, quoted_key(cloud_account.name)),
+ 'success',
+ timeout=60,
+ fail_on=['failure']
+ )
+
+@pytest.mark.depends('pingpong')
+@pytest.mark.incremental
+class TestPingpong:
+ def test_service_started(self, ha_session, mgmt_session):
+ nsr_opdata = ha_session.call(mgmt_session.proxy(RwNsrYang).get, '/ns-instance-opdata')
+ nsrs = nsr_opdata.nsr
+
+ for nsr in nsrs:
+ xpath = (
+ "/ns-instance-opdata/nsr[ns-instance-config-ref={ns_instance_config_ref}]/operational-status"
+ ).format(
+ ns_instance_config_ref=quoted_key(nsr.ns_instance_config_ref)
+ )
+
+ with ha_session.config(attempts=2, max_delay=60):
+ ha_session.call(mgmt_session.proxy(RwNsrYang).wait_for, xpath, "running", fail_on=['failed'], timeout=300)
+
+ def test_service_configured(self, ha_session, mgmt_session):
+ nsr_opdata = ha_session.call(mgmt_session.proxy(RwNsrYang).get, '/ns-instance-opdata')
+ nsrs = nsr_opdata.nsr
+
+ for nsr in nsrs:
+ xpath = (
+ "/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status"
+ ).format(
+ quoted_key(nsr.ns_instance_config_ref)
+ )
+
+ with ha_session.config(attempts=2, max_delay=60):
+ ha_session.call(mgmt_session.proxy(RwNsrYang).wait_for, xpath, "configured", fail_on=['failed'], timeout=300)
+
diff --git a/rwlaunchpad/ra/pytest/ns/pingpong/test_input_params.py b/rwlaunchpad/ra/pytest/ns/pingpong/test_input_params.py
new file mode 100644
index 0000000..a549b41
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/pingpong/test_input_params.py
@@ -0,0 +1,431 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+@file test_input_params.py
+@author Paul Laidler (Paul.Laidler@riftio.com)
+@date 06/21/2017
+@brief Test of VNF Input parameters using ping pong
+"""
+
+import gi
+import logging
+import os
+import pytest
+import random
+import re
+import subprocess
+import sys
+import time
+import uuid
+
+from contextlib import contextmanager
+
+import rift.auto.mano
+import rift.auto.session
+import rift.auto.descriptor
+
+gi.require_version('RwVnfrYang', '1.0')
+from gi.repository import (
+ NsrYang,
+ RwProjectNsdYang,
+ VnfrYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwBaseYang,
+)
+
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+
+@pytest.fixture(scope='session')
+def global_vendor_name():
+ return 'global_vendor'
+
+@pytest.fixture(scope='session')
+def ping_custom_vendor_name():
+ return 'ping_vendor'
+
+@pytest.fixture(scope='session')
+def pong_custom_vendor_name():
+ return 'pong_vendor'
+
+@pytest.fixture(scope='session')
+def ping_custom_init_data():
+ return 'ping_custom_init_data'
+
+@pytest.fixture(scope='session')
+def pong_custom_init_data():
+ return 'pong_custom_init_data'
+
+@pytest.fixture(scope='session')
+def ping_custom_meta_data():
+ return 'ping_custom_meta_data'
+
+@pytest.fixture(scope='session')
+def pong_custom_meta_data():
+ return 'pong_custom_meta_data'
+
+@pytest.fixture(scope='session')
+def ping_custom_script_init_data():
+ return 'ping'
+
+@pytest.fixture(scope='session')
+def pong_custom_script_init_data():
+ return 'pong'
+
+@pytest.fixture(scope='session')
+def ping_descriptor(descriptors_pingpong_vnf_input_params):
+ return descriptors_pingpong_vnf_input_params[0]
+
+@pytest.fixture(scope='session')
+def pong_descriptor(descriptors_pingpong_vnf_input_params):
+ return descriptors_pingpong_vnf_input_params[1]
+
+@pytest.fixture(scope='session')
+def ping_pong_descriptor(descriptors_pingpong_vnf_input_params):
+ return descriptors_pingpong_vnf_input_params[2]
+
+@pytest.fixture(scope='session')
+def ping_id(ping_descriptor):
+ return ping_descriptor.vnfd.id
+
+@pytest.fixture(scope='session')
+def pong_id(pong_descriptor):
+ return pong_descriptor.vnfd.id
+
+@pytest.fixture(scope='session')
+def ping_script_descriptor(descriptors_pingpong_script_input_params):
+ return descriptors_pingpong_script_input_params[0]
+
+@pytest.fixture(scope='session')
+def pong_script_descriptor(descriptors_pingpong_script_input_params):
+ return descriptors_pingpong_script_input_params[1]
+
+@pytest.fixture(scope='session')
+def ping_pong_script_descriptor(descriptors_pingpong_script_input_params):
+ return descriptors_pingpong_script_input_params[2]
+
+@pytest.fixture(scope='session')
+def ping_script_id(ping_script_descriptor):
+ return ping_script_descriptor.vnfd.id
+
+@pytest.fixture(scope='session')
+def pong_script_id(pong_script_descriptor):
+ return pong_script_descriptor.vnfd.id
+
+
+def VerifyAllInstancesRunning(mgmt_session):
+ ''' Verifies all network service instances reach running operational status '''
+ nsr_opdata = mgmt_session.proxy(RwNsrYang).get("/rw-project:project[rw-project:name='default']/ns-instance-opdata")
+ nsrs = nsr_opdata.nsr
+ for nsr in nsrs:
+ xpath = (
+ "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref='{ns_instance_config_ref}']/operational-status"
+ ).format(
+ ns_instance_config_ref=nsr.ns_instance_config_ref
+ )
+ mgmt_session.proxy(RwNsrYang).wait_for(xpath, "running", fail_on=['failed'], timeout=300)
+
+def VerifyAllInstancesConfigured(mgmt_session):
+ ''' Verifies all network service instances reach configured config status '''
+ nsr_opdata = mgmt_session.proxy(RwNsrYang).get("/rw-project:project[rw-project:name='default']/ns-instance-opdata")
+ nsrs = nsr_opdata.nsr
+ for nsr in nsrs:
+ xpath = (
+ "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/config-status"
+ ).format(
+ nsr.ns_instance_config_ref
+ )
+ mgmt_session.proxy(RwNsrYang).wait_for(xpath, "configured", fail_on=['failed'], timeout=300)
+
+@pytest.mark.depends('launchpad')
+@pytest.mark.setup('descriptors')
+@pytest.mark.incremental
+class TestSetupPingpong(object):
+ def test_onboard_custom_descriptors(self, mgmt_session, packages_pingpong_vnf_input_params, packages_pingpong_script_input_params):
+ for descriptor_package in packages_pingpong_vnf_input_params:
+ rift.auto.descriptor.onboard(mgmt_session, descriptor_package)
+ for descriptor_package in packages_pingpong_script_input_params:
+ rift.auto.descriptor.onboard(mgmt_session, descriptor_package)
+
+@pytest.mark.depends('descriptors')
+@pytest.mark.incremental
+class TestGlobalVnfInputParams:
+ def test_instantiate(self, mgmt_session, cloud_account_name, global_vendor_name):
+ ''' Testing vnf input parameters with broadest xpath expression allowed
+
+ /vnfd:vnfd-catalog/vnfd:vnfd/<leaf>
+
+ Expected to replace the leaf in all member VNFs
+ '''
+
+ xpath = "/vnfd:vnfd-catalog/vnfd:vnfd/vnfd:vendor"
+ value = global_vendor_name
+ vnf_input_parameter = rift.auto.descriptor.create_vnf_input_parameter(xpath, value)
+
+ nsd_catalog = mgmt_session.proxy(RwProjectNsdYang).get_config("/rw-project:project[rw-project:name='default']/nsd-catalog")
+ nsd = [nsd for nsd in nsd_catalog.nsd if nsd.name == 'pp_input_nsd'][0]
+
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account_name,
+ "pp_input_params_1",
+ nsd,
+ vnf_input_param_list=[vnf_input_parameter]
+ )
+ mgmt_session.proxy(RwNsrYang).create_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr", nsr)
+
+
+ def test_verify_running(self, mgmt_session):
+ VerifyAllInstancesRunning(mgmt_session)
+
+ def test_verify_configured(self, mgmt_session):
+ VerifyAllInstancesConfigured(mgmt_session)
+
+ def test_verify_vnf_input_parameters(self, mgmt_session, ping_id, pong_id, global_vendor_name):
+ vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog")
+ ping_vnfr = [vnfr for vnfr in vnfr_catalog.vnfr if vnfr.vnfd.id == ping_id][0]
+ pong_vnfr = [vnfr for vnfr in vnfr_catalog.vnfr if vnfr.vnfd.id == pong_id][0]
+ ping_vendor_name = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog/vnfr[id='%s']/vendor" % ping_vnfr.id)
+ assert ping_vendor_name == global_vendor_name
+ pong_vendor_name = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog/vnfr[id='%s']/vendor" % pong_vnfr.id)
+ assert pong_vendor_name == global_vendor_name
+
+ def test_teardown(self, mgmt_session):
+ ns_instance_config = mgmt_session.proxy(RwNsrYang).get_config("/rw-project:project[rw-project:name='default']/ns-instance-config")
+ for nsr in ns_instance_config.nsr:
+ mgmt_session.proxy(RwNsrYang).delete_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id='{}']".format(nsr.id))
+ time.sleep(60)
+ vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get("/rw-project:project[rw-project:name='default']/vnfr-catalog")
+ assert vnfr_catalog is None or len(vnfr_catalog.vnfr) == 0
+
+@pytest.mark.depends('descriptors')
+@pytest.mark.incremental
+class TestMemberVnfInputParams:
+ def test_instantiate(self, mgmt_session, cloud_account_name, ping_id, pong_id, ping_custom_vendor_name, pong_custom_vendor_name):
+ ''' Testing vnf input parameters with member specific xpath expression
+
+ /vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='<member-id>'/<leaf>
+
+ Expected to replace the leaf in a specific member VNF
+ '''
+
+ xpath = "/vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='%s']/vnfd:vendor" % (ping_id)
+ value = ping_custom_vendor_name
+ vnf_input_parameter_ping = rift.auto.descriptor.create_vnf_input_parameter(xpath, value, vnfd_id_ref=ping_id)
+
+ xpath = "/vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='%s']/vnfd:vendor" % (pong_id)
+ value = pong_custom_vendor_name
+ vnf_input_parameter_pong = rift.auto.descriptor.create_vnf_input_parameter(xpath, value, vnfd_id_ref=pong_id)
+
+ nsd_catalog = mgmt_session.proxy(RwProjectNsdYang).get_config("/rw-project:project[rw-project:name='default']/nsd-catalog")
+ nsd = [nsd for nsd in nsd_catalog.nsd if nsd.name == 'pp_input_nsd'][0]
+
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account_name,
+ "pp_input_params_2",
+ nsd,
+ vnf_input_param_list=[vnf_input_parameter_ping, vnf_input_parameter_pong]
+ )
+ mgmt_session.proxy(RwNsrYang).create_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr", nsr)
+
+ def test_verify_running(self, mgmt_session):
+ VerifyAllInstancesRunning(mgmt_session)
+
+ def test_verify_configured(self, mgmt_session):
+ VerifyAllInstancesConfigured(mgmt_session)
+
+ def test_verify_vnf_input_parameters(self, mgmt_session, ping_id, pong_id, ping_custom_vendor_name, pong_custom_vendor_name):
+ vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog")
+ ping_vnfr = [vnfr for vnfr in vnfr_catalog.vnfr if vnfr.vnfd.id == ping_id][0]
+ pong_vnfr = [vnfr for vnfr in vnfr_catalog.vnfr if vnfr.vnfd.id == pong_id][0]
+ ping_vendor_name = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog/vnfr[id='%s']/vendor" % ping_vnfr.id)
+ assert ping_vendor_name == ping_custom_vendor_name
+ pong_vendor_name = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog/vnfr[id='%s']/vendor" % pong_vnfr.id)
+ assert pong_vendor_name == pong_custom_vendor_name
+
+ def test_teardown(self, mgmt_session):
+ ns_instance_config = mgmt_session.proxy(RwNsrYang).get_config("/rw-project:project[rw-project:name='default']/ns-instance-config")
+ for nsr in ns_instance_config.nsr:
+ mgmt_session.proxy(RwNsrYang).delete_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id='{}']".format(nsr.id))
+ time.sleep(60)
+ vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get("/rw-project:project[rw-project:name='default']/vnfr-catalog")
+ assert vnfr_catalog is None or len(vnfr_catalog.vnfr) == 0
+
+@pytest.mark.depends('descriptors')
+@pytest.mark.incremental
+class TestMemberVnfInputParamsCloudInit:
+ def test_instantiate(self, mgmt_session, cloud_account_name, ping_id, pong_id, ping_custom_init_data, pong_custom_init_data):
+ ''' Testing vnf input parameters with node specific xpath expression
+
+ /vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='<member-id>']/vnfd:vdu[vnfd:id="<vdu-id>"]/vnfd:supplemental-boot-data/vnfd:custom-meta-data[vnfd:name=<leaf-name>]/vnfd:value
+ /vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='<member-id>'/<leaf>
+
+ Expected to replace the leaf in a specific member VNF
+ '''
+
+ xpath = "/vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='%s']/vnfd:vdu[vnfd:id='iovdu_0']/vnfd:supplemental-boot-data/vnfd:custom-meta-data[vnfd:name='custom_cloud_init_data']/vnfd:value" % (ping_id)
+ value = ping_custom_init_data
+ vnf_input_parameter_ping = rift.auto.descriptor.create_vnf_input_parameter(xpath, value, vnfd_id_ref=ping_id)
+
+ xpath = "/vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='%s']/vnfd:vdu[vnfd:id='iovdu_0']/vnfd:supplemental-boot-data/vnfd:custom-meta-data[vnfd:name='custom_cloud_init_data']/vnfd:value" % (pong_id)
+ value = pong_custom_init_data
+ vnf_input_parameter_pong = rift.auto.descriptor.create_vnf_input_parameter(xpath, value, vnfd_id_ref=pong_id)
+
+
+ nsd_catalog = mgmt_session.proxy(RwProjectNsdYang).get_config("/rw-project:project[rw-project:name='default']/nsd-catalog")
+ nsd = [nsd for nsd in nsd_catalog.nsd if nsd.name == 'pp_input_nsd'][0]
+
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account_name,
+ "pp_input_params_3",
+ nsd,
+ vnf_input_param_list=[vnf_input_parameter_ping, vnf_input_parameter_pong]
+ )
+ mgmt_session.proxy(RwNsrYang).create_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr", nsr)
+
+ def test_verify_running(self, mgmt_session):
+ VerifyAllInstancesRunning(mgmt_session)
+
+ def test_verify_configured(self, mgmt_session):
+ VerifyAllInstancesConfigured(mgmt_session)
+
+ def test_verify_vnf_input_parameters(self, mgmt_session, ping_id, pong_id, ping_custom_init_data, pong_custom_init_data):
+ ''' Verify both ping and pong init data were replaced with their respective init data
+ '''
+ vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog")
+ ping_vnfr = [vnfr for vnfr in vnfr_catalog.vnfr if vnfr.vnfd.id == ping_id][0]
+ pong_vnfr = [vnfr for vnfr in vnfr_catalog.vnfr if vnfr.vnfd.id == pong_id][0]
+
+ # Verify the data was replaced in the vdu
+ ping_init_data = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog/vnfr[id='%s']/vnfd/vdu/supplemental-boot-data/custom-meta-data[name='custom_cloud_init_data']/value" % (ping_vnfr.id))
+ assert ping_init_data == ping_custom_init_data
+ pong_init_data = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog/vnfr[id='%s']/vnfd/vdu/supplemental-boot-data/custom-meta-data[name='custom_cloud_init_data']/value" % (pong_vnfr.id))
+ assert pong_init_data == pong_custom_init_data
+
+ def test_teardown(self, mgmt_session):
+ ns_instance_config = mgmt_session.proxy(RwNsrYang).get_config("/rw-project:project[rw-project:name='default']/ns-instance-config")
+ for nsr in ns_instance_config.nsr:
+ mgmt_session.proxy(RwNsrYang).delete_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id='{}']".format(nsr.id))
+ time.sleep(60)
+ vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get("/rw-project:project[rw-project:name='default']/vnfr-catalog")
+ assert vnfr_catalog is None or len(vnfr_catalog.vnfr) == 0
+
+@pytest.mark.depends('descriptors')
+@pytest.mark.incremental
+class TestMemberVnfInputParamsCloudMeta:
+ def test_instantiate(self, mgmt_session, cloud_account_name, ping_id, pong_id, ping_custom_meta_data, pong_custom_meta_data):
+ ''' Testing vnf input parameters with node specific xpath expression
+
+ /vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='<member-id>']/vnfd:vdu[vnfd:id="<vdu-id>"]/vnfd:supplemental-boot-data/vnfd:custom-meta-data[vnfd:name=<leaf-name>]/vnfd:value
+ /vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='<member-id>'/<leaf>
+
+ Expected to replace the leaf in a specific member VNF
+ '''
+
+ xpath = "/vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='%s']/vnfd:vdu[vnfd:id='iovdu_0']/vnfd:supplemental-boot-data/vnfd:custom-meta-data[vnfd:name='custom_cloud_meta_data']/vnfd:value" % (ping_id)
+ value = ping_custom_meta_data
+ vnf_input_parameter_ping = rift.auto.descriptor.create_vnf_input_parameter(xpath, value, vnfd_id_ref=ping_id)
+
+ xpath = "/vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='%s']/vnfd:vdu[vnfd:id='iovdu_0']/vnfd:supplemental-boot-data/vnfd:custom-meta-data[vnfd:name='custom_cloud_meta_data']/vnfd:value" % (pong_id)
+ value = pong_custom_meta_data
+ vnf_input_parameter_pong = rift.auto.descriptor.create_vnf_input_parameter(xpath, value, vnfd_id_ref=pong_id)
+
+
+ nsd_catalog = mgmt_session.proxy(RwProjectNsdYang).get_config("/rw-project:project[rw-project:name='default']/nsd-catalog")
+ nsd = [nsd for nsd in nsd_catalog.nsd if nsd.name == 'pp_input_nsd'][0]
+
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account_name,
+ "pp_input_params_4",
+ nsd,
+ vnf_input_param_list=[vnf_input_parameter_ping, vnf_input_parameter_pong]
+ )
+ mgmt_session.proxy(RwNsrYang).create_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr", nsr)
+
+ def test_verify_running(self, mgmt_session):
+ VerifyAllInstancesRunning(mgmt_session)
+
+ def test_verify_configured(self, mgmt_session):
+ VerifyAllInstancesConfigured(mgmt_session)
+
+ def test_verify_vnf_input_parameters(self, mgmt_session, ping_id, pong_id, ping_custom_meta_data, pong_custom_meta_data):
+ ''' Verify both ping and pong meta data were replaced with their respective meta data
+ '''
+ vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog")
+ ping_vnfr = [vnfr for vnfr in vnfr_catalog.vnfr if vnfr.vnfd.id == ping_id][0]
+ pong_vnfr = [vnfr for vnfr in vnfr_catalog.vnfr if vnfr.vnfd.id == pong_id][0]
+
+ # Verify the data was replaced in the vdu
+ ping_meta_data = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog/vnfr[id='%s']/vnfd/vdu/supplemental-boot-data/custom-meta-data[name='custom_cloud_meta_data']/value" % (ping_vnfr.id))
+ assert ping_meta_data == ping_custom_meta_data
+ pong_meta_data = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog/vnfr[id='%s']/vnfd/vdu/supplemental-boot-data/custom-meta-data[name='custom_cloud_meta_data']/value" % (pong_vnfr.id))
+ assert pong_meta_data == pong_custom_meta_data
+
+ # Verify the data was also replaced in the vdur
+ ping_meta_data = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog/vnfr[id='%s']/vdur/supplemental-boot-data/custom-meta-data[name='custom_cloud_meta_data']/value" % (ping_vnfr.id))
+ assert ping_meta_data == ping_custom_meta_data
+ pong_meta_data = mgmt_session.proxy(RwVnfrYang).get("/project[name='default']/vnfr-catalog/vnfr[id='%s']/vdur/supplemental-boot-data/custom-meta-data[name='custom_cloud_meta_data']/value" % (pong_vnfr.id))
+ assert pong_meta_data == pong_custom_meta_data
+
+ def test_teardown(self, mgmt_session):
+ ns_instance_config = mgmt_session.proxy(RwNsrYang).get_config("/rw-project:project[rw-project:name='default']/ns-instance-config")
+ for nsr in ns_instance_config.nsr:
+ mgmt_session.proxy(RwNsrYang).delete_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id='{}']".format(nsr.id))
+ time.sleep(60)
+ vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get("/rw-project:project[rw-project:name='default']/vnfr-catalog")
+ assert vnfr_catalog is None or len(vnfr_catalog.vnfr) == 0
+
+
+@pytest.mark.depends('descriptors')
+@pytest.mark.incremental
+@pytest.mark.skipif(True, reason='RIFT-18171 - Disabled due to cloud init failure on userdata supplied bash scripts')
+class TestMemberVnfInputParamsInitScripts:
+ def test_instantiate(self, mgmt_session, cloud_account_name, ping_script_id, pong_script_id, ping_custom_script_init_data, pong_custom_script_init_data):
+ ''' Testing replacement of vnf input parameters with node specific xpath expression in init scripts
+
+ /vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='<member-id>']/vnfd:vdu[vnfd:id="<vdu-id>"]/vnfd:supplemental-boot-data/vnfd:custom-meta-data[vnfd:name=<leaf-name>]/vnfd:value
+ /vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='<member-id>'/<leaf>
+
+ Expected to replace the leaf in a specific member VNF
+ '''
+
+ xpath = "/vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='%s']/vnfd:vdu[vnfd:id='iovdu_0']/vnfd:supplemental-boot-data/vnfd:custom-meta-data[vnfd:name='CI-script-init-data']/vnfd:value" % (ping_script_id)
+ value = ping_custom_script_init_data
+ vnf_input_parameter_ping = rift.auto.descriptor.create_vnf_input_parameter(xpath, value, vnfd_id_ref=ping_script_id)
+
+ xpath = "/vnfd:vnfd-catalog/vnfd:vnfd[vnfd:id='%s']/vnfd:vdu[vnfd:id='iovdu_0']/vnfd:supplemental-boot-data/vnfd:custom-meta-data[vnfd:name='CI-script-init-data']/vnfd:value" % (pong_script_id)
+ value = pong_custom_script_init_data
+ vnf_input_parameter_pong = rift.auto.descriptor.create_vnf_input_parameter(xpath, value, vnfd_id_ref=pong_script_id)
+
+ nsd_catalog = mgmt_session.proxy(RwProjectNsdYang).get_config("/rw-project:project[rw-project:name='default']/nsd-catalog")
+ nsd = [nsd for nsd in nsd_catalog.nsd if nsd.name == 'pp_script_nsd'][0]
+
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account_name,
+ "pp_input_params_5",
+ nsd,
+ vnf_input_param_list=[vnf_input_parameter_ping, vnf_input_parameter_pong]
+ )
+ mgmt_session.proxy(RwNsrYang).create_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr", nsr)
+
+ def test_verify_running(self, mgmt_session):
+ VerifyAllInstancesRunning(mgmt_session)
+
+ def test_verify_configured(self, mgmt_session):
+ # Configuration will only succeed if the replacement was sucessful
+ VerifyAllInstancesConfigured(mgmt_session)
diff --git a/rwlaunchpad/ra/pytest/ns/pingpong/test_mro_pingpong.py b/rwlaunchpad/ra/pytest/ns/pingpong/test_mro_pingpong.py
new file mode 100644
index 0000000..45407db
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/pingpong/test_mro_pingpong.py
@@ -0,0 +1,121 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+@file test_mro_pingpong.py
+@author Paul Laidler (Paul.Laidler@riftio.com)
+@date 06/21/2017
+@brief Multi-RO test that instantiates two ping pong instances on seperate ROs
+"""
+
+import gi
+import logging
+import os
+import pytest
+import random
+import re
+import subprocess
+import sys
+import time
+import uuid
+
+from contextlib import contextmanager
+
+import rift.auto.mano
+import rift.auto.session
+import rift.auto.descriptor
+
+gi.require_version('RwVnfrYang', '1.0')
+from gi.repository import (
+ NsrYang,
+ RwProjectNsdYang,
+ VnfrYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwBaseYang,
+)
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+logging.basicConfig(level=logging.DEBUG)
+logger = logging.getLogger(__name__)
+
+@pytest.mark.setup('pingpong')
+@pytest.mark.depends('launchpad')
+@pytest.mark.incremental
+class TestSetupPingpong(object):
+ def test_onboard(self, mgmt_session, descriptors):
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(mgmt_session, descriptor)
+
+ def test_instantiate(self, mgmt_session, ro_account_info):
+ catalog = mgmt_session.proxy(RwProjectNsdYang).get_config("/rw-project:project[rw-project:name='default']/nsd-catalog")
+ nsd = catalog.nsd[0]
+ instance_id = 0
+ for resource_orchestrator, account_info in ro_account_info.items():
+ for datacenter in account_info['datacenters']:
+ nsr = rift.auto.descriptor.create_nsr(
+ datacenter,
+ "pingpong_{}".format(instance_id),
+ nsd,
+ resource_orchestrator=resource_orchestrator
+ )
+ mgmt_session.proxy(RwNsrYang).create_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr", nsr)
+ instance_id += 1
+
+
+@pytest.mark.depends('pingpong')
+@pytest.mark.incremental
+class TestPingpong:
+ def test_service_started(self, mgmt_session):
+ nsr_opdata = mgmt_session.proxy(RwNsrYang).get("/rw-project:project[rw-project:name='default']/ns-instance-opdata")
+ nsrs = nsr_opdata.nsr
+
+ for nsr in nsrs:
+ xpath = (
+ "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={ns_instance_config_ref}]/operational-status"
+ ).format(
+ ns_instance_config_ref=quoted_key(nsr.ns_instance_config_ref)
+ )
+ mgmt_session.proxy(RwNsrYang).wait_for(xpath, "running", fail_on=['failed'], timeout=300)
+
+ def test_service_configured(self, mgmt_session):
+ nsr_opdata = mgmt_session.proxy(RwNsrYang).get("/rw-project:project[rw-project:name='default']/ns-instance-opdata")
+ nsrs = nsr_opdata.nsr
+
+ for nsr in nsrs:
+ xpath = (
+ "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status"
+ ).format(
+ quoted_key(nsr.ns_instance_config_ref)
+ )
+ mgmt_session.proxy(RwNsrYang).wait_for(xpath, "configured", fail_on=['failed'], timeout=300)
+
+@pytest.mark.depends('pingpong')
+@pytest.mark.teardown('pingpong')
+@pytest.mark.incremental
+class TestTeardownPingpong(object):
+ def test_teardown(self, mgmt_session):
+ ns_instance_config = mgmt_session.proxy(RwNsrYang).get_config("/rw-project:project[rw-project:name='default']/ns-instance-config")
+ for nsr in ns_instance_config.nsr:
+ mgmt_session.proxy(RwNsrYang).delete_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id={}]".format(quoted_key(nsr.id)))
+
+ time.sleep(60)
+ vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get("/rw-project:project[rw-project:name='default']/vnfr-catalog")
+ assert vnfr_catalog is None or len(vnfr_catalog.vnfr) == 0
+
diff --git a/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong.py b/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong.py
index 45a7832..f2d6695 100644
--- a/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong.py
+++ b/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong.py
@@ -23,45 +23,50 @@
@brief Launchpad System Test
"""
+import gi
import json
import logging
import os
import pytest
-import shlex
import requests
+import shlex
import shutil
import subprocess
import tempfile
import time
import uuid
+import rift.auto.descriptor
import rift.auto.mano
import rift.auto.session
import rift.mano.examples.ping_pong_nsd as ping_pong
-import gi
gi.require_version('RwNsrYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('RwProjectNsdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
gi.require_version('RwLaunchpadYang', '1.0')
gi.require_version('RwBaseYang', '1.0')
from gi.repository import (
- NsdYang,
+ RwProjectNsdYang,
RwNsrYang,
RwVnfrYang,
NsrYang,
VnfrYang,
VldYang,
- RwVnfdYang,
+ RwProjectVnfdYang,
RwLaunchpadYang,
RwBaseYang
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
logging.basicConfig(level=logging.DEBUG)
@pytest.fixture(scope='module')
def vnfd_proxy(request, mgmt_session):
- return mgmt_session.proxy(RwVnfdYang)
+ return mgmt_session.proxy(RwProjectVnfdYang)
@pytest.fixture(scope='module')
def rwvnfr_proxy(request, mgmt_session):
@@ -73,7 +78,7 @@
@pytest.fixture(scope='module')
def nsd_proxy(request, mgmt_session):
- return mgmt_session.proxy(NsdYang)
+ return mgmt_session.proxy(RwProjectNsdYang)
@pytest.fixture(scope='module')
def rwnsr_proxy(request, mgmt_session):
@@ -86,30 +91,6 @@
class DescriptorOnboardError(Exception):
pass
-def create_nsr(nsd, input_param_list, cloud_account_name):
- """
- Create the NSR record object
-
- Arguments:
- nsd - NSD
- input_param_list - list of input-parameter objects
- cloud_account_name - name of cloud account
-
- Return:
- NSR object
- """
- nsr = RwNsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
-
- nsr.id = str(uuid.uuid4())
- nsr.name = rift.auto.mano.resource_name(nsr.id)
- nsr.short_name = "nsr_short_name"
- nsr.description = "This is a description"
- nsr.nsd.from_dict(nsr.as_dict())
- nsr.admin_status = "ENABLED"
- nsr.input_parameter.extend(input_param_list)
- nsr.cloud_account = cloud_account_name
-
- return nsr
def upload_descriptor(logger, descriptor_file, host="127.0.0.1"):
curl_cmd = 'curl --insecure -F "descriptor=@{file}" https://{host}:4567/api/upload'.format(
@@ -125,10 +106,10 @@
return transaction_id
-def wait_onboard_transaction_finished(logger, transaction_id, timeout=30, host="127.0.0.1"):
+def wait_onboard_transaction_finished(logger, transaction_id, timeout=30, host="127.0.0.1", project="default"):
def check_status_onboard_status():
- uri = 'https://%s:4567/api/upload/%s/state' % (host, transaction_id)
+ uri = 'https://%s:8008/api/operational/project/%s/create-jobs/job/%s' % (host, project, transaction_id)
curl_cmd = 'curl --insecure {uri}'.format(uri=uri)
return subprocess.check_output(shlex.split(curl_cmd), universal_newlines=True)
@@ -188,13 +169,13 @@
"""
logger.debug("Terminating Ping Pong NSRs")
- nsr_path = "/ns-instance-config"
+ nsr_path = "/rw-project:project[rw-project:name='default']/ns-instance-config"
nsr = rwnsr_proxy.get_config(nsr_path)
nsrs = nsr.nsr
xpaths = []
for ping_pong in nsrs:
- xpath = "/ns-instance-config/nsr[id='{}']".format(ping_pong.id)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id={}]".format(quoted_key(ping_pong.id))
rwnsr_proxy.delete_config(xpath)
xpaths.append(xpath)
@@ -204,14 +185,14 @@
assert nsr is None
# Get the ns-instance-config
- ns_instance_config = rwnsr_proxy.get_config("/ns-instance-config")
+ ns_instance_config = rwnsr_proxy.get_config("/rw-project:project[rw-project:name='default']/ns-instance-config")
# Termination tests
- vnfr = "/vnfr-catalog/vnfr"
+ vnfr = "/rw-project:project[rw-project:name='default']/vnfr-catalog/vnfr"
vnfrs = rwvnfr_proxy.get(vnfr, list_obj=True)
assert vnfrs is None or len(vnfrs.vnfr) == 0
- # nsr = "/ns-instance-opdata/nsr"
+ # nsr = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr"
# nsrs = rwnsr_proxy.get(nsr, list_obj=True)
# assert len(nsrs.nsr) == 0
@@ -297,7 +278,7 @@
"""Generates & On-boards the descriptors.
"""
temp_dirs = []
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
endpoint = "upload"
"""
@@ -319,7 +300,7 @@
scheme,
cert)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 2, "There should two vnfds"
assert "ping_vnfd" in [vnfds[0].name, vnfds[1].name]
@@ -327,13 +308,13 @@
def delete_vnfds():
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
for vnfd_record in vnfds.vnfd:
- xpath = "/vnfd-catalog/vnfd[id='{}']".format(vnfd_record.id)
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_record.id))
vnfd_proxy.delete_config(xpath)
time.sleep(5)
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
assert vnfds is None or len(vnfds.vnfd) == 0
@@ -380,7 +361,7 @@
scheme,
cert)
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsds = catalog.nsd
assert len(nsds) == 1, "There should only be a single nsd"
assert nsds[0].name == "ping_pong_nsd"
@@ -389,7 +370,7 @@
# for temp_dir in temp_dirs:
# temp_dir.cleanup()
- def test_instantiate_ping_pong_nsr(self, logger, nsd_proxy, rwnsr_proxy, base_proxy, cloud_account):
+ def test_instantiate_ping_pong_nsr(self, logger, nsd_proxy, rwnsr_proxy, base_proxy, cloud_account, use_accounts):
def verify_input_parameters(running_config, config_param):
"""
@@ -405,49 +386,66 @@
config_param.value,
running_config.input_parameter))
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
input_parameters = []
- descr_xpath = "/nsd:nsd-catalog/nsd:nsd[nsd:id='%s']/nsd:vendor" % nsd.id
+ descr_xpath = "/rw-project:project/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id=%s]/project-nsd:vendor" % quoted_key(nsd.id)
descr_value = "automation"
in_param_id = str(uuid.uuid4())
- input_param_1 = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter(
+ input_param_1 = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter(
xpath=descr_xpath,
value=descr_value)
input_parameters.append(input_param_1)
- nsr = create_nsr(nsd, input_parameters, cloud_account.name)
+ nsr_id = str(uuid.uuid4())
+ if use_accounts:
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account.name,
+ nsr_id,
+ nsd,
+ input_param_list=input_parameters,
+ account=cloud_account.name,
+ nsr_id=nsr_id
+ )
+ else:
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account.name,
+ nsr_id,
+ nsd,
+ input_param_list=input_parameters,
+ nsr_id=nsr_id
+ )
logger.info("Instantiating the Network Service")
- rwnsr_proxy.create_config('/ns-instance-config/nsr', nsr)
+ rwnsr_proxy.create_config('/rw-project:project[rw-project:name="default"]/ns-instance-config/nsr', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata/nsr[ns-instance-config-ref="{}"]'.format(nsr.id))
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata/nsr[ns-instance-config-ref={}]'.format(quoted_key(nsr.id)))
assert nsr_opdata is not None
# Verify the input parameter configuration
- running_config = rwnsr_proxy.get_config("/ns-instance-config/nsr[id='%s']" % nsr.id)
+ running_config = rwnsr_proxy.get_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id=%s]" % quoted_key(nsr.id))
for input_param in input_parameters:
verify_input_parameters(running_config, input_param)
def test_wait_for_pingpong_started(self, rwnsr_proxy):
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
for nsr in nsrs:
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/operational-status".format(
- nsr.ns_instance_config_ref)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/operational-status".format(
+ quoted_key(nsr.ns_instance_config_ref))
rwnsr_proxy.wait_for(xpath, "running", fail_on=['failed'], timeout=180)
def test_wait_for_pingpong_configured(self, rwnsr_proxy):
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
for nsr in nsrs:
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/config-status".format(
- nsr.ns_instance_config_ref)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status".format(
+ quoted_key(nsr.ns_instance_config_ref))
rwnsr_proxy.wait_for(xpath, "configured", fail_on=['failed'], timeout=450)
@@ -472,7 +470,7 @@
"""Generates & On-boards the descriptors.
"""
temp_dirs = []
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
endpoint = "update"
ping_vnfd, pong_vnfd, ping_pong_nsd = ping_pong_records
@@ -495,7 +493,7 @@
scheme,
cert)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 2, "There should two vnfds"
@@ -503,24 +501,24 @@
assert "pong_vnfd" in [vnfds[0].name, vnfds[1].name]
def delete_nsds():
- nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
for nsd_record in nsds.nsd:
- xpath = "/nsd-catalog/nsd[id='{}']".format(nsd_record.id)
+ xpath = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd[id={}]".format(quoted_key(nsd_record.id))
nsd_proxy.delete_config(xpath)
time.sleep(5)
- nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
assert nsds is None or len(nsds.nsd) == 0
delete_nsds()
def delete_vnfds():
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
for vnfd_record in vnfds.vnfd:
- xpath = "/vnfd-catalog/vnfd[id='{}']".format(vnfd_record.id)
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_record.id))
vnfd_proxy.delete_config(xpath)
time.sleep(5)
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
assert vnfds is None or len(vnfds.vnfd) == 0
delete_vnfds()
@@ -569,7 +567,7 @@
scheme,
cert)
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsds = catalog.nsd
assert len(nsds) == 1, "There should only be a single nsd"
assert nsds[0].name == "ping_pong_nsd"
@@ -578,7 +576,7 @@
# for temp_dir in temp_dirs:
# temp_dir.cleanup()
- def test_instantiate_ping_pong_nsr(self, logger, nsd_proxy, rwnsr_proxy, base_proxy, cloud_account):
+ def test_instantiate_ping_pong_nsr(self, logger, nsd_proxy, rwnsr_proxy, base_proxy, cloud_account, use_accounts):
def verify_input_parameters(running_config, config_param):
"""
Verify the configured parameter set against the running configuration
@@ -593,49 +591,66 @@
config_param.value,
running_config.input_parameter))
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
input_parameters = []
- descr_xpath = "/nsd:nsd-catalog/nsd:nsd[nsd:id='%s']/nsd:vendor" % nsd.id
+ descr_xpath = "/rw-project:project/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id=%s]/project-nsd:vendor" % quoted_key(nsd.id)
descr_value = "automation"
in_param_id = str(uuid.uuid4())
- input_param_1 = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter(
+ input_param_1 = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter(
xpath=descr_xpath,
value=descr_value)
input_parameters.append(input_param_1)
- nsr = create_nsr(nsd, input_parameters, cloud_account.name)
+ nsr_id = str(uuid.uuid4())
+ if use_accounts:
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account.name,
+ nsr_id,
+ nsd,
+ input_param_list=input_parameters,
+ account=cloud_account.name,
+ nsr_id=nsr_id
+ )
+ else:
+ nsr = rift.auto.descriptor.create_nsr(
+ cloud_account.name,
+ nsr_id,
+ nsd,
+ input_param_list=input_parameters,
+ nsr_id=nsr_id
+ )
logger.info("Instantiating the Network Service")
- rwnsr_proxy.create_config('/ns-instance-config/nsr', nsr)
+ rwnsr_proxy.create_config('/rw-project:project[rw-project:name="default"]/ns-instance-config/nsr', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata/nsr[ns-instance-config-ref="{}"]'.format(nsr.id))
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata/nsr[ns-instance-config-ref={}]'.format(quoted_key(nsr.id)))
assert nsr_opdata is not None
# Verify the input parameter configuration
- running_config = rwnsr_proxy.get_config("/ns-instance-config/nsr[id='%s']" % nsr.id)
+ running_config = rwnsr_proxy.get_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id=%s]" % quoted_key(nsr.id))
for input_param in input_parameters:
verify_input_parameters(running_config, input_param)
def test_wait_for_pingpong_started(self, rwnsr_proxy):
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
for nsr in nsrs:
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/operational-status".format(
- nsr.ns_instance_config_ref)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/operational-status".format(
+ quoted_key(nsr.ns_instance_config_ref))
rwnsr_proxy.wait_for(xpath, "running", fail_on=['failed'], timeout=180)
def test_wait_for_pingpong_configured(self, rwnsr_proxy):
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
for nsr in nsrs:
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/config-status".format(
- nsr.ns_instance_config_ref)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status".format(
+ quoted_key(nsr.ns_instance_config_ref))
rwnsr_proxy.wait_for(xpath, "configured", fail_on=['failed'], timeout=450)
@@ -660,18 +675,18 @@
Asserts:
The records are deleted.
"""
- nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
for nsd in nsds.nsd:
- xpath = "/nsd-catalog/nsd[id='{}']".format(nsd.id)
+ xpath = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd[id={}]".format(quoted_key(nsd.id))
nsd_proxy.delete_config(xpath)
- nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
assert nsds is None or len(nsds.nsd) == 0
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
for vnfd_record in vnfds.vnfd:
- xpath = "/vnfd-catalog/vnfd[id='{}']".format(vnfd_record.id)
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_record.id))
vnfd_proxy.delete_config(xpath)
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
assert vnfds is None or len(vnfds.vnfd) == 0
diff --git a/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong_longevity.py b/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong_longevity.py
index ff8fa96..9f70feb 100644
--- a/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong_longevity.py
+++ b/rwlaunchpad/ra/pytest/ns/pingpong/test_pingpong_longevity.py
@@ -18,11 +18,14 @@
# Creation Date: 2016/01/04
#
+import gi
import pytest
-import rift.vcs.vcs
import time
-import gi
+import rift.vcs.vcs
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
@pytest.fixture(scope='module')
def rwnsr_proxy(mgmt_session):
@@ -32,11 +35,11 @@
time.sleep(60)
rift.vcs.vcs.wait_until_system_started(mgmt_session)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
for nsr in nsr_opdata.nsr:
- xpath = ("/ns-instance-opdata"
- "/nsr[ns-instance-config-ref='%s']"
- "/operational-status") % (nsr.ns_instance_config_ref)
+ xpath = ("/rw-project:project[rw-project:name='default']/ns-instance-opdata"
+ "/nsr[ns-instance-config-ref=%s]"
+ "/operational-status") % (quoted_key(nsr.ns_instance_config_ref))
operational_status = rwnsr_proxy.get(xpath)
assert operational_status == 'running'
diff --git a/rwlaunchpad/ra/pytest/ns/pingpong/test_records.py b/rwlaunchpad/ra/pytest/ns/pingpong/test_records.py
index 9f1cd0a..5198be9 100644
--- a/rwlaunchpad/ra/pytest/ns/pingpong/test_records.py
+++ b/rwlaunchpad/ra/pytest/ns/pingpong/test_records.py
@@ -1,6 +1,6 @@
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.io Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,30 +16,37 @@
#
import collections
+import gi
+import json
+import operator
+import os
+import pytest
+import re
import socket
import subprocess
import time
-import pytest
-
-import gi
-import re
+from scapy.all import rdpcap, UDP, TCP, IP
gi.require_version('RwNsrYang', '1.0')
from gi.repository import (
- NsdYang,
+ RwProjectNsdYang,
RwBaseYang,
RwConmanYang,
RwNsrYang,
- RwNsdYang,
RwVcsYang,
RwVlrYang,
- RwVnfdYang,
+ RwProjectVnfdYang,
RwVnfrYang,
VlrYang,
VnfrYang,
+ NsrYang,
)
+import rift.auto.mano
import rift.auto.session
import rift.mano.examples.ping_pong_nsd as ping_pong
+from rift.auto.ssh import SshSession
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
@pytest.fixture(scope='module')
@@ -53,6 +60,28 @@
'''
return ping_pong_factory.generate_descriptors()
+@pytest.fixture(scope='session')
+def updated_ping_pong_descriptors(updated_ping_pong_records):
+ '''Fixture which returns a set of updated descriptors that can be configured through
+ the management interface.
+
+ The descriptors generated by the descriptor generation process for packages don't include project
+ information (presumably in order to avoid tying them to particular project). Here they are converted
+ to types that include project information which can then be used to configure the system.
+ '''
+ ping, pong, ping_pong = updated_ping_pong_records
+ proj_ping_vnfd = RwProjectVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd.from_dict(ping.vnfd.as_dict())
+ proj_pong_vnfd = RwProjectVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd.from_dict(pong.vnfd.as_dict())
+ proj_ping_pong_nsd = RwProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd.from_dict(ping_pong.descriptor.as_dict()['nsd'][0])
+ return proj_ping_vnfd, proj_pong_vnfd, proj_ping_pong_nsd
+
+
+class JobStatusError(Exception):
+ """JobStatusError."""
+
+ pass
+
+
def yield_vnfd_vnfr_pairs(proxy, nsr=None):
"""
Yields tuples of vnfd & vnfr entries.
@@ -66,10 +95,10 @@
Tuple: VNFD and its corresponding VNFR entry
"""
def get_vnfd(vnfd_id):
- xpath = "/vnfd-catalog/vnfd[id='{}']".format(vnfd_id)
- return proxy(RwVnfdYang).get(xpath)
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_id))
+ return proxy(RwProjectVnfdYang).get(xpath)
- vnfr = "/vnfr-catalog/vnfr"
+ vnfr = "/rw-project:project[rw-project:name='default']/vnfr-catalog/vnfr"
vnfrs = proxy(RwVnfrYang).get(vnfr, list_obj=True)
for vnfr in vnfrs.vnfr:
@@ -93,9 +122,9 @@
"""
for nsr_cfg, nsr in yield_nsrc_nsro_pairs(proxy):
- nsd_path = "/nsd-catalog/nsd[id='{}']".format(
- nsr_cfg.nsd.id)
- nsd = proxy(RwNsdYang).get_config(nsd_path)
+ nsd_path = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd[id={}]".format(
+ quoted_key(nsr_cfg.nsd.id))
+ nsd = proxy(RwProjectNsdYang).get_config(nsd_path)
yield nsd, nsr
@@ -108,11 +137,11 @@
Yields:
Tuple: NSR config and its corresponding NSR op record
"""
- nsr = "/ns-instance-opdata/nsr"
+ nsr = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr"
nsrs = proxy(RwNsrYang).get(nsr, list_obj=True)
for nsr in nsrs.nsr:
- nsr_cfg_path = "/ns-instance-config/nsr[id='{}']".format(
- nsr.ns_instance_config_ref)
+ nsr_cfg_path = "/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id={}]".format(
+ quoted_key(nsr.ns_instance_config_ref))
nsr_cfg = proxy(RwNsrYang).get_config(nsr_cfg_path)
yield nsr_cfg, nsr
@@ -143,12 +172,22 @@
boolean
"""
try:
- socket.inet_aton(address)
+ socket.inet_pton(socket.AF_INET, address)
+ return True
+ except socket.error:
+ try:
+ socket.inet_pton(socket.AF_INET6, address)
+ return True
+ except socket.error:
+ return False
+
+ def is_ipv6(self, address):
+ """Returns True if address is of type 'IPv6', else False."""
+ try:
+ socket.inet_pton(socket.AF_INET6, address)
+ return True
except socket.error:
return False
- else:
- return True
-
@pytest.mark.feature("recovery")
def test_tasklets_recovery(self, mgmt_session, proxy, recover_tasklet):
@@ -180,30 +219,12 @@
def test_records_present(self, proxy):
assert_records(proxy)
- def test_nsd_ref_count(self, proxy):
- """
- Asserts
- 1. The ref count data of the NSR with the actual number of NSRs
- """
- nsd_ref_xpath = "/ns-instance-opdata/nsd-ref-count"
- nsd_refs = proxy(RwNsrYang).get(nsd_ref_xpath, list_obj=True)
-
- expected_ref_count = collections.defaultdict(int)
- for nsd_ref in nsd_refs.nsd_ref_count:
- expected_ref_count[nsd_ref.nsd_id_ref] = nsd_ref.instance_ref_count
-
- actual_ref_count = collections.defaultdict(int)
- for nsd, nsr in yield_nsd_nsr_pairs(proxy):
- actual_ref_count[nsd.id] += 1
-
- assert expected_ref_count == actual_ref_count
-
def test_vnfd_ref_count(self, proxy):
"""
Asserts
1. The ref count data of the VNFR with the actual number of VNFRs
"""
- vnfd_ref_xpath = "/vnfr-catalog/vnfd-ref-count"
+ vnfd_ref_xpath = "/rw-project:project[rw-project:name='default']/vnfr-catalog/vnfd-ref-count"
vnfd_refs = proxy(RwVnfrYang).get(vnfd_ref_xpath, list_obj=True)
expected_ref_count = collections.defaultdict(int)
@@ -243,12 +264,23 @@
for vnfd, vnfr in yield_vnfd_vnfr_pairs(proxy):
assert vnfd.mgmt_interface.port == vnfr.mgmt_interface.port
assert len(vnfd.vdu) == len(vnfr.vdur)
-
for vdud, vdur in zip(vnfd.vdu, vnfr.vdur):
- assert vdud.vm_flavor == vdur.vm_flavor
+ for field in vdud.vm_flavor.fields:
+ if field in vdur.vm_flavor.fields:
+ assert getattr(vdud.vm_flavor, field) == getattr(vdur.vm_flavor, field)
assert self.is_valid_ip(vdur.management_ip) is True
- assert vdud.external_interface[0].vnfd_connection_point_ref == \
- vdur.external_interface[0].vnfd_connection_point_ref
+
+ vdur_intf_dict = {}
+ for intf in vdur.interface:
+ vdur_intf_dict[intf.name] = intf.external_connection_point_ref if 'external_connection_point_ref' in \
+ intf.as_dict() else intf.internal_connection_point_ref
+ for intf in vdud.interface:
+ assert intf.name in vdur_intf_dict
+ if intf.internal_connection_point_ref:
+ vdud_intf_cp_ref = intf.internal_connection_point_ref
+ else:
+ vdud_intf_cp_ref = intf.external_connection_point_ref
+ assert vdur_intf_dict[intf.name] == vdud_intf_cp_ref
def test_external_vl(self, proxy):
"""
@@ -267,7 +299,7 @@
assert cp_des[0].name == cp_rec[0].name
assert self.is_valid_ip(cp_rec[0].ip_address) is True
- xpath = "/vlr-catalog/vlr[id='{}']".format(cp_rec[0].vlr_ref)
+ xpath = "/rw-project:project[rw-project:name='default']/vlr-catalog/vlr[id={}]".format(quoted_key(cp_rec[0].vlr_ref))
vlr = proxy(RwVlrYang).get(xpath)
assert len(vlr.network_id) > 0
@@ -276,7 +308,7 @@
assert self.is_valid_ip(ip) is True
assert vlr.operational_status == "running"
-
+ @pytest.mark.skipif(pytest.config.getoption("--port-sequencing"), reason="port-sequencing test uses two VLs in NSD")
def test_nsr_record(self, proxy):
"""
Currently we only test for the components of NSR tests. Ignoring the
@@ -288,31 +320,36 @@
"""
for nsr_cfg, nsr in yield_nsrc_nsro_pairs(proxy):
# 1 n/w and 2 connection points
- assert len(nsr.vlr) == 1
+ assert len(nsr.vlr) == 2
assert len(nsr.vlr[0].vnfr_connection_point_ref) == 2
assert len(nsr.constituent_vnfr_ref) == 2
assert nsr_cfg.admin_status == 'ENABLED'
- def test_wait_for_pingpong_configured(self, proxy):
- nsr_opdata = proxy(RwNsrYang).get('/ns-instance-opdata')
+ def test_wait_for_ns_configured(self, proxy):
+ nsr_opdata = proxy(RwNsrYang).get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
assert len(nsrs) == 1
current_nsr = nsrs[0]
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/config-status".format(current_nsr.ns_instance_config_ref)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status".format(quoted_key(current_nsr.ns_instance_config_ref))
proxy(RwNsrYang).wait_for(xpath, "configured", timeout=400)
- def test_monitoring_params(self, proxy):
+ def test_wait_for_pingpong_vnf_configured(self, proxy):
+ for vnfd, vnfr in yield_vnfd_vnfr_pairs(proxy):
+ xpath = "/rw-project:project[rw-project:name='default']/vnfr-catalog/vnfr[id={}]/config-status".format(quoted_key(vnfr.id))
+ proxy(VnfrYang).wait_for(xpath, "configured", timeout=400)
+
+ def test_vnf_monitoring_params(self, proxy):
"""
Asserts:
1. The value counter ticks?
2. If the meta fields are copied over
"""
def mon_param_record(vnfr_id, mon_param_id):
- return '/vnfr-catalog/vnfr[id="{}"]/monitoring-param[id="{}"]'.format(
- vnfr_id, mon_param_id)
+ return '/rw-project:project[rw-project:name="default"]/vnfr-catalog/vnfr[id={}]/monitoring-param[id={}]'.format(
+ quoted_key(vnfr_id), quoted_key(mon_param_id))
for vnfd, vnfr in yield_vnfd_vnfr_pairs(proxy):
for mon_des in (vnfd.monitoring_param):
@@ -326,7 +363,37 @@
# Tick check
#assert mon_rec.value_integer > 0
- def test_cm_nsr(self, proxy):
+ def test_ns_monitoring_params(self, logger, proxy):
+ """
+ Asserts:
+ 1. monitoring-param match in nsd and ns-opdata
+ 2. The value counter ticks?
+ """
+ mon_param_path = '/rw-project:project[rw-project:name="default"]/ns-instance-opdata/nsr[ns-instance-config-ref={}]/monitoring-param[id={}]'
+ def fetch_monparam_value(nsr_ref, mon_param_id):
+ """Returns the monitoring parameter value"""
+ mon_param = proxy(NsrYang).get(mon_param_path.format(quoted_key(nsr_ref), quoted_key(mon_param_id)))
+ return mon_param.value_integer
+
+ def check_monparam_value(nsr_ref, mon_param_id):
+ """Check if monitoring-param values are getting updated"""
+ recent_mon_param_value = fetch_monparam_value(nsr_ref, mon_param_id)
+
+ # Monitor the values over a period of 60 secs. Fail the test if there is no update in mon-param value.
+ s_time = time.time()
+ while (time.time() - s_time) < 60:
+ if fetch_monparam_value(nsr_ref, mon_param_id) > recent_mon_param_value:
+ return
+ time.sleep(5)
+ assert False, 'mon-param values are not getting updated. Last value was {}'.format(recent_mon_param_value)
+
+ for nsd, nsr in yield_nsd_nsr_pairs(proxy):
+ assert len(nsd.monitoring_param) == len(nsr.monitoring_param)
+ for mon_param in nsr.monitoring_param:
+ logger.info('Verifying monitoring-param: {}'.format(mon_param.as_dict()))
+ check_monparam_value(nsr.ns_instance_config_ref, mon_param.id)
+
+ def test_cm_nsr(self, proxy, use_accounts):
"""
Asserts:
1. The ID of the NSR in cm-state
@@ -335,10 +402,13 @@
4. State of the cm-nsr
"""
for nsd, nsr in yield_nsd_nsr_pairs(proxy):
- con_nsr_xpath = "/cm-state/cm-nsr[id='{}']".format(nsr.ns_instance_config_ref)
+ con_nsr_xpath = "/rw-project:project[rw-project:name='default']/cm-state/cm-nsr[id={}]".format(
+ quoted_key(nsr.ns_instance_config_ref))
con_data = proxy(RwConmanYang).get(con_nsr_xpath)
- assert con_data.name == "ping_pong_nsd"
+ if not use_accounts:
+ assert con_data.name == rift.auto.mano.resource_name(nsd.name)
+
assert len(con_data.cm_vnfr) == 2
state_path = con_nsr_xpath + "/state"
@@ -351,7 +421,7 @@
2. Name of the vnfr
3. State of the VNFR
4. Checks for a reachable IP in mgmt_interface
- 5. Basic checks for connection point and cfg_location.
+ 5. Basic checks for connection point
"""
def is_reachable(ip, timeout=10):
rc = subprocess.call(["ping", "-c1", "-w", str(timeout), ip])
@@ -360,10 +430,10 @@
return False
nsr_cfg, _ = list(yield_nsrc_nsro_pairs(proxy))[0]
- con_nsr_xpath = "/cm-state/cm-nsr[id='{}']".format(nsr_cfg.id)
+ con_nsr_xpath = "/rw-project:project[rw-project:name='default']/cm-state/cm-nsr[id={}]".format(quoted_key(nsr_cfg.id))
for _, vnfr in yield_vnfd_vnfr_pairs(proxy):
- con_vnfr_path = con_nsr_xpath + "/cm-vnfr[id='{}']".format(vnfr.id)
+ con_vnfr_path = con_nsr_xpath + "/cm-vnfr[id={}]".format(quoted_key(vnfr.id))
con_data = proxy(RwConmanYang).get(con_vnfr_path)
assert con_data is not None
@@ -374,18 +444,600 @@
con_data = proxy(RwConmanYang).get(con_vnfr_path)
assert is_reachable(con_data.mgmt_interface.ip_address) is True
- assert len(con_data.connection_point) == 1
- connection_point = con_data.connection_point[0]
- assert connection_point.name == vnfr.connection_point[0].name
- assert connection_point.ip_address == vnfr.connection_point[0].ip_address
+ if pytest.config.getoption("--port-sequencing"):
+ # there are more than one connection point in the VNFDs for port sequencing test
+ # there is no distinction between icp and cp in 'show cm-state'.
+ # both icp and cp come under connection-point in 'show cm-state'
+ vnfr_intl_extl_connection_points_dict = {}
+ for icp in vnfr.vdur[0].internal_connection_point:
+ vnfr_intl_extl_connection_points_dict[icp.name] = icp.ip_address
+ for cp in vnfr.connection_point:
+ vnfr_intl_extl_connection_points_dict[cp.name] = cp.ip_address
- assert con_data.cfg_location is not None
+ assert len(con_data.connection_point) == len(vnfr_intl_extl_connection_points_dict)
+ for cp in con_data.connection_point:
+ assert cp.name in vnfr_intl_extl_connection_points_dict
+ assert cp.ip_address == vnfr_intl_extl_connection_points_dict[cp.name]
+ else:
+ assert len(con_data.connection_point) == 2
+ connection_point = con_data.connection_point[0]
+ assert connection_point.name == vnfr.connection_point[0].name
+ assert connection_point.ip_address == vnfr.connection_point[0].ip_address
+
+ @pytest.mark.skipif(
+ not (pytest.config.getoption("--static-ip") or pytest.config.getoption("--update-vnfd-instantiate")),
+ reason="need --static-ip or --update-vnfd-instantiate option to run")
+ def test_static_ip(self, proxy, logger, vim_clients, cloud_account_name):
+ """
+ Asserts:
+ 1. static-ip match in vnfd and vnfr
+ 2. static-ip match in cm-state
+ 3. Get the IP of openstack VM. Match the static-ip
+ 4. Check if the VMs are reachable from each other (Skip if type of static ip addresses is IPv6)
+ """
+ nsr_cfg, _ = list(yield_nsrc_nsro_pairs(proxy))[0]
+ con_nsr_xpath = "/rw-project:project[rw-project:name='default']/cm-state/cm-nsr[id={}]".format(quoted_key(nsr_cfg.id))
+
+ ips = {}
+ static_ip_vnfd = False
+ for vnfd, vnfr in yield_vnfd_vnfr_pairs(proxy):
+ if vnfd.vdu[0].interface[1].static_ip_address:
+ static_ip_vnfd = True
+ assert vnfd.vdu[0].interface[1].static_ip_address == vnfr.connection_point[1].ip_address
+ if 'ping' in vnfd.name:
+ ips['mgmt_ip'] = vnfr.vdur[0].management_ip
+ else:
+ ips['static_ip'] = vnfd.vdu[0].interface[1].static_ip_address
+
+ con_vnfr_path = con_nsr_xpath + "/cm-vnfr[id={}]".format(quoted_key(vnfr.id))
+ con_data = proxy(RwConmanYang).get(con_vnfr_path)
+
+ assert con_data is not None
+ assert con_data.connection_point[1].ip_address == vnfd.vdu[0].interface[1].static_ip_address
+
+ xpath = "/rw-project:project[rw-project:name='default']/vlr-catalog/vlr[id={}]".format(quoted_key(vnfr.connection_point[1].vlr_ref))
+ vlr = proxy(RwVlrYang).get(xpath)
+
+ vim_client = vim_clients[cloud_account_name]
+ vm_property = vim_client.nova_server_get(vnfr.vdur[0].vim_id)
+ logger.info('VM properties for {}: {}'.format(vnfd.name, vm_property))
+
+ addr_prop_list = vm_property['addresses'][vlr.name]
+ logger.info('addresses attribute: {}'.format(addr_prop_list))
+
+ addr_prop = [addr_prop for addr_prop in addr_prop_list if addr_prop['addr'] == vnfr.connection_point[1].ip_address]
+ assert addr_prop
+
+ assert static_ip_vnfd # if False, then none of the VNF descriptors' connections points are carrying static-ip-address field.
+
+ # Check if the VMs are reachable from each other
+ username, password = ['fedora'] * 2
+ ssh_session = SshSession(ips['mgmt_ip'])
+ assert ssh_session
+ assert ssh_session.connect(username=username, password=password)
+ if not self.is_ipv6(ips['static_ip']):
+ assert ssh_session.run_command('ping -c 5 {}'.format(ips['static_ip']))[0] == 0
+
+ @pytest.mark.skipif(not pytest.config.getoption("--vnf-dependencies"), reason="need --vnf-dependencies option to run")
+ def test_vnf_dependencies(self, proxy):
+ """
+ Asserts:
+ 1. Match various config parameter sources with config primitive parameters
+ Three types of sources are being verified for pong vnfd.
+ Attribute: A runtime value like IP address of a connection point (../../../mgmt-interface, ip-address)
+ Descriptor: a XPath to a leaf in the VNF descriptor/config (../../../mgmt-interface/port)
+ Value: A pre-defined constant ('admin' as mentioned in pong descriptor)
+ 2. Match the config-parameter-map defined in NS descriptor
+ There used to be a check to verify config parameter values in cm-state (cm-state/cm-nsr/cm-vnfr/config-parameter).
+ Recently that got removed due to confd issue. So, there is no such check currently for cm-state.
+ """
+ nsr_cfg, _ = list(yield_nsrc_nsro_pairs(proxy))[0]
+ con_nsr_xpath = "/rw-project:project[rw-project:name='default']/cm-state/cm-nsr[id={}]".format(quoted_key(nsr_cfg.id))
+
+ pong_source_map, ping_request_map = None, None
+
+ for vnfd, vnfr in yield_vnfd_vnfr_pairs(proxy):
+ # Get cm-state for this vnfr
+ con_vnfr_path = con_nsr_xpath + "/cm-vnfr[id={}]".format(quoted_key(vnfr.id))
+ con_data = proxy(RwConmanYang).get(con_vnfr_path)
+
+ # Match various config parameter sources with config primitive parameters
+ for config_primitive in vnfr.vnf_configuration.config_primitive:
+ if config_primitive.name in ("config", "start-stop"):
+ for parameter in config_primitive.parameter:
+ if parameter.name == 'mgmt_ip':
+ assert parameter.default_value == vnfr.mgmt_interface.ip_address
+ if parameter.name == 'mgmt_port':
+ assert parameter.default_value == str(vnfd.mgmt_interface.port)
+ if parameter.name == 'username':
+ assert parameter.default_value == 'admin'
+
+ # Fetch the source parameter values from pong vnf and request parameter values from ping vnf
+ if config_primitive.name == "config":
+ if vnfd.name == "pong_vnfd":
+ pong_source_map = [parameter.default_value for parameter in config_primitive.parameter if
+ parameter.name in ("service_ip", "service_port")]
+ if vnfd.name == "ping_vnfd":
+ ping_request_map = [parameter.default_value for parameter in config_primitive.parameter if
+ parameter.name in ("pong_ip", "pong_port")]
+ assert pong_source_map
+ assert ping_request_map
+ # Match the config-parameter-map defined in NS descriptor
+ assert sorted(pong_source_map) == sorted(ping_request_map)
+
+ @pytest.mark.skipif(not pytest.config.getoption("--port-security"), reason="need --port-security option to run")
+ def test_port_security(self, proxy, vim_clients, cloud_account_name):
+ """
+ Asserts:
+ 1. port-security-enabled match in vnfd and vnfr
+ 2. Get port property from openstack. Match these attributes: 'port_security_enabled', 'security_groups'
+ """
+ for vnfd, vnfr in yield_vnfd_vnfr_pairs(proxy):
+ assert vnfd.connection_point[1].port_security_enabled == vnfr.connection_point[1].port_security_enabled
+
+ xpath = "/rw-project:project[rw-project:name='default']/vlr-catalog/vlr[id={}]".format(quoted_key(vnfr.connection_point[1].vlr_ref))
+ vlr = proxy(RwVlrYang).get(xpath)
+
+ vim_client = vim_clients[cloud_account_name]
+ port = [port for port in vim_client.neutron_port_list() if port['network_id'] == vlr.network_id if
+ port['name'] == vnfr.connection_point[1].name]
+ assert port
+
+ port_openstack = port[0]
+ assert vnfr.connection_point[1].port_security_enabled == port_openstack['port_security_enabled']
+
+ if vnfr.connection_point[1].port_security_enabled:
+ assert port_openstack['security_groups'] # It has to carry at least one security group if enabled
+ else:
+ assert not port_openstack['security_groups']
+
+ @pytest.mark.skipif(not pytest.config.getoption("--port-sequencing"), reason="need --port-sequencing option to run")
+ def test_explicit_port_sequencing(self, proxy, vim_clients, cloud_account_name, logger, port_sequencing_intf_positions, iteration):
+ """
+ Asserts:
+ 1. Interface count match in vnfd and vnfr
+ 2. Get interface ordering(mac address) from VM using 'ip a' command; From output of neutron port-list, get
+ corresponding connection point names in the same order as mac address ordered list.
+ 3. Get interface ordering from the vnfd/vdu
+ 4. Compare lists from step-2 and step-3
+ """
+ username, password = ['fedora']*2
+
+ for vnfd, vnfr in yield_vnfd_vnfr_pairs(proxy):
+ assert len(vnfd.vdu[0].interface) == len(vnfr.vdur[0].interface)
+
+ logger.debug('Interface details for vnfd {}: {}'.format(vnfd.name, vnfd.vdu[0].as_dict()['interface']))
+
+ if iteration==1:
+ tmp_positional_values_list = []
+ for intf in vnfr.vdur[0].interface:
+ # if no position is specified for an interface, then vnfr/vdur/interface carries 0 as its positional value
+ if intf.position!=0:
+ tmp_positional_values_list.append(intf.position)
+ if 'ping' in vnfd.name:
+ assert not tmp_positional_values_list
+ if 'pong' in vnfd.name:
+ assert set(tmp_positional_values_list) == set(port_sequencing_intf_positions)
+
+ # Get a sorted list of interfaces from vnfd/vdu
+ icp_key_name, ecp_key_name = 'internal_connection_point_ref', 'external_connection_point_ref'
+ intf_with_position_field_dict, intf_without_position_field_list = {}, []
+
+ for intf in vnfd.vdu[0].interface:
+ intf = intf.as_dict()
+ cp_ref_key = icp_key_name if icp_key_name in intf else ecp_key_name
+ if 'position' in intf:
+ intf_with_position_field_dict[intf['position']] = intf[cp_ref_key]
+ else:
+ intf_without_position_field_list.append(intf[cp_ref_key])
+
+ intf_with_position_field_list = sorted(intf_with_position_field_dict.items(), key=operator.itemgetter(0))
+ sorted_cp_names_in_vnfd = [pos_cpname_tuple[1] for pos_cpname_tuple in intf_with_position_field_list] + \
+ sorted(intf_without_position_field_list)
+
+ # Establish a ssh session to VDU to get mac address list sorted by interfaces
+ ssh_session = SshSession(vnfr.vdur[0].management_ip)
+ assert ssh_session
+ assert ssh_session.connect(username=username, password=password)
+ e_code, ip_output, err = ssh_session.run_command('sudo ip a')
+ assert e_code == 0
+ logger.debug('Output of "ip a": {}'.format(ip_output))
+ mac_addr_list = re.findall(r'link/ether\s+(.*)\s+brd', ip_output)
+
+ # exclude eth0 as it is always a mgmt-interface
+ interface_starting_index = len(mac_addr_list) - len(vnfd.vdu[0].interface)
+ mac_addr_list = mac_addr_list[interface_starting_index: ]
+
+ # Get neutron port list
+ neutron_port_list = vim_clients[cloud_account_name].neutron_port_list()
+
+ # Get those ports whose mac_address value matches with one of the mac addresses in mac_addr_list
+ # This new list is already sorted as the outer loop iterates over mac_addr_list
+ sorted_cp_names_in_vm = [neutron_port_dict['name'] for mac in mac_addr_list for neutron_port_dict in neutron_port_list
+ if mac==neutron_port_dict['mac_address']]
+
+ logger.debug('Sorted connection points as per "ip a" in VM: {}'.format(sorted_cp_names_in_vm))
+ logger.debug('Sorted connection points as per ordering mentioned in vnfd: {}'.format(sorted_cp_names_in_vnfd))
+
+ assert sorted_cp_names_in_vm == sorted_cp_names_in_vnfd
+
+ @pytest.mark.skipif(
+ not (pytest.config.getoption("--vnf-dependencies") and
+ pytest.config.getoption("--service-primitive")),
+ reason="need --vnf-dependencies and --service-primitive option to run")
+ def test_primitives(
+ self, mgmt_session, cloud_module, cloud_account, descriptors,
+ fmt_nsd_catalog_xpath, logger):
+ """Testing service primitives and config primitives."""
+ # Create a cloud account
+ rift.auto.mano.create_cloud_account(
+ mgmt_session, cloud_account, "default")
+
+ rwnsr_pxy = mgmt_session.proxy(RwNsrYang)
+ nsr_pxy = mgmt_session.proxy(NsrYang)
+ rwvnfr_pxy = mgmt_session.proxy(RwVnfrYang)
+
+ # Testing a custom service primitive
+ ns_opdata = rwnsr_pxy.get(
+ '/rw-project:project[rw-project:name="default"]' +
+ '/ns-instance-opdata/nsr'
+ )
+ nsr_id = ns_opdata.ns_instance_config_ref
+ sp_rpc_input = NsrYang.YangInput_Nsr_ExecNsServicePrimitive.from_dict(
+ {'name': 'primitive_test', 'nsr_id_ref': nsr_id})
+ nsr_pxy.rpc(sp_rpc_input)
+
+ # Testing a config primitive
+ vnfr_catalog = rwvnfr_pxy.get(
+ '/rw-project:project[rw-project:name="default"]' +
+ '/vnfr-catalog'
+ )
+ cp_rpc_input = NsrYang.YangInput_Nsr_ExecNsServicePrimitive.from_dict(
+ {'nsr_id_ref': nsr_id})
+ vnf_list = cp_rpc_input.create_vnf_list()
+ vnf_primitive = vnf_list.create_vnf_primitive()
+ vnf_primitive.index = 1
+ vnf_primitive.name = "start-stop"
+ vnf_list.member_vnf_index_ref = (
+ vnfr_catalog.vnfr[0].member_vnf_index_ref
+ )
+ vnf_list._set_vnfr_id_ref(vnfr_catalog.vnfr[0].id)
+ vnf_list.vnf_primitive.append(vnf_primitive)
+ cp_rpc_input.vnf_list.append(vnf_list)
+ nsr_pxy.rpc(cp_rpc_input)
+ # Checking nsd joblist to see if both tests passed
+
+ def check_job_status(status=None):
+ ns_opdata = rwnsr_pxy.get(
+ '/rw-project:project[rw-project:name="default"]' +
+ '/ns-instance-opdata/nsr'
+ )
+ counter = 0
+ counter_limit = 2
+ for idx in range(0, counter_limit):
+ if ns_opdata.config_agent_job[idx].job_status == 'failure':
+ err_msg = (
+ 'Service primitive test failed.' +
+ ' The config agent reported failure job status')
+ raise JobStatusError(err_msg)
+
+ elif ns_opdata.config_agent_job[idx].job_status == 'success':
+ counter += 1
+ continue
+
+ if counter == counter_limit:
+ return True
+ else:
+ time.sleep(5)
+ return False
+
+ start_time = time.time()
+ while (time.time() - start_time < 60):
+ status = check_job_status()
+ if status:
+ break
+ else:
+ err_msg = (
+ 'Service primitive test failed. Timed out: 60 seconds' +
+ 'The config agent never reached a success status')
+ raise JobStatusError(err_msg)
+
+ @pytest.mark.skipif(
+ not (pytest.config.getoption("--metadata-vdud") or pytest.config.getoption("--metadata-vdud-cfgfile")),
+ reason="need --metadata-vdud or --metadata-vdud-cfgfile option to run")
+ def test_metadata_vdud(self, logger, proxy, vim_clients, cloud_account_name, metadata_host):
+ """
+ Asserts:
+ 1. content of supplemental-boot-data match in vnfd and vnfr
+ vnfr may carry extra custom-meta-data fields (e.g pci_assignement) which are by default enabled during VM creation by openstack.
+ vnfr doesn't carry config_file details; so that will be skipped during matching.
+ 2. boot-data-drive match with openstack VM's config_drive attribute
+ 3. For each VDUD which have config-file fields mentioned, check if there exists a path in the VM which
+ matches with config-file's dest field. (Only applicable for cirros_cfgfile_vnfd VNF RIFT-15524)
+ 4. For each VDUD, match its custom-meta-data fields with openstack VM's properties field
+ """
+ for vnfd, vnfr in yield_vnfd_vnfr_pairs(proxy):
+ if any(name in vnfd.name for name in ['ping', 'pong', 'fedora']):
+ username, password = ['fedora'] * 2
+ elif 'ubuntu' in vnfd.name:
+ username, password = ['ubuntu'] * 2
+ elif 'cirros' in vnfd.name:
+ username, password = 'cirros', 'cubswin:)'
+ else:
+ assert False, 'Not expected to use this VNFD {} in this systemtest. VNFD might have changed. Exiting the test.'.format(
+ vnfd.name)
+
+ # Wait till VNF's operational-status becomes 'running'
+ # The below check is usually covered as part of test_wait_for_ns_configured
+ # But, this is mostly needed when non- ping pong packages are used e.g cirrus cfgfile package
+ xpath = "/rw-project:project[rw-project:name='default']/vnfr-catalog/vnfr[id={}]/operational-status".format(quoted_key(vnfr.id))
+ proxy(VnfrYang).wait_for(xpath, "running", timeout=300)
+ time.sleep(5)
+
+ # Get the VDU details from openstack
+ vim_client = vim_clients[cloud_account_name]
+ vm_property = vim_client.nova_server_get(vnfr.vdur[0].vim_id)
+ logger.info('VM property for {}: {}'.format(vnfd.name, vm_property))
+
+ # Establish a ssh session to VDU
+ ssh_session = SshSession(vnfr.vdur[0].management_ip)
+ assert ssh_session
+ assert ssh_session.connect(username=username, password=password)
+
+ assert vnfd.vdu[0].supplemental_boot_data.boot_data_drive == vnfr.vdur[
+ 0].supplemental_boot_data.boot_data_drive == bool(vm_property['config_drive'])
+ # Using bool() because vm_property['config_drive'] returns 'True' or '' whereas vnfr/vnfd returns True/False
+
+ # Assert 3: only for cirros vnf
+ if 'cirros' in vnfd.name:
+ for config_file in vnfd.vdu[0].supplemental_boot_data.config_file:
+ assert ssh_session.run_command('test -e {}'.format(config_file.dest))[0] == 0
+
+ vdur_metadata = {metadata.name: metadata.value for metadata in
+ vnfr.vdur[0].supplemental_boot_data.custom_meta_data}
+
+ # Get the user-data/metadata from VM
+ e_code, vm_metadata, _ = ssh_session.run_command(
+ 'curl http://{}/openstack/latest/meta_data.json'.format(metadata_host))
+ assert e_code == 0
+ vm_metadata = json.loads(vm_metadata)['meta']
+ logger.debug('VM metadata for {}: {}'.format(vnfd.name, vm_metadata))
+
+ for vdud_metadata in vnfd.vdu[0].supplemental_boot_data.custom_meta_data:
+ assert vdud_metadata.value == vdur_metadata[vdud_metadata.name]
+ assert vdud_metadata.value == vm_metadata[vdud_metadata.name]
+
+ @pytest.mark.skipif(not pytest.config.getoption("--multidisk"), reason="need --multidisk option to run")
+ def test_multidisk(self, logger, proxy, vim_clients, cloud_account_name, multidisk_testdata):
+ """
+ This feature is only supported in openstack, brocade vCPE.
+ Asserts:
+ 1. volumes match in vnfd and vnfr
+ 2. volumes match in vnfr and openstack host
+ Check no of volumes attached to the VNF VM. It should match no of volumes defined in VDUD.
+ Match volume names. In 'openstack volume show <vol_uuid>', the device should be /dev/<volume_name_in_vdud>
+ Match the volume source.
+ Match the volume size.
+ Match the Volume IDs mentioned in VNFR with openstack volume's ID.
+ """
+ ping_test_data, pong_test_data = multidisk_testdata
+ vol_attr = ['device_type', None, 'size', 'image', 'boot_priority']
+ # device_bus doesn't appear in vnfr/vdur
+
+ for vnfd, vnfr in yield_vnfd_vnfr_pairs(proxy):
+ logger.info('Verifying VNF {}'.format(vnfd.name))
+ vnf_testdata = ping_test_data if 'ping' in vnfd.name else pong_test_data
+
+ # Assert 1: Match volumes in vnfd, vnfr, test data
+ assert len(vnfd.vdu[0].volumes) == len(vnfr.vdur[0].volumes)
+
+ for vnfr_vol in vnfr.vdur[0].volumes:
+ logger.info('Verifying vnfr volume: {}'.format(vnfr_vol.as_dict()))
+ vnfd_vol = [vol for vol in vnfd.vdu[0].volumes if vol.name==vnfr_vol.name][0]
+
+ vol_testdata = vnf_testdata[vnfr_vol.name]
+
+ for i, attr in enumerate(vol_attr):
+ if attr == None: # device_bus doesn't appear in vnfr/vdur
+ continue
+ if i == 3 and (vol_testdata[i]==None or getattr(vnfd_vol, 'ephemeral')):
+ # volume source of type ephemeral doesn't appear in vnfr/vdur
+ # If no image is defined for a volume, getattr(vnfr_vol, 'ephemeral') returns False. Strange. RIFT-15165
+ assert not getattr(vnfd_vol, 'image')
+ continue
+
+ assert getattr(vnfd_vol, attr) == getattr(vnfr_vol, attr)
+ if vol_testdata[i] is not None:
+ assert getattr(vnfd_vol, attr) == vol_testdata[i]
+
+ # Assert 2: Volumes match in vnfr and openstack host
+ # Get VM properties from the VIM
+ vim_client = vim_clients[cloud_account_name]
+ vm_property = vim_client.nova_server_get(vnfr.vdur[0].vim_id)
+ logger.info('VIM- VM properties: {}'.format(vm_property))
+
+ # Get the volumes attached to this VNF VM
+ vim_volumes = vm_property['os-extended-volumes:volumes_attached']
+ logger.info('VIM- Volumes attached to this VNF VM: {}'.format(vim_volumes))
+
+ assert vim_volumes
+ assert len(vim_volumes) == len(vnfr.vdur[0].volumes)
+
+ vnfr_volumes_by_id = {vol.volume_id:vol for vol in vnfr.vdur[0].volumes}
+ for vim_volume in vim_volumes:
+ # Match the Volume IDs mentioned in VNFR with openstack volume's ID.
+ logger.info('Verifying volume: {}'.format(vim_volume['id']))
+ assert vim_volume['id'] in vnfr_volumes_by_id.keys()
+ vnfr_vol_ = vnfr_volumes_by_id[vim_volume['id']]
+
+ # Get volume details. Equivalent cli: openstack volume show <uuid>
+ vim_vol_attrs = vim_client.cinder_volume_get(vim_volume['id'])
+
+ # Match volume size
+ assert vnfr_vol_.size == vim_vol_attrs.size
+
+ # Match volume source
+ if vnfr_vol_.image: # To make sure this is not ephemeral type
+ logger.info('VIM- Image details of the volume: {}'.format(vim_vol_attrs.volume_image_metadata))
+ assert vnfr_vol_.image == vim_vol_attrs.volume_image_metadata['image_name']
+ else:
+ assert not hasattr(vim_vol_attrs, 'volume_image_metadata')
+
+ # Match volume name e.g 'device': u'/dev/vdf'
+ logger.info('Verifying [{}] in attached volumes {}'.format(vnfr_vol_.name, vim_vol_attrs.attachments))
+ assert [attachment for attachment in vim_vol_attrs.attachments if vnfr_vol_.name in attachment['device']]
+
+ @pytest.mark.skipif(not pytest.config.getoption("--l2-port-chaining"), reason="need --l2-port-chaining option to run")
+ def test_l2_port_chaining(self, proxy):
+ """
+ It uses existing NS, VNF packages: $RIFT_INSTALL/usr/rift/mano/nsds/vnffg_demo_nsd/vnffg_l2portchain_*.
+ This test function is specific to these packages. Those VNFs use Ubuntu trusty image ubuntu_trusty_1404.qcow2.
+ Asserts:
+ 1. Count of VNFFG in nsd and nsr
+ 2. Count of rsp, classifier in VNFFG descriptor and VNFFG record
+ 3. Need details what other fields need to be matched in nsd and nsr
+ 4. Traffic flows through internal hops as per the classifier and rsp
+ As per the classifiers in NS package, the following flows will be tested.
+ - Tcp packets with dest port 80 starting from pgw VNF should go through Firewall VNF.
+ - Udp packets with source port 80 starting from router VNF should go through nat->dpi
+ - Udp packets with dest port 80 starting from pgw VNF should go through dpi->nat
+
+ """
+ UDP_PROTOCOL, TCP_PROTOCOL = 17, 6
+
+ def pcap_analysis(pcap_file, src_add, dst_add, src_port=None, dst_port=None, protocol=6):
+ """Analyse packets in a pcap file and return True if there is a packet match w.r.t src_addr, dst_addr, protocol.
+ Args:
+ pcap_file: pcap file that is generated by traffic analysis utility such as tcpdump
+ src_add, dst_addr: Source & dest IP which need to be matched for a packet
+ protocol: Protocol that needs to be matched for a packet which already matched src_addr, dst_addr (protocol accepts integer e.g TCP 6, UDP 17)
+
+ Returns:
+ timestamp of the packet which is matched (Needed to check packet flow order through VNFs)
+ or
+ False: if there is no packet match
+
+ It uses scapy module to analyse pcap file. pip3 install scapy-python3
+ Other options https://pypi.python.org/pypi/pypcapfile
+ """
+ assert os.path.exists(pcap_file)
+ pkt_type = TCP if protocol==6 else UDP
+
+ pcap_obj = rdpcap(pcap_file)
+ for pkt in pcap_obj:
+ if IP in pkt:
+ if not(pkt[IP].src==src_add and pkt[IP].dst==dst_add and pkt[IP].proto==protocol):
+ continue
+ if pkt_type in pkt:
+ if src_port:
+ if not (pkt[pkt_type].sport==src_port):
+ continue
+ if dst_port:
+ if not (pkt[pkt_type].dport==dst_port):
+ continue
+ return pkt[IP].time
+ return False
+
+ # Check the VNFFG in nsd and nsr
+ for nsd, nsr in yield_nsd_nsr_pairs(proxy):
+ vnffgds = nsd.vnffgd
+ vnffgrs = nsr.vnffgr
+ assert len(vnffgds) == len(vnffgrs)
+
+ # Check the classifier, rsp in nsd and nsr
+ for vnffgd in vnffgds:
+ vnffgr = [vnffgr for vnffgr in vnffgrs if vnffgd.id == vnffgr.vnffgd_id_ref][0]
+ assert len(vnffgd.rsp) == len(vnffgr.rsp)
+ assert len(vnffgd.classifier) == len(vnffgr.classifier)
+
+ vnfrs = proxy(RwVnfrYang).get('/rw-project:project[rw-project:name="default"]/vnfr-catalog/vnfr', list_obj=True)
+
+ # Get the IP of VMs
+ vm_names = ('router', 'firewall', 'dpi', 'nat', 'pgw')
+ vm_ips = {vm_name: vnfr.vdur[0].vm_management_ip for vm_name in vm_names for vnfr in vnfrs.vnfr if
+ vm_name in vnfr.name}
+ vm_cp_ips = {vm_name: vnfr.connection_point[0].ip_address for vm_name in vm_names for vnfr in vnfrs.vnfr if
+ vm_name in vnfr.name}
+
+ # Establish Ssh sessions to the VMs
+ ssh_sessions = {}
+ for vm_name, vm_ip in vm_ips.items():
+ ssh_session = SshSession(vm_ip)
+ assert ssh_session
+ assert ssh_session.connect(username='ubuntu', password='ubuntu')
+ ssh_sessions[vm_name] = ssh_session
+
+ # Start python's SimpleHTTPServer on port 80 in the router VM
+ e_code, _, _ = ssh_sessions['router'].run_command('sudo python -m SimpleHTTPServer 80', max_wait=5)
+ assert e_code is None # Due to blocking call, it should timeout and return 'None' as exit code
+
+
+ # Check: Tcp packets with dest port 80 starting from pgw VNF should go through Firewall VNF.
+ pcap_file = 'l2test_firewall.pcap'
+ # Start tcpdump in firewall vnf and start sending tcp packets from pgw vnf
+ e_code, _, _ = ssh_sessions['firewall'].run_command(
+ 'sudo tcpdump -i eth1 -w {pcap} & sleep 10; sudo kill $!'.format(pcap=pcap_file), max_wait=4)
+ e_code, _, _ = ssh_sessions['pgw'].run_command('sudo nc {router_ip} 80 -w 0'.format(router_ip=vm_cp_ips['router']))
+
+ # Copy pcap file from firewall vnf for packet analysis
+ time.sleep(10)
+ assert ssh_sessions['firewall'].get(pcap_file, pcap_file)
+ assert pcap_analysis(pcap_file, vm_cp_ips['pgw'], vm_cp_ips['router'], dst_port=80, protocol=TCP_PROTOCOL)
+
+
+ # Check: Udp packets with source port 80 starting from router VNF should go through nat->dpi
+ pcap_nat = 'l2test_nat1.pcap'
+ pcap_dpi = 'l2test_dpi1.pcap'
+ # Start tcpdump in nat, dpi vnf and start sending udp packets from router vnf
+ e_code, _, _ = ssh_sessions['nat'].run_command(
+ 'sudo tcpdump -i eth1 -w {pcap} & sleep 15; sudo kill $!'.format(pcap=pcap_nat), max_wait=4)
+ e_code, _, _ = ssh_sessions['dpi'].run_command(
+ 'sudo tcpdump -i eth1 -w {pcap} & sleep 10; sudo kill $!'.format(pcap=pcap_dpi), max_wait=4)
+ e_code, _, _ = ssh_sessions['router'].run_command(
+ 'echo -n "hello" | sudo nc -4u {pgw_ip} 1000 -s {router_ip} -p 80 -w 0'.format(pgw_ip=vm_cp_ips['pgw'],
+ router_ip=vm_cp_ips[
+ 'router']))
+
+ # Copy pcap file from nat, dpi vnf for packet analysis
+ time.sleep(10)
+ assert ssh_sessions['nat'].get(pcap_nat, pcap_nat)
+ assert ssh_sessions['dpi'].get(pcap_dpi, pcap_dpi)
+ packet_ts_nat = pcap_analysis(pcap_nat, vm_cp_ips['router'], vm_cp_ips['pgw'], src_port=80, protocol=UDP_PROTOCOL)
+ packet_ts_dpi = pcap_analysis(pcap_dpi, vm_cp_ips['router'], vm_cp_ips['pgw'], src_port=80, protocol=UDP_PROTOCOL)
+ assert packet_ts_nat
+ assert packet_ts_dpi
+ assert packet_ts_nat < packet_ts_dpi # Packet flow must follow nat -> dpi
+
+
+ # Check: Udp packets with dest port 80 starting from pgw VNF should go through dpi->nat
+ pcap_nat = 'l2test_nat2.pcap'
+ pcap_dpi = 'l2test_dpi2.pcap'
+ # Start tcpdump in nat, dpi vnf and start sending udp packets from router vnf
+ e_code, _, _ = ssh_sessions['nat'].run_command(
+ 'sudo tcpdump -i eth1 -w {pcap} & sleep 15; sudo kill $!'.format(pcap=pcap_nat), max_wait=4)
+ e_code, _, _ = ssh_sessions['dpi'].run_command(
+ 'sudo tcpdump -i eth1 -w {pcap} & sleep 10; sudo kill $!'.format(pcap=pcap_dpi), max_wait=4)
+ e_code, _, _ = ssh_sessions['pgw'].run_command(
+ 'echo -n "hello" | sudo nc -4u {router_ip} 80 -w 0'.format(router_ip=vm_cp_ips['router']))
+
+ # Copy pcap file from nat, dpi vnf for packet analysis
+ time.sleep(10)
+ assert ssh_sessions['nat'].get(pcap_nat, pcap_nat)
+ assert ssh_sessions['dpi'].get(pcap_dpi, pcap_dpi)
+ packet_ts_nat = pcap_analysis(pcap_nat, vm_cp_ips['pgw'], vm_cp_ips['router'], dst_port=80, protocol=UDP_PROTOCOL)
+ packet_ts_dpi = pcap_analysis(pcap_dpi, vm_cp_ips['pgw'], vm_cp_ips['router'], dst_port=80, protocol=UDP_PROTOCOL)
+ assert packet_ts_nat
+ assert packet_ts_dpi
+ # The below assert used to fail while testing. ts_dpi is ahead of ts_nat in few microseconds
+ # Need to confirm if thats expected
+ assert packet_ts_dpi < packet_ts_nat # Packet flow must follow dpi -> nat
@pytest.mark.depends('nsr')
@pytest.mark.setup('nfvi')
@pytest.mark.incremental
class TestNfviMetrics(object):
+ @pytest.mark.skipif(True, reason='NFVI metrics are disabled - RIFT-15789')
def test_records_present(self, proxy):
assert_records(proxy)
@@ -445,43 +1097,44 @@
@pytest.mark.depends('nfvi')
@pytest.mark.incremental
+@pytest.mark.skipif(pytest.config.getoption("--port-sequencing"), reason="Skip this for port-sequencing test")
class TestRecordsDescriptors:
- def test_create_update_vnfd(self, proxy, updated_ping_pong_records):
+ def test_create_update_vnfd(self, proxy, updated_ping_pong_descriptors):
"""
Verify VNFD related operations
Asserts:
If a VNFD record is created
"""
- ping_vnfd, pong_vnfd, _ = updated_ping_pong_records
- vnfdproxy = proxy(RwVnfdYang)
+ ping_vnfd, pong_vnfd, _ = updated_ping_pong_descriptors
+ vnfdproxy = proxy(RwProjectVnfdYang)
- for vnfd_record in [ping_vnfd, pong_vnfd]:
- xpath = "/vnfd-catalog/vnfd"
- vnfdproxy.create_config(xpath, vnfd_record.vnfd)
+ for vnfd in [ping_vnfd, pong_vnfd]:
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd"
+ vnfdproxy.create_config(xpath, vnfd)
- xpath = "/vnfd-catalog/vnfd[id='{}']".format(vnfd_record.id)
- vnfd = vnfdproxy.get(xpath)
- assert vnfd.id == vnfd_record.id
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd.id))
+ updated_vnfd = vnfdproxy.get(xpath)
+ assert updated_vnfd.id == vnfd.id
- vnfdproxy.replace_config(xpath, vnfd_record.vnfd)
+ vnfdproxy.replace_config(xpath, vnfd)
- def test_create_update_nsd(self, proxy, updated_ping_pong_records):
+ def test_create_update_nsd(self, proxy, updated_ping_pong_descriptors):
"""
Verify NSD related operations
Asserts:
If NSD record was created
"""
- _, _, ping_pong_nsd = updated_ping_pong_records
- nsdproxy = proxy(NsdYang)
+ _, _, ping_pong_nsd = updated_ping_pong_descriptors
+ nsdproxy = proxy(RwProjectNsdYang)
- xpath = "/nsd-catalog/nsd"
- nsdproxy.create_config(xpath, ping_pong_nsd.descriptor)
+ xpath = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd"
+ nsdproxy.create_config(xpath, ping_pong_nsd)
- xpath = "/nsd-catalog/nsd[id='{}']".format(ping_pong_nsd.id)
+ xpath = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd[id={}]".format(quoted_key(ping_pong_nsd.id))
nsd = nsdproxy.get(xpath)
assert nsd.id == ping_pong_nsd.id
- nsdproxy.replace_config(xpath, ping_pong_nsd.descriptor)
+ nsdproxy.replace_config(xpath, ping_pong_nsd)
diff --git a/rwlaunchpad/ra/pytest/ns/pingpong/test_scaling.py b/rwlaunchpad/ra/pytest/ns/pingpong/test_scaling.py
index 0878db7..ee98905 100644
--- a/rwlaunchpad/ra/pytest/ns/pingpong/test_scaling.py
+++ b/rwlaunchpad/ra/pytest/ns/pingpong/test_scaling.py
@@ -22,8 +22,10 @@
@brief Pingpong scaling system test
"""
+import gi
import os
import pytest
+import re
import subprocess
import sys
import time
@@ -35,27 +37,37 @@
from gi.repository import (
NsrYang,
- NsdYang,
+ RwProjectNsdYang,
VnfrYang,
RwNsrYang,
- RwNsdYang,
RwVnfrYang,
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
@pytest.mark.setup('pingpong_nsd')
@pytest.mark.depends('launchpad')
class TestSetupPingpongNsd(object):
def test_onboard(self, mgmt_session, descriptors):
for descriptor in descriptors:
- rift.auto.descriptor.onboard(mgmt_session.host, descriptor)
+ rift.auto.descriptor.onboard(mgmt_session, descriptor)
def test_install_sar(self, mgmt_session):
- install_cmd = 'ssh {mgmt_ip} -q -n -o BatchMode=yes -o StrictHostKeyChecking=no -- sudo yum install sysstat --assumeyes'.format(
- mgmt_ip=mgmt_session.host,
- )
+ get_platform_cmd = 'ssh {host} -q -n -o BatchMode=yes -o StrictHostKeyChecking=no -- python3 -mplatform'
+ platform_result = subprocess.check_output(get_platform_cmd.format(host=mgmt_session.host), shell=True)
+ platform_match = re.search('(Ubuntu|fedora)-(\d+)', platform_result.decode('ascii'))
+ assert platform_match is not None
+ (dist, ver) = platform_match.groups()
+ if dist == 'fedora':
+ install_cmd = 'ssh {host} -q -n -o BatchMode=yes -o StrictHostKeyChecking=no -- sudo yum install sysstat --assumeyes'.format(
+ host=mgmt_session.host,
+ )
+ elif dist == 'Ubuntu':
+ install_cmd = 'ssh {host} -q -n -o BatchMode=yes -o StrictHostKeyChecking=no -- sudo apt-get -q -y install sysstat'.format(
+ host=mgmt_session.host,
+ )
subprocess.check_call(install_cmd, shell=True)
-
@pytest.fixture(scope='function', params=[5,10,15,20,25])
def service_count(request):
'''Fixture representing the number of services to test'''
@@ -67,10 +79,10 @@
def test_scaling(self, mgmt_session, cloud_account_name, service_count):
def start_services(mgmt_session, desired_service_count, max_attempts=3):
- catalog = mgmt_session.proxy(NsdYang).get_config('/nsd-catalog')
+ catalog = mgmt_session.proxy(RwProjectNsdYang).get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
- nsr_path = "/ns-instance-config"
+ nsr_path = "/rw-project:project[rw-project:name='default']/ns-instance-config"
nsr = mgmt_session.proxy(RwNsrYang).get_config(nsr_path)
service_count = len(nsr.nsr)
@@ -78,23 +90,29 @@
while attempts < max_attempts and service_count < desired_service_count:
attempts += 1
+ old_opdata = mgmt_session.proxy(RwNsrYang).get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
for count in range(service_count, desired_service_count):
nsr = rift.auto.descriptor.create_nsr(
cloud_account_name,
"pingpong_%s" % str(uuid.uuid4().hex[:10]),
- nsd.id)
- mgmt_session.proxy(RwNsrYang).create_config('/ns-instance-config/nsr', nsr)
+ nsd)
+ mgmt_session.proxy(RwNsrYang).create_config('/rw-project:project[rw-project:name="default"]/ns-instance-config/nsr', nsr)
- ns_instance_opdata = mgmt_session.proxy(RwNsrYang).get('/ns-instance-opdata')
- for nsr in ns_instance_opdata.nsr:
+ time.sleep(10)
+
+ new_opdata = mgmt_session.proxy(RwNsrYang).get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
+ new_ns_instance_config_refs = {nsr.ns_instance_config_ref for nsr in new_opdata.nsr} - {nsr.ns_instance_config_ref for nsr in old_opdata.nsr}
+ for ns_instance_config_ref in new_ns_instance_config_refs:
try:
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/operational-status".format(nsr.ns_instance_config_ref)
- mgmt_session.proxy(RwNsrYang).wait_for(xpath, "running", fail_on=['failed'], timeout=180)
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/config-status".format(nsr.ns_instance_config_ref)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/operational-status".format(quoted_key(ns_instance_config_ref))
+ mgmt_session.proxy(RwNsrYang).wait_for(xpath, "running", fail_on=['failed'], timeout=400)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status".format(quoted_key(ns_instance_config_ref))
mgmt_session.proxy(RwNsrYang).wait_for(xpath, "configured", fail_on=['failed'], timeout=450)
service_count += 1
+ attempts = 0 # Made some progress so reset the number of attempts remaining
except rift.auto.session.ProxyWaitForError:
- mgmt_session.proxy(RwNsrYang).delete_config("/ns-instance-config/nsr[id='{}']".format(nsr.ns_instance_config_ref))
+ mgmt_session.proxy(RwNsrYang).delete_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id={}]".format(quoted_key(ns_instance_config_ref)))
+ time.sleep(5)
def monitor_launchpad_performance(service_count, interval=30, samples=1):
sar_cmd = "ssh {mgmt_ip} -q -n -o BatchMode=yes -o StrictHostKeyChecking=no -- sar -A {interval} {samples}".format(
@@ -122,12 +140,12 @@
class TestTeardownPingpongNsr(object):
def test_teardown_nsr(self, mgmt_session):
- ns_instance_config = mgmt_session.proxy(RwNsrYang).get_config('/ns-instance-config')
+ ns_instance_config = mgmt_session.proxy(RwNsrYang).get_config('/rw-project:project[rw-project:name="default"]/ns-instance-config')
for nsr in ns_instance_config.nsr:
- mgmt_session.proxy(RwNsrYang).delete_config("/ns-instance-config/nsr[id='{}']".format(nsr.id))
+ mgmt_session.proxy(RwNsrYang).delete_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id={}]".format(quoted_key(nsr.id)))
time.sleep(60)
- vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get('/vnfr-catalog')
+ vnfr_catalog = mgmt_session.proxy(RwVnfrYang).get('/rw-project:project[rw-project:name="default"]/vnfr-catalog')
assert vnfr_catalog is None or len(vnfr_catalog.vnfr) == 0
def test_generate_plots(self):
diff --git a/rwlaunchpad/ra/pytest/ns/rbac/conftest.py b/rwlaunchpad/ra/pytest/ns/rbac/conftest.py
new file mode 100644
index 0000000..1b3f413
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/rbac/conftest.py
@@ -0,0 +1,115 @@
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import pytest
+import itertools
+import random
+import os
+import gi
+
+import rift.auto.session
+import rift.auto.mano
+
+gi.require_version('RwAuthExtWebSvcYang', '1.0')
+gi.require_version('RwAuthExtUserYang', '1.0')
+from gi.repository import (
+ RwAuthExtWebSvcYang,
+ RwAuthExtUserYang,
+ )
+
+@pytest.fixture(scope='session')
+def auto_certs_dir():
+ """Fixture that returns path of certs specific to automation"""
+ return os.path.join(os.getenv('RIFT_INSTALL'), 'usr/rift/systemtest/config/ssl')
+
+@pytest.fixture(scope='session')
+def set_webauth_cert_choice(tbac):
+ """Fixture that retuns a boolean value indicating whether to configure new key & cert in launchpad"""
+ if not tbac:
+ return False
+ # return random.choice([True, False])
+ return True
+
+@pytest.fixture(scope='session', autouse=True)
+def configure_key_cert(logger, set_webauth_cert_choice, auto_certs_dir, mgmt_session, confd_host, rw_user_proxy,
+ user_domain, ):
+ """Configures new cert, key in webauth-server-config, webauth-client-config"""
+ if set_webauth_cert_choice:
+ logger.debug('Configuring new certs from this path: {}'.format(auto_certs_dir))
+ print('Configuring new certs from this path: {}'.format(auto_certs_dir))
+ else:
+ return
+
+ cert_path = os.path.join(auto_certs_dir, 'rift_auto.crt')
+ key_path = os.path.join(auto_certs_dir, 'rift_auto.key')
+
+ server_ssl_config_xpath = '/rw-auth-ext-web-svc:webauth-server-config/rw-auth-ext-web-svc:ssl-config'
+ client_config_xpath = '/rw-auth-ext-user:webauth-client-config'
+ webauth_server_proxy = mgmt_session.proxy(RwAuthExtWebSvcYang)
+ webauth_client_proxy = mgmt_session.proxy(RwAuthExtUserYang)
+
+ def configure_webauth_server():
+ logger.debug('configuring the webauth-server')
+ webauth_server_obj = RwAuthExtWebSvcYang.YangData_RwAuthExtWebSvc_WebauthServerConfig_SslConfig.from_dict(
+ {'server_cert_path': cert_path, 'server_key_path': key_path})
+ webauth_server_proxy.replace_config(server_ssl_config_xpath, webauth_server_obj)
+
+ def configure_webauth_client():
+ logger.debug('configuring the webauth-client')
+ webauth_client_obj = RwAuthExtUserYang.YangData_RwAuthExtUser_WebauthClientConfig.from_dict(
+ {'ca_cert_path': cert_path})
+ webauth_client_proxy.merge_config(client_config_xpath, webauth_client_obj)
+
+ # Check if its running after launchpad reload; if so skip configuring the certs again (RIFT-17641)
+ server_ssl_config = webauth_server_proxy.get_config(server_ssl_config_xpath)
+ if server_ssl_config.server_cert_path != cert_path:
+ user, password = ['demo']*2
+ logger.debug('Adding an external user {}'.format(user))
+ rift.auto.mano.create_user(rw_user_proxy, user, password, user_domain)
+
+ # Shuffling the function calls for server and client configuration
+ list_func = [configure_webauth_server, configure_webauth_client]
+ random.shuffle(list_func)
+
+ # configuring either of the server or client
+ list_func.pop()()
+
+ # Try getting access token for an external user; it should fail
+ with pytest.raises(Exception,
+ message='Should not be able to get access token for user {} as certs are not yet configured for both server and client'.format(
+ user)):
+ logger.debug('Trying to get access token for user {}'.format(user))
+ access_token = rift.auto.session.get_access_token(user, password, confd_host)
+ logger.debug('Access token for user {}: {}'.format(user, access_token))
+
+ list_func.pop()()
+
+ # Try getting access token for an external user; it should pass now
+ rift.auto.session.get_access_token(user, password, confd_host)
+
+ # RIFT-17641: Delete user 'demo'
+ rift.auto.mano.delete_user(rw_user_proxy, user, user_domain)
+
+@pytest.fixture(scope='session')
+def all_roles_combinations(all_roles):
+ """Returns a combination of all roles except single combinations i.e if there are a total of N roles, then it
+ returns (2^N-1)-N role combinations.
+ Here, we have 11 roles, so it returns 2047-11=2036 combinations"""
+ all_roles_combinations_ = list()
+ for set_length in range(2, len(all_roles)+1):
+ for roles_combination in itertools.combinations(all_roles, set_length):
+ all_roles_combinations_.append(roles_combination)
+ return tuple(all_roles_combinations_)
diff --git a/rwlaunchpad/ra/pytest/ns/rbac/test_rbac.py b/rwlaunchpad/ra/pytest/ns/rbac/test_rbac.py
new file mode 100644
index 0000000..30c3261
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/rbac/test_rbac.py
@@ -0,0 +1,258 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+
+import gi
+import pytest
+
+from rift.auto.session import NetconfSession, RestconfSession
+import rift.auto.mano
+
+gi.require_version('RwUserYang', '1.0')
+gi.require_version('RwProjectYang', '1.0')
+gi.require_version('RwRbacPlatformYang', '1.0')
+gi.require_version('RwRbacInternalYang', '1.0')
+from gi.repository import (
+ RwUserYang,
+ RwProjectYang,
+ RwRbacPlatformYang,
+ RwRbacInternalYang,
+)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+@pytest.fixture(scope='session')
+def rbac_test_data():
+ """Fixture which returns rbac test data: users, roles, projects being used in the test.
+ users: tuple of user names
+ projects: tuple of project names
+ map_platform_roles: mapping of a user to multiple platform roles
+ map_project_roles: mapping of a user to multiple projects (project, list of roles in that project)"""
+ users = ('admin3', 'user1', 'user2', )
+
+ projects = ('project1', 'project2', )
+
+ map_platform_roles = {
+ 'admin3': ['rw-rbac-platform:platform-admin'],
+ }
+
+ map_project_roles = {
+ 'user1': [
+ ('project1', ['rw-project:project-admin']),
+ ('project2', ['rw-project:project-oper']),
+ ],
+
+ 'user2': [
+ ('project1', ['rw-project:project-admin']),
+ ],
+
+ 'admin3': [],
+ }
+
+ return {'users': users, 'projects': projects, 'roles': (map_platform_roles, map_project_roles)}
+
+
+@pytest.mark.setup('rbac_setup')
+@pytest.mark.incremental
+class TestRbacSetup(object):
+ def test_create_users(self, rbac_test_data, rw_user_proxy, user_domain, rbac_user_passwd, logger):
+ """Creates all users as per rbac test-data and verify if they are successfully created."""
+ users_test_data = rbac_test_data['users']
+
+ # Create all users mentioned in users_test_data
+ for user in users_test_data:
+ rift.auto.mano.create_user(rw_user_proxy, user, rbac_user_passwd, user_domain)
+
+ # Verify users are created
+ user_config = rw_user_proxy.get_config('/user-config')
+ assert user_config
+
+ user_config_test_data = [user.user_name for user in user_config.user if user.user_name in users_test_data]
+ logger.debug('Users: {} have been successfully created'.format(user_config_test_data))
+
+ assert len(user_config_test_data) == len(users_test_data)
+
+ def test_create_projects(self, logger, rw_conman_proxy, rbac_test_data):
+ """Creates all projects as per rbac test-data and verify them."""
+ projects_test_data = rbac_test_data['projects']
+
+ # Create all projects mentioned in projects_test_data and verify if they are created
+ for project in projects_test_data:
+ logger.debug('Creating project {}'.format(project))
+ rift.auto.mano.create_project(rw_conman_proxy, project)
+
+ def test_assign_platform_roles_to_users(self, rbac_platform_proxy, logger, rbac_test_data, user_domain, rw_rbac_int_proxy):
+ """Assign platform roles to an user as per test data mapping and verify them."""
+ platform_roles_test_data, _ = rbac_test_data['roles']
+
+ # Loop through the user & platform-roles mapping and assign roles to the user
+ for user, roles in platform_roles_test_data.items():
+ for role in roles:
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, role, user, user_domain, rw_rbac_int_proxy)
+
+ # Verify if the roles are assigned as per test data mapping
+ platform_config = rbac_platform_proxy.get_config('/rbac-platform-config')
+
+ platform_config_test_data_match = 0
+ logger.debug('Matching platform_roles_test_data with rbac-platform-config')
+ for user in platform_config.user:
+ if user.user_name in platform_roles_test_data:
+ logger.debug('Matched user: {}'.format(user.as_dict()))
+ platform_config_test_data_match += 1
+
+ test_data_user_platform_roles = platform_roles_test_data[user.user_name]
+ assert len(test_data_user_platform_roles) == len(user.role)
+ assert len(test_data_user_platform_roles) == len([role for role in user.role if role.role in test_data_user_platform_roles])
+
+ assert platform_config_test_data_match == len(platform_roles_test_data)
+
+ def test_assign_users_to_projects_roles(self, rbac_test_data, rw_project_proxy, user_domain, rw_rbac_int_proxy):
+ """Assign projects and roles to an user as per test data mapping."""
+ _, project_roles_test_data = rbac_test_data['roles']
+
+ # Loop through the user & (project, role) mapping and asign the project, role to the user
+ for user, project_role_tuple in project_roles_test_data.items():
+ for project, role_list in project_role_tuple:
+ for role in role_list:
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, role, user, project, user_domain, rw_rbac_int_proxy)
+
+
+@pytest.mark.depends('rbac_setup')
+@pytest.mark.incremental
+class TestRbacVerification(object):
+ def test_match_rbac_internal(self, mgmt_session, logger, rbac_test_data):
+ """Verifies the test data with rw-rbac-internal"""
+ rbac_intl_proxy = mgmt_session.proxy(RwRbacInternalYang)
+ rbac_intl = rbac_intl_proxy.get('/rw-rbac-internal')
+
+ # Verify users in show rw-rbac-internal
+ users_test_data = rbac_test_data['users']
+ assert len(rbac_intl.user) == len(users_test_data) + 2 # 'admin', 'oper' are two default users
+ users_match = 0
+ for user in rbac_intl.user:
+ if user.user_name in users_test_data:
+ logger.info('User matched: {}'.format(user.as_dict()))
+ users_match += 1
+ assert users_match == len(users_test_data)
+
+ # Verify roles (only project roles mapping, not the platform roles mapping)
+ # Each role in rw-rbac-internal is associated with a project through the field 'keys'. All mapping from users to project
+ # is part of project roles mapping.
+ _, project_roles_test_data = rbac_test_data['roles']
+ for user, project_role_tuple in project_roles_test_data.items():
+ for project, role_list in project_role_tuple:
+ for role in role_list:
+ logger.debug("Matching user: '{}' and its role '{}' in project '{}'".format(user, role, project))
+
+ # Verify there exists a role entry in rw-rbac-internal which matches 'role', 'project'
+ rbac_intl_role = [role_ for role_ in rbac_intl.role if (role_.role==role and role_.keys==project)]
+
+ # Each role is identified through its key 'project'. So there can be only one such role which matches
+ # the above 'role.role==role and role.keys=project'
+ assert len(rbac_intl_role) == 1
+ logger.info('Matched role in rw-rbac-internal: {}'.format(rbac_intl_role[0].as_dict()))
+
+ # Verify the user list in this rw-rbac-internal role carries 'user'
+ assert len([user_ for user_ in rbac_intl_role[0].user if user_.user_name==user]) == 1
+
+ def test_role_access(self, logger, session_class, confd_host, rbac_test_data, rbac_user_passwd, project_keyed_xpath):
+ """Verifies the roles assigned to users for a project. Login as each user and verify the user can only access
+ the projects linked to it."""
+ _, project_roles_test_data = rbac_test_data['roles']
+ projects_test_data = rbac_test_data['projects']
+
+ for user, project_role_tuple in project_roles_test_data.items():
+ logger.debug('Verifying user: {}'.format(user))
+ projects_not_accessible = list(projects_test_data)
+
+ # Establish a session with this current user
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, rbac_user_passwd)
+ print ("Connected using username {} password {}".format(user, rbac_user_passwd))
+
+ rw_project_proxy_ = user_session.proxy(RwProjectYang)
+
+ if project_role_tuple: # Skip the for loop for users who are not associated with any project e.g admin3
+ for project, role_list in project_role_tuple:
+ projects_not_accessible.remove(project)
+ project_config = rw_project_proxy_.get_config(project_keyed_xpath.format(project_name=quoted_key(project))+'/project-config')
+ user_ = [user_ for user_ in project_config.user if user_.user_name==user]
+ logger.debug('User: {}'.format(user_[0].as_dict()))
+ assert len(user_) == 1
+
+ # Match the roles for this user
+ assert set(role_list) == set([role_.role for role_ in user_[0].role])
+
+ # It can't access any other project.
+ for project in projects_not_accessible:
+ assert rw_project_proxy_.get_config(project_keyed_xpath.format(project_name=quoted_key(project))+'/project-config') is None # It should
+ # return None as the project is not mapped to this user.
+
+ def test_admin_user(self, logger, rw_project_proxy, project_keyed_xpath, rbac_test_data):
+ """Verify admin can see all projects as part of test-data as well as the default project"""
+ projects_test_data = rbac_test_data['projects']
+ projects_test_data = projects_test_data + ('default', )
+
+ # Verify admin user can see all projects including default
+ # If it is post-reboot verification, then check default project should not be listed
+ for project in projects_test_data:
+ project_ = rw_project_proxy.get_config(project_keyed_xpath.format(project_name=quoted_key(project))+'/project-state', list_obj=True)
+ if project=='default' and pytest.config.getoption('--default-project-deleted'):
+ assert project_ is None
+ continue
+ assert project_ # If the project doesn't exist, it returns None
+
+
+@pytest.mark.depends('rbac_setup')
+@pytest.mark.teardown('rbac_setup')
+@pytest.mark.incremental
+class TestRbacTeardown(object):
+ def test_delete_default_project(self, logger, rw_conman_proxy):
+ """Only deletes the default project"""
+ logger.debug('Deleting the default project')
+ rift.auto.mano.delete_project(rw_conman_proxy, 'default')
+
+ def test_delete_projects(self, logger, rbac_test_data, rw_conman_proxy):
+ """Deletes the projects which are part of rbac test-data and verify their deletion"""
+ projects_test_data = rbac_test_data['projects']
+
+ # Delete the projects
+ for project in projects_test_data:
+ logger.debug('Deleting project {}'.format(project))
+ rift.auto.mano.delete_project(rw_conman_proxy, project)
+
+ def test_delete_users(self, logger, rw_user_proxy, rbac_platform_proxy, platform_config_keyed_xpath,
+ user_keyed_xpath, rbac_test_data, user_domain):
+ """Deletes the users which are part of rbac test-data and verify their deletion"""
+ users_test_data = rbac_test_data['users']
+ map_platform_roles, _ = rbac_test_data['roles']
+
+ # Deletes the users
+ # If an user is associated with a platform role, at first it needs be removed from rbac-platform-config
+ # before deleting it from user-config
+ for user in users_test_data:
+ if user in map_platform_roles:
+ rbac_platform_proxy.delete_config(platform_config_keyed_xpath.format(user=quoted_key(user), domain=quoted_key(user_domain)))
+ rw_user_proxy.delete_config(user_keyed_xpath.format(user=quoted_key(user), domain=quoted_key(user_domain)))
+
+ # Verify if the users are deleted
+ user_config = rw_user_proxy.get_config('/user-config')
+ default_users = [user.user_name for user in user_config.user]
+
+ logger.debug('Default users list: {}'.format(default_users))
+ expected_empty_user_list = [user for user in users_test_data if user in default_users]
+ assert not expected_empty_user_list
diff --git a/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_identity.py b/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_identity.py
new file mode 100644
index 0000000..9d05c37
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_identity.py
@@ -0,0 +1,505 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#This file contains the code for RIFT-16314, RIFT-16315, RIFT-16536,
+#RIFT-16537, RIFT-16541, RIFT-16313, RIFT-16692, RIFT-16637, RIFT-16636.
+"""
+import gi
+import pytest
+
+import rift.auto.mano
+
+gi.require_version('RwUserYang', '1.0')
+gi.require_version('RwProjectYang', '1.0')
+gi.require_version('RwRbacPlatformYang', '1.0')
+gi.require_version('RwRbacInternalYang', '1.0')
+gi.require_version('RwlogMgmtYang', '1.0')
+
+
+from gi.repository import (
+ RwUserYang,
+ RwProjectYang,
+ RwRbacPlatformYang,
+ RwRbacInternalYang,
+ RwlogMgmtYang,
+ RwConmanYang
+)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+
+@pytest.mark.setup('rbac_setup')
+@pytest.mark.incremental
+class TestIdentity(object):
+ """Test Identity."""
+
+ platform_role_users = ['platform_user_admin', 'platform_user_oper', 'platform_user_super_admin']
+ platform_users = ['platform_user_admin', 'platform_user_oper', 'platform_user_test', 'platform_user_super_admin']
+
+ project_roles = (
+ 'rw-project-mano:catalog-oper', 'rw-project-mano:catalog-admin',
+ 'rw-project-mano:lcm-oper', 'rw-project-mano:lcm-admin',
+ 'rw-project-mano:account-oper', 'rw-project-mano:account-admin',
+ 'rw-project:project-admin', 'rw-project:project-oper'
+ )
+ platform_roles = (
+ 'rw-rbac-platform:platform-admin',
+ 'rw-rbac-platform:platform-oper',
+ 'rw-rbac-platform:super-admin'
+ )
+
+ RBAC_PROJECTS = ['default']
+ RBAC_USERS = []
+
+ TEST_PROJECTS = []
+ TEST_USERS = []
+
+ # This is required so as to track the
+ # already deleted users when creation and deletion
+ # are performed in ad-hoc way.
+ # Checking this set allows us to ignore Proxy request
+ # errors when deletion is performed twice.
+ DELETED_PROJECTS_TRACKER = set()
+
+ INVALID_CREDENTIALS = {
+ 'Jason' * 500: 'likeu' * 500
+ }
+
+ POSSIBLY_PROBLEMATIC_CREDENTIALS = {
+ 'Ja#son': ['lik#eu', 'syste#m'],
+ 'Ja&son': ['lik&eu', 'syste&m'],
+ 'J%ason': ['lik%eu', 'syste%m'],
+ 'Jåson': ['likeü', 'system'],
+ '<Jason>': ['<likeu>', '<system>'],
+ '/jason': ['/likeu', '/system;'],
+ 'jason;': ['likeu;', 'system;'],
+ 'j*son': ['like*u;', 'syste*m'],
+ 'j@so?': ['l!keu;', 'system!']
+ }
+
+ INAVLID_LOGIN_CREDENTIALS = {
+ 'wrong_username': 'mypasswd',
+ 'testuser': 0,
+ 0: 'mypasswd',
+ 0: 0,
+ 'wrong_username': 'wrong_password'
+ }
+
+ INVALID_PROJECT_KEYS = ['this_project_doesnt_exist', 'Test01']
+ INVALID_PROJECT_CREATE_KEYS = ['testproject' * 500, ]
+ #POSSIBLY_PROBLEMATIC_KEYS = ['/projectname', 'project name', 'projectname.', 'project,name', 'Projëçt', 'Pro;je:ct', 'Proj*ct', 'Pr@ject']
+ POSSIBLY_PROBLEMATIC_KEYS = ['/projectname', 'project name', 'projectname.', 'project,name', 'Pro;je:ct', 'Proj*ct', 'Pr@ject']
+
+ def test_platform_roles(self, rw_user_proxy, rbac_platform_proxy, rbac_user_passwd, user_domain, session_class, tbac,
+ confd_host, platform_roles, rw_rbac_int_proxy):
+ # Setting users and roles up for upcoming checks
+ rift.auto.mano.create_user(rw_user_proxy, 'platform_user_super_admin', rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, 'rw-rbac-platform:super-admin',
+ 'platform_user_super_admin', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.create_user(rw_user_proxy, 'platform_user_admin', rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, 'rw-rbac-platform:platform-admin',
+ 'platform_user_admin', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.create_user(rw_user_proxy, 'platform_user_oper', rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, 'rw-rbac-platform:platform-oper',
+ 'platform_user_oper', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.create_user(rw_user_proxy, 'platform_user_test', rbac_user_passwd, user_domain)
+
+ """Various access tests for platform users"""
+
+ # Testing if platform role users have access to /rbac-platform-config
+ for user in self.platform_role_users:
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, rbac_user_passwd)
+ pxy = user_session.proxy(RwRbacPlatformYang)
+ access_ = pxy.get_config("/rbac-platform-config/user[user-name='platform_user_admin'][user-domain={}]"
+ .format(quoted_key(user_domain)))
+ assert access_ is not None
+ rift.auto.mano.close_session(user_session)
+
+ # Testing if platform role users have access to /rbac-platform-state
+ for user in self.platform_role_users:
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, rbac_user_passwd)
+ pxy = user_session.proxy(RwRbacPlatformYang)
+ access_ = pxy.get_config("/rbac-platform-state/user[user-name='platform_user_admin'][user-domain={}]"
+ .format(quoted_key(user_domain)))
+ if user == 'platform_user_oper':
+ assert access_ is None
+ else:
+ """At the time of writing this code, /rbac-platform-state/user is unpopulated and so the access_ will be None no matter what.
+ In the future when the path /rbac-platform-state/user is populated this test will break. When that happens, just change
+ the next line to 'access_ is not None'
+ """
+ assert access_ is None
+ rift.auto.mano.close_session(user_session)
+
+ """Changing roles and verifying it """
+
+ # Case 01 Assign and then revoke that role. Assign a second role and see if that sticks and that the older role hasn't stayed on.
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, 'rw-rbac-platform:platform-oper',
+ 'platform_user_test', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.revoke_platform_role_from_user(rbac_platform_proxy, 'rw-rbac-platform:platform-oper',
+ 'platform_user_test', user_domain)
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, 'rw-rbac-platform:platform-admin',
+ 'platform_user_test', user_domain, rw_rbac_int_proxy)
+ # If the older role didn't stick and the new role did stick (as it should), then the user should be able to change another users password
+ user_session = rift.auto.mano.get_session(session_class, confd_host, 'platform_user_test', rbac_user_passwd)
+ pxy = user_session.proxy(RwUserYang)
+ rift.auto.mano.update_password(pxy, 'platform_user_oper', 'even_newer_password', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.close_session(user_session)
+
+ # Case 02 Switching the roles back after Case 01
+ rift.auto.mano.revoke_platform_role_from_user(rbac_platform_proxy, 'rw-rbac-platform:platform-admin',
+ 'platform_user_test', user_domain)
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, 'rw-rbac-platform:platform-oper',
+ 'platform_user_test', user_domain, rw_rbac_int_proxy)
+ # If the older role didn't stick and the new role did stick (as it should), then the user shouldn't be able to change another users password
+ user_session = rift.auto.mano.get_session(session_class, confd_host, 'platform_user_test', rbac_user_passwd)
+ pxy = user_session.proxy(RwUserYang)
+ with pytest.raises(Exception, message="User shouldn't be able to change another user's password") as excinfo:
+ rift.auto.mano.update_password(pxy, 'platform_user_oper', 'new_password', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.close_session(user_session)
+
+ if not tbac:
+ """Disabling and enabling users and verifying it"""
+
+ rift.auto.mano.create_user(rw_user_proxy, 'disabled_user', rbac_user_passwd, user_domain)
+ rift.auto.mano.update_password(rw_user_proxy, 'platform_user_oper', rbac_user_passwd, user_domain, rw_rbac_int_proxy)
+ # Checking if the disabled user can login
+ rift.auto.mano.disable_user(rw_user_proxy, 'disabled_user', user_domain, rw_rbac_int_proxy)
+ with pytest.raises(Exception, message="User shouldn't be able to login as he is disabled") as excinfo:
+ user_session = rift.auto.mano.get_session(session_class, confd_host, 'disabled_user', rbac_user_passwd, timeout=5)
+ # Checking if he can login after he has been enabled back on.
+ rift.auto.mano.enable_user(rw_user_proxy, 'disabled_user', user_domain, rw_rbac_int_proxy)
+ user_session = rift.auto.mano.get_session(session_class, confd_host, 'disabled_user', rbac_user_passwd)
+ rift.auto.mano.close_session(user_session)
+ # All platform roles trying to change the status of a user
+ for user in self.platform_role_users:
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, rbac_user_passwd)
+ pxy = user_session.proxy(RwUserYang)
+ if user == 'platform_user_oper':
+ with pytest.raises(Exception, message="Platform oper shouldn't be able to disable other users") as excinfo:
+ rift.auto.mano.disable_user(pxy, 'disabled_user', user_domain, rw_rbac_int_proxy)
+ else:
+ rift.auto.mano.disable_user(pxy, 'disabled_user', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.enable_user(pxy, 'disabled_user', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.close_session(user_session)
+
+ # Testing if users can change their own passwords
+ for user in self.platform_users:
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, rbac_user_passwd)
+ pxy = user_session.proxy(RwUserYang)
+ rift.auto.mano.update_password(pxy, user, 'new_password', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.close_session(user_session)
+
+ # Testing if platform role users can change the password of another user
+ for idx, user in enumerate(self.platform_role_users, 1):
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, 'new_password')
+ pxy = user_session.proxy(RwUserYang)
+ if user == 'platform_user_oper':
+ with pytest.raises(Exception, message="User shouldn't be able to change another user's password") as excinfo:
+ rift.auto.mano.update_password(pxy, 'platform_user_test', 'even_newer_password_{}'.format(idx), user_domain, rw_rbac_int_proxy)
+ else:
+ rift.auto.mano.update_password(pxy, 'platform_user_test', 'even_newer_password_{}'.format(idx), user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.close_session(user_session)
+
+ # Testing if platform users have access to logging
+ for user in self.platform_role_users:
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, 'new_password')
+ pxy = user_session.proxy(RwlogMgmtYang)
+ access_ = pxy.get_config('/logging')
+ assert access_ is not None
+ rpc_input = RwlogMgmtYang.YangInput_RwlogMgmt_ShowLogs.from_dict({'all': 'None'})
+ pxy.rpc(rpc_input)
+ rpc_input_1 = RwlogMgmtYang.YangInput_RwlogMgmt_LogEvent.from_dict({'on': 'None'})
+ pxy.rpc(rpc_input_1)
+ rift.auto.mano.close_session(user_session)
+
+ def rbac_internal_check(self, mgmt_session, xpath):
+
+ rbac_intl_proxy = mgmt_session.proxy(RwRbacInternalYang)
+ rbac_intl_proxy.wait_for(xpath, "active", timeout=5)
+
+ def test_rbac_internal_verification(self, rw_user_proxy, rw_conman_proxy, rbac_user_passwd, user_domain, mgmt_session,
+ rw_project_proxy, rbac_platform_proxy, rw_rbac_int_proxy):
+ """Doing various tasks and verifying if rbac-internal is reflecting these changes properly"""
+
+ # Creating projects and users for verifying the rbac-internal scenario
+ for idx in range(1, 4):
+ project_name = 'rbac_project_{}'.format(idx)
+ rift.auto.mano.create_project(rw_conman_proxy, project_name)
+ self.RBAC_PROJECTS.append(project_name)
+
+ if project_name in self.DELETED_PROJECTS_TRACKER:
+ self.DELETED_PROJECTS_TRACKER.remove(project_name)
+
+ for idx in range(1, 5):
+ rift.auto.mano.create_user(rw_user_proxy, 'rbac_user_{}'.format(idx), rbac_user_passwd, user_domain)
+ self.RBAC_USERS.append('rbac_user_{}'.format(idx))
+
+ # Rbac-Internal Verification
+ project_order = [0, 1, 2, 3, 0]
+ xpath = '/rw-rbac-internal/role[role={role}][keys={project}]/user[user-name={user}][user-domain={domain}]/state-machine/state'
+ # Assigning four users to four projects with two project roles for each user and checking the rbac-internal
+ for idx in range(0, 4):
+ fdx = project_order[idx]
+ ldx = project_order[idx + 1]
+ role = self.project_roles[2 * idx]
+ role1 = self.project_roles[(2 * idx) + 1]
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, role, self.RBAC_USERS[idx],
+ self.RBAC_PROJECTS[fdx], user_domain, rw_rbac_int_proxy)
+ self.rbac_internal_check(mgmt_session, xpath.format(role=quoted_key(role), project=quoted_key(self.RBAC_PROJECTS[fdx]),
+ user=quoted_key(self.RBAC_USERS[idx]), domain=quoted_key(user_domain)))
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, role1, self.RBAC_USERS[idx],
+ self.RBAC_PROJECTS[ldx], user_domain, rw_rbac_int_proxy)
+ self.rbac_internal_check(mgmt_session, xpath.format(role=quoted_key(role1), project=quoted_key(self.RBAC_PROJECTS[ldx]),
+ user=quoted_key(self.RBAC_USERS[idx]), domain=quoted_key(user_domain)))
+ # Deleting the four projects and then checking rw-rbac-internal
+ for project_name in self.RBAC_PROJECTS:
+ rift.auto.mano.delete_project(rw_conman_proxy, project_name)
+ print ("Deleting project: {}".format(project_name))
+ self.DELETED_PROJECTS_TRACKER.add(project_name)
+
+ for idx in range(0, 4):
+ fdx = project_order[idx]
+ ldx = project_order[idx + 1]
+ role = self.project_roles[2 * idx]
+ role1 = self.project_roles[(2 * idx) + 1]
+
+ with pytest.raises(Exception, message="This user {} (with this role {} and project {}) shouldn't be on rbac-internal."
+ .format(self.RBAC_USERS[idx], role, self.RBAC_PROJECTS[fdx])) as excinfo:
+ self.rbac_internal_check(mgmt_session, xpath.format(role=quoted_key(role), project=quoted_key(self.RBAC_PROJECTS[fdx]),
+ user=quoted_key(self.RBAC_USERS[idx]), domain=quoted_key(user_domain)))
+ with pytest.raises(Exception, message="This user {} (with this role {} and project {}) shouldn't be on rbac-internal."
+ .format(self.RBAC_USERS[idx], role1, self.RBAC_PROJECTS[ldx])) as excinfo:
+ self.rbac_internal_check(mgmt_session, xpath.format(role=quoted_key(role1), project=quoted_key(self.RBAC_PROJECTS[ldx]),
+ user=quoted_key(self.RBAC_USERS[idx]), domain=quoted_key(user_domain)))
+
+ def test_roles_revoke(self, rw_conman_proxy, rw_user_proxy, rbac_platform_proxy, rw_project_proxy,
+ rbac_user_passwd, user_domain, rw_rbac_int_proxy):
+ """Assigning all the roles and then revoking them"""
+
+ # Creating users and assigning each of them a role
+ rift.auto.mano.create_project(rw_conman_proxy, 'test01')
+ for incrementor, role in enumerate(self.project_roles + self.platform_roles, 1):
+ user_name = 'test_user_{}'.format(incrementor)
+ rift.auto.mano.create_user(rw_user_proxy, user_name, rbac_user_passwd, user_domain)
+
+ if 'platform' in role:
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, role, user_name, user_domain, rw_rbac_int_proxy)
+ else:
+
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, role, user_name, 'test01', user_domain, rw_rbac_int_proxy)
+
+ # Removing the assigned roles from each user
+ for incrementor, role in enumerate(self.project_roles + self.platform_roles, 1):
+ user_name = 'test_user_{}'.format(incrementor)
+ if 'platform' in role:
+ rift.auto.mano.revoke_platform_role_from_user(rbac_platform_proxy, role, user_name, user_domain)
+ rift.auto.mano.revoke_user_from_platform_config(rbac_platform_proxy, user_name, user_domain)
+ else:
+ rift.auto.mano.revoke_project_role_from_user(rw_project_proxy, role, user_name, 'test01', user_domain)
+
+ def test_misbehaviours(
+ self, rw_user_proxy, rbac_user_passwd, user_domain,
+ session_class, confd_host, tbac, rw_rbac_int_proxy):
+ """Verify if bad credentials can cause any problems."""
+ rift.auto.mano.create_user(
+ rw_user_proxy, 'testuser', rbac_user_passwd, user_domain)
+ # Trying to login with an incorrect password multiple times
+ counter = 1
+ while(counter < 4):
+ with pytest.raises(
+ Exception,
+ message="User was able to login with the wrong password"
+ ):
+ rift.auto.mano.get_session(
+ session_class, confd_host, 'testuser', 'wrong_password',
+ timeout=5)
+ counter += 1
+
+ # Trying to login with INAVLID_LOGIN_CREDENTIALS
+ for uname, passwd in self.INAVLID_LOGIN_CREDENTIALS.items():
+ with pytest.raises(
+ Exception,
+ message="User logged im with invalid login credentials"
+ ):
+ rift.auto.mano.get_session(
+ session_class, confd_host, uname, passwd, timeout=5)
+ # Creating a user with POSSIBLY_PROBLEMATIC_CREDENTIALS
+ if tbac:
+ for uname, passwd in self.POSSIBLY_PROBLEMATIC_CREDENTIALS.items():
+ rift.auto.mano.create_user(
+ rw_user_proxy, uname,
+ passwd[0],
+ passwd[1]
+ )
+ else:
+ for uname, passwd in self.POSSIBLY_PROBLEMATIC_CREDENTIALS.items():
+ rift.auto.mano.create_user(
+ rw_user_proxy, uname,
+ passwd[0],
+ user_domain
+ )
+ # Creating a user with INVALID_CREDENTIALS
+ for username, password in self.INVALID_CREDENTIALS.items():
+ with pytest.raises(
+ Exception,
+ message="User created with invalid credentials"
+ ):
+ rift.auto.mano.create_user(
+ rw_user_proxy, username, password, user_domain)
+ # Delete the users created with POSSIBLY_PROBLEMATIC_CREDENTIALS
+ if tbac:
+ for uname, domain in self.POSSIBLY_PROBLEMATIC_CREDENTIALS.items():
+ rift.auto.mano.delete_user(
+ rw_user_proxy, uname,
+ domain[1]
+ )
+ else:
+ for uname, passwd in self.POSSIBLY_PROBLEMATIC_CREDENTIALS.items():
+ rift.auto.mano.delete_user(
+ rw_user_proxy, uname, user_domain
+ )
+
+ def test_project_keys(
+ self, rw_project_proxy, rbac_user_passwd, session_class,
+ confd_host):
+ """Trying to access/create various projects with bad project keys."""
+ # Checking if INVALID_PROJECT_KEYS can be accessed.
+ for project_name in self.INVALID_PROJECT_KEYS:
+ project_cm_config_xpath = '/project[name={project_name}]/project-state'
+ project_ = rw_project_proxy.get_config(
+ project_cm_config_xpath.format(
+ project_name=quoted_key(project_name)
+ ),
+ list_obj=True
+ )
+ assert project_ is None
+ # Trying to create projects with INVALID_PROJECT_CREATE_KEYS
+ for project_name in self.INVALID_PROJECT_CREATE_KEYS:
+ with pytest.raises(
+ Exception,
+ message="Project created with the INVALID_PROJECT_CREATE_KEYS"
+ ):
+ rift.auto.mano.create_project(rw_conman_proxy, project_name)
+ # These POSSIBLY_PROBLEMATIC_KEYS should not cause any error in theory.
+ for project_name in self.POSSIBLY_PROBLEMATIC_KEYS:
+ rift.auto.mano.create_project(rw_project_proxy, project_name)
+ # User trying to access a project he has no access to.
+ user_session = rift.auto.mano.get_session(
+ session_class, confd_host, 'test_user_11', rbac_user_passwd)
+ pxy = user_session.proxy(RwConmanYang)
+ project_ = pxy.get_config(
+ project_cm_config_xpath.format(
+ project_name=quoted_key('test01')
+ )
+ )
+ assert project_ is None
+ rift.auto.mano.close_session(user_session)
+
+ def test_project_testing(self, rw_conman_proxy, rw_user_proxy, rw_project_proxy, rbac_user_passwd, user_domain, rw_rbac_int_proxy):
+ """Multiple projects creation, deletion, re-addition with verification every step of the way"""
+
+ # Creating projects and users for this test case
+ for idx in range(1,5):
+ project_name = 'testing_project_{}'.format(idx)
+ rift.auto.mano.create_project(rw_conman_proxy, project_name)
+ self.TEST_PROJECTS.append(project_name)
+ if project_name in self.DELETED_PROJECTS_TRACKER:
+ self.DELETED_PROJECTS_TRACKER.remove(project_name)
+
+ for idx in range(1,9):
+ rift.auto.mano.create_user(rw_user_proxy, 'testing_user_{}'.format(idx), rbac_user_passwd, user_domain)
+ self.TEST_USERS.append('testing_user_{}'.format(idx))
+
+ # Assigning project roles to users
+ for idx in range(0,8):
+ role = self.project_roles[idx]
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, role, self.TEST_USERS[idx],
+ self.TEST_PROJECTS[idx//2], user_domain, rw_rbac_int_proxy)
+
+ # Deleting all test projects
+ for project_name in self.TEST_PROJECTS:
+ rift.auto.mano.delete_project(rw_conman_proxy, project_name)
+ self.DELETED_PROJECTS_TRACKER.add(project_name)
+
+ # Recreating all the deleted projects
+ for project_name in self.TEST_PROJECTS:
+ rift.auto.mano.create_project(rw_conman_proxy, project_name)
+ if project_name in self.DELETED_PROJECTS_TRACKER:
+ self.DELETED_PROJECTS_TRACKER.remove(project_name)
+
+ # Check if the recreated projects have the old users assigned to them still.
+ for idx in range(0,8):
+ role = self.project_roles[idx]
+ role_keyed_path = "/project[name={project}]/project-config/user[user-name={user}][user-domain={domain}]/role[role={user_role}]"
+ role_ = rw_project_proxy.get_config(role_keyed_path.format(project=quoted_key(self.TEST_PROJECTS[idx//2]),
+ user=quoted_key(self.TEST_USERS[idx]), domain=quoted_key(user_domain), user_role=quoted_key(role)))
+ assert role_ is None, "This user shouldn't exist in this project which was just created"
+
+ # Reassigning the old users to their old roles.
+ for idx in range(0,8):
+ role = self.project_roles[idx]
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, role, self.TEST_USERS[idx],
+ self.TEST_PROJECTS[idx//2], user_domain, rw_rbac_int_proxy)
+
+
+@pytest.mark.depends('rbac_setup')
+@pytest.mark.teardown('rbac_setup')
+@pytest.mark.incremental
+class TestTeardown(object):
+ """Class Teardown."""
+
+ def test_delete_projects(self, rw_conman_proxy):
+ invalid_projects = TestIdentity.POSSIBLY_PROBLEMATIC_KEYS + ['test01']
+ valid_projects = TestIdentity.TEST_PROJECTS + TestIdentity.RBAC_PROJECTS
+ all_projects = valid_projects + invalid_projects
+
+ for project_name in all_projects:
+ try:
+ rift.auto.mano.delete_project(rw_conman_proxy, project_name)
+ except rift.auto.session.ProxyRequestError as e:
+ if project_name in TestIdentity.DELETED_PROJECTS_TRACKER:
+ print ("Project {} is already deleted".format(project_name))
+ elif project_name not in invalid_projects:
+ print ("Failed to delete project: {}".format(project_name))
+ raise e
+
+ def test_delete_users(self, rw_user_proxy, rbac_platform_proxy, user_domain):
+ users_test_data = ['testuser']
+ for incrementor, role in enumerate(TestIdentity.project_roles + TestIdentity.platform_roles, 1):
+ users_test_data.append('test_user_{}'.format(incrementor))
+
+ for user in TestIdentity.platform_users:
+ users_test_data.append(user)
+
+ # Deletes the users
+ for user in users_test_data+TestIdentity.RBAC_USERS+TestIdentity.TEST_USERS:
+ try:
+ keyed_path = "/rbac-platform-config/user[user-name={user}][user-domain={domain}]"
+ platform_cfg_ent = rbac_platform_proxy.get_config(keyed_path.format(user=quoted_key(user), domain=quoted_key(user_domain)))
+
+ if platform_cfg_ent is not None:
+ # Delete from the platform-config first.
+ rift.auto.mano.revoke_user_from_platform_config(rbac_platform_proxy, user, user_domain)
+ rift.auto.mano.delete_user(rw_user_proxy, user, user_domain)
+
+ except rift.auto.session.ProxyRequestError as e:
+ if user not in TestIdentity.INAVLID_LOGIN_CREDENTIALS:
+ print ("Deletion of user {} failed".format(user))
+ raise e
+ else:
+ print ("Expected error deleting invalid user {}".format(user))
diff --git a/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_mano_xpath_access.py b/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_mano_xpath_access.py
new file mode 100644
index 0000000..71e96a9
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_mano_xpath_access.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+
+import pytest
+import gi
+
+import rift.auto.mano
+import rift.auto.descriptor
+
+gi.require_version('RwProjectNsdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
+gi.require_version('RwCloudYang', '1.0')
+gi.require_version('RwSdnYang', '1.0')
+gi.require_version('RwLaunchpadYang', '1.0')
+gi.require_version('RwVnfrYang', '1.0')
+gi.require_version('RwNsrYang', '1.0')
+gi.require_version('RwImageMgmtYang', '1.0')
+gi.require_version('RwStagingMgmtYang', '1.0')
+gi.require_version('RwPkgMgmtYang', '1.0')
+
+from gi.repository import (
+ RwProjectNsdYang,
+ RwProjectVnfdYang,
+ RwCloudYang,
+ RwSdnYang,
+ RwLaunchpadYang,
+ RwVnfrYang,
+ RwNsrYang,
+ RwImageMgmtYang,
+ RwStagingMgmtYang,
+ RwPkgMgmtYang,
+)
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+
+@pytest.fixture(scope='module')
+def mano_xpaths():
+ """All xpaths which need to be accessed by users with various roles"""
+
+ xpaths_dict = {
+ 'catalog' : ('/vnfd-catalog', '/nsd-catalog'),
+ 'accounts' : ('/cloud', '/sdn'),
+ 'records' : ('/vnfr-catalog', '/vnfr-console', '/ns-instance-config', '/ns-instance-opdata'),
+ 'pkg-mgmt' : ('/staging-areas', '/upload-jobs', '/copy-jobs', '/download-jobs'),
+ 'config-agent': ('/config-agent',),
+ 'ro' : ('/resource-orchestrator',),
+ 'datacenter' : ('/datacenters',),
+ }
+ return xpaths_dict
+
+
+@pytest.fixture(scope='module')
+def mano_roles_xpaths_mapping():
+ """Mano roles and its accessible xpaths mapping"""
+ mano_roles_xpaths_mapping_dict = {
+ 'rw-project:project-admin': ('catalog', 'accounts', 'records', 'pkg-mgmt', 'config-agent', 'ro', 'datacenter'),
+ 'rw-project:project-oper' : ('catalog', 'accounts', 'records', 'pkg-mgmt', 'config-agent', 'ro', 'datacenter'),
+ 'rw-project-mano:catalog-oper' : ('catalog', 'pkg-mgmt'),
+ 'rw-project-mano:catalog-admin' : ('catalog', 'pkg-mgmt'),
+ 'rw-project-mano:lcm-admin' : ('catalog', 'accounts', 'records', 'config-agent', 'datacenter'),
+ 'rw-project-mano:lcm-oper' : ('records',),
+ 'rw-project-mano:account-admin' : ('accounts', 'config-agent', 'ro', 'datacenter'),
+ 'rw-project-mano:account-oper' : ('accounts', 'config-agent', 'ro', 'datacenter'),
+ }
+ return mano_roles_xpaths_mapping_dict
+
+
+@pytest.fixture(scope='module')
+def xpath_module_mapping():
+ """Mano Xpaths and its module mapping. Value also carries config or opdata type along with yang-module"""
+ xpath_module_mapping_dict = {
+ ('/vnfd-catalog',): (RwProjectVnfdYang, 'get_config'),
+ ('/nsd-catalog',): (RwProjectNsdYang, 'get_config'),
+ ('/cloud',): (RwCloudYang, 'get_config'),
+ ('/sdn',): (RwSdnYang, 'get_config'),
+ ('/vnfr-catalog', '/vnfr-console'): (RwVnfrYang, 'get'),
+ ('/ns-instance-config', '/ns-instance-opdata'): (RwNsrYang, 'get'),
+ ('/upload-jobs', '/download-jobs'): (RwImageMgmtYang, 'get'),
+ ('/copy-jobs', ): (RwPkgMgmtYang, 'get'),
+ ('/staging-areas',): (RwStagingMgmtYang, 'get'),
+ ('/resource-orchestrator', '/datacenters'): (RwLaunchpadYang, None),
+ ('/config-agent',): None,
+ }
+ return xpath_module_mapping_dict
+
+@pytest.mark.setup('mano_xpath_access')
+@pytest.mark.depends('nsr')
+@pytest.mark.incremental
+class TestRbacManoXpathAccess(object):
+ def test_copy_nsd_catalog_item(self, mgmt_session):
+ """Copy a NSD catalog item, so that /copy-jobs xpath can be tested."""
+ nsd_path = '/rw-project:project[rw-project:name="default"]/nsd-catalog'
+ nsd = mgmt_session.proxy(RwProjectNsdYang).get_config(nsd_path)
+ nsd_pkg_id = nsd.nsd[0].id
+ rpc_input = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageCopy.from_dict(
+ {'package_type': 'NSD', 'package_id': nsd_pkg_id, 'package_name': 'test_nsd_copy',
+ 'project_name': 'default'})
+ mgmt_session.proxy(RwPkgMgmtYang).rpc(rpc_input)
+
+ def test_rbac_mano_xpaths_access(self, mano_xpaths, logger, mano_roles_xpaths_mapping, xpath_module_mapping, session_class,
+ project_keyed_xpath, user_domain, rbac_platform_proxy, rw_project_proxy, rbac_user_passwd, confd_host, rw_user_proxy, rw_rbac_int_proxy):
+ """Verify Mano roles/Permission mapping works (Verifies only read access for all Xpaths)."""
+ project_name = 'default'
+
+ # Skipping download-jobs as it is not yet implemented from MANO side.
+ # Others are skipped becuase they need Juju, Openmano configurations etc.
+ skip_xpaths = ('/download-jobs', '/config-agent', '/resource-orchestrator', '/datacenters', '/upload-jobs')
+
+ for index, (role, xpath_keys_tuple) in enumerate(mano_roles_xpaths_mapping.items()):
+ # Create an user and assign a role
+ user_name = 'user-{}'.format(index)
+ rift.auto.mano.create_user(rw_user_proxy, user_name, rbac_user_passwd, user_domain)
+ logger.debug('Creating an user {} with role {}'.format(user_name, role))
+ if 'platform' in role:
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, role, user_name, user_domain, rw_rbac_int_proxy)
+ else:
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, role, user_name, project_name, user_domain, rw_rbac_int_proxy)
+
+ # Get user session
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user_name, rbac_user_passwd)
+
+ # go through each of its xpaths keys and try to access
+ for xpath_key in xpath_keys_tuple:
+ for xpath in mano_xpaths[xpath_key]:
+ if xpath in skip_xpaths:
+ continue
+ logger.debug('User {} with role {} trying to access xpath {}'.format(user_name, role, xpath))
+ yang_module, get_type = [yang_module for xpath_tuple, yang_module in xpath_module_mapping.items()
+ if xpath in xpath_tuple][0]
+ user_pxy = user_session.proxy(yang_module)
+ get_data_func = getattr(user_pxy, get_type)
+ assert get_data_func(project_keyed_xpath.format(project_name=quoted_key(project_name))+xpath)
+
+ # go through remaining xpaths keys which this user-role not part of and try to access; it should fail
+ access_denied_xpath_keys_tuple = set(mano_xpaths.keys()).difference(xpath_keys_tuple)
+ for xpath_key in access_denied_xpath_keys_tuple:
+ for xpath in mano_xpaths[xpath_key]:
+ if xpath in skip_xpaths:
+ continue
+ logger.debug('User {} with role {} trying to access xpath {}. It should get None'.format(user_name, role, xpath))
+ yang_module, get_type = [yang_module for xpath_tuple, yang_module in xpath_module_mapping.items()
+ if xpath in xpath_tuple][0]
+ user_pxy = user_session.proxy(yang_module)
+ get_data_func = getattr(user_pxy, get_type)
+ assert get_data_func(project_keyed_xpath.format(project_name=quoted_key(project_name))+xpath) is None
diff --git a/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_roles.py b/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_roles.py
new file mode 100644
index 0000000..2e0cb41
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_roles.py
@@ -0,0 +1,1220 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+import collections
+import gi
+import pytest
+import random
+import uuid
+
+import rift.auto.mano
+import rift.auto.descriptor
+gi.require_version('RwUserYang', '1.0')
+gi.require_version('RwProjectYang', '1.0')
+gi.require_version('RwConmanYang', '1.0')
+gi.require_version('RwProjectNsdYang', '1.0')
+gi.require_version('RwNsrYang', '1.0')
+gi.require_version('RwVnfrYang', '1.0')
+gi.require_version('RwlogMgmtYang', '1.0')
+from gi.repository import (
+ RwUserYang,
+ RwProjectYang,
+ RwConmanYang,
+ RwProjectVnfdYang,
+ RwProjectNsdYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwVlrYang,
+ RwRbacPlatformYang,
+ RwlogMgmtYang,
+ RwRedundancyYang,
+)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+SESSION_CONNECT_TIMEOUT=5
+
+@pytest.fixture(scope='session')
+def user_test_roles():
+ """Returns tuples of roles which enable an user to delete/create a new user"""
+ write_roles = ('rw-rbac-platform:super-admin', 'rw-rbac-platform:platform-admin')
+ read_roles = tuple()
+ return write_roles, read_roles
+
+
+@pytest.fixture(scope='session')
+def project_test_roles():
+ """Returns tuples of roles which enable an user to create, read, delete a project"""
+ write_roles = ('rw-rbac-platform:super-admin', )
+ read_roles = ('rw-project:project-oper', 'rw-project:project-admin')
+ return write_roles, read_roles
+
+
+@pytest.fixture(scope='session')
+def onboarding_test_roles():
+ """Fixture that returns a tuple of roles which enable an user to onboard/modify/delete a VNF/NS package"""
+ write_roles = ('rw-rbac-platform:super-admin', 'rw-project-mano:catalog-admin', 'rw-project:project-admin')
+ read_roles = ('rw-project-mano:catalog-oper', 'rw-project-mano:lcm-admin')
+ return write_roles, read_roles
+
+
+@pytest.fixture(scope='session')
+def account_test_roles():
+ """Fixture that returns a tuple of roles which enable an user to CRUD a VIM, Sdn account"""
+ write_roles = ('rw-rbac-platform:super-admin', 'rw-project-mano:account-admin', 'rw-project:project-admin')
+ read_roles = ('rw-project-mano:account-oper', 'rw-project-mano:lcm-admin')
+ return write_roles, read_roles
+
+
+@pytest.fixture(scope='session')
+def ns_instantiate_test_roles():
+ """Fixture that returns a tuple of roles which enable an user to instantiate/terminate a NS
+ Read roles: who all can access vnfr-catalog, vnfr-console, ns-instance-opdata etc"""
+ write_roles = ('rw-rbac-platform:super-admin', 'rw-project-mano:lcm-admin', 'rw-project:project-admin')
+ read_roles = ('rw-project-mano:lcm-oper', )
+ return write_roles, read_roles
+
+
+@pytest.fixture(scope='session')
+def syslog_server_test_roles():
+ """Fixture that returns a tuple of roles which enable an user set the syslog server_address"""
+ write_roles = ('rw-rbac-platform:super-admin', 'rw-rbac-platform:platform-admin', 'rw-rbac-platform:platform-oper')
+ read_roles = tuple()
+ return write_roles, read_roles
+
+
+@pytest.fixture(scope='session')
+def redundancy_config_test_roles():
+ """Fixture that returns a tuple of roles which enable an user set the syslog server_address"""
+ write_roles = ('rw-rbac-platform:super-admin', 'rw-rbac-platform:platform-admin')
+ read_roles = ('rw-rbac-platform:platform-oper', )
+ return write_roles, read_roles
+
+
+@pytest.fixture(scope='session')
+def project_acessible():
+ """Fixture that returns name of the project to which all new users will be associated"""
+ return random.choice(['project1', 'default'])
+
+
+# @pytest.fixture(scope='session')
+# def project_not_accessible():
+# """Retruns name of the project whose users are not supposed to access the resources under project 'project_acessible'"""
+# return 'project2'
+
+
+@pytest.fixture(scope='session')
+def users_test_data(rw_user_proxy, rbac_platform_proxy, rw_project_proxy, all_roles, user_test_roles, project_test_roles,
+ onboarding_test_roles, account_test_roles, ns_instantiate_test_roles, user_domain, project_acessible, rw_conman_proxy,
+ syslog_server_test_roles, all_roles_combinations, rw_rbac_int_proxy, tbac, redundancy_config_test_roles):
+ """Creates new users required for a test and assign appropriate roles to them"""
+ if pytest.config.getoption("--user-creation-test"):
+ test_roles = user_test_roles
+ elif pytest.config.getoption("--project-creation-test"):
+ test_roles = project_test_roles
+ elif pytest.config.getoption("--onboarding-test"):
+ test_roles = onboarding_test_roles
+ elif pytest.config.getoption("--account-test"):
+ test_roles = account_test_roles
+ elif pytest.config.getoption("--nsr-test"):
+ test_roles = ns_instantiate_test_roles
+ elif pytest.config.getoption("--syslog-server-test"):
+ test_roles = syslog_server_test_roles
+ elif pytest.config.getoption("--redundancy-role-test"):
+ test_roles = redundancy_config_test_roles
+
+ # Create a project to which these users will be part of
+ if project_acessible != 'default':
+ rift.auto.mano.create_project(rw_conman_proxy, project_acessible)
+
+ def create_user_assign_role(user_name, password, role_set):
+ rift.auto.mano.create_user(rw_user_proxy, user_name, password, user_domain)
+ project_roles_list, platform_roles_list = [], []
+ for role in role_set:
+ if 'platform' in role:
+ platform_roles_list.append(role)
+ else:
+ project_roles_list.append(role)
+ if platform_roles_list:
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, platform_roles_list, user_name, user_domain, rw_rbac_int_proxy)
+ if project_roles_list:
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, project_roles_list, user_name,
+ project_acessible, user_domain, rw_rbac_int_proxy)
+
+ write_roles, read_roles = test_roles
+ fail_roles = [role for role in all_roles if role not in write_roles]
+
+ if False: #If its desired to run checks for all combinations, tbd on what option this will be enabled
+ write_roles_tmp, read_roles_tmp, fail_roles_tmp = [], [], []
+ for role_combination in all_roles_combinations:
+ if bool(set(role_combination).intersection(write_roles)):
+ write_roles_tmp.append(role_combination)
+ continue
+ if bool(set(role_combination).intersection(read_roles)):
+ read_roles_tmp.append(role_combination)
+ continue
+ if bool(set(role_combination).isdisjoint(write_roles)):
+ fail_roles_tmp.append(role_combination)
+ write_roles, read_roles, fail_roles = write_roles_tmp, read_roles_tmp, fail_roles_tmp
+
+ # Create the users with roles mapped
+ write_users, read_users, fail_users = dict(), dict(), dict()
+ for idx, role_set in enumerate(write_roles, 1):
+ if type(role_set) is str:
+ role_set = [role_set]
+ user_name = 'write-{}'.format(idx)
+ if tbac:
+ password=user_name
+ else:
+ password = rift.auto.mano.generate_password()
+ create_user_assign_role(user_name, password, role_set)
+ write_users[user_name] = (role_set, password)
+
+ for idx, role_set in enumerate(read_roles, 1):
+ if type(role_set) is str:
+ role_set = [role_set]
+ user_name = 'read-{}'.format(idx)
+ if tbac:
+ password=user_name
+ else:
+ password = rift.auto.mano.generate_password()
+ create_user_assign_role(user_name, password, role_set)
+ read_users[user_name] = (role_set, password)
+
+ for idx, role_set in enumerate(fail_roles, 1):
+ if type(role_set) is str:
+ role_set = [role_set]
+ user_name = 'fail-{}'.format(idx)
+ if tbac:
+ password=user_name
+ else:
+ password = rift.auto.mano.generate_password()
+ create_user_assign_role(user_name, password, role_set)
+ fail_users[user_name] = (role_set, password)
+ return write_users, read_users, fail_users
+
+
+@pytest.mark.setup('test_rbac_roles_setup')
+@pytest.mark.incremental
+class TestRbacVerification(object):
+ @pytest.mark.skipif(not pytest.config.getoption("--project-creation-test"), reason="need --project-creation-test option to run")
+ def test_project_create_delete_authorization(self, logger, users_test_data, session_class, confd_host, rw_conman_proxy,
+ project_keyed_xpath, project_acessible):
+ """Verifies only users with certain roles can create/delete a project"""
+
+ write_users, read_users, fail_users = users_test_data
+
+ # Check users in write_users dict able to create/delete a project
+ logger.debug('Verifying users which are authorised to create/delete a project')
+ for user in write_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, write_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, write_users[user][1])
+ pxy = user_session.proxy(RwProjectYang)
+
+ project_name = 'project-{}'.format(user)
+ logger.debug('Trying to create project {}'.format(project_name))
+ rift.auto.mano.create_project(pxy, project_name)
+
+ logger.debug('Trying to delete project {}'.format(project_name))
+ rift.auto.mano.delete_project(pxy, project_name)
+
+ rift.auto.mano.close_session(user_session)
+
+ # Check users in read_users dict able to read a project
+ logger.debug('Verifying users which are authorised to read a project')
+ for user in read_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, read_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, read_users[user][1])
+ pxy = user_session.proxy(RwProjectYang)
+
+ logger.debug('User {} trying to read project {}'.format(user, project_acessible))
+ project_ = pxy.get_config(project_keyed_xpath.format(project_name=quoted_key(project_acessible))+'/project-state', list_obj=True)
+ assert project_
+
+ rift.auto.mano.close_session(user_session)
+
+ # Check users in fail_users dict shouldn't be allowed to create a project or delete a project
+
+ # 'project-admin' user not able to create a project, but can delete a project, hence do the create/delete
+ # operation for this user at the end
+ fail_users_reordered = collections.OrderedDict()
+ for user, role_passwd_tuple in fail_users.items():
+ if any('project-admin' in role for role in role_passwd_tuple[0]):
+ project_admin_key, project_admin_val = user, role_passwd_tuple
+ continue
+ fail_users_reordered[user] = role_passwd_tuple
+ fail_users_reordered[project_admin_key] = project_admin_val
+
+ logger.debug('Verifying users which are not supposed to create/delete a project')
+ for user in fail_users_reordered:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, fail_users_reordered[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, fail_users_reordered[user][1])
+ pxy = user_session.proxy(RwProjectYang)
+
+ project_name = 'project-{}'.format(user)
+
+ with pytest.raises(Exception, message='User {} not authorised to create project {}'.format(
+ user, project_name)) as excinfo:
+ logger.debug('User {} trying to create project {}'.format(user, project_name))
+ rift.auto.mano.create_project(pxy, project_name)
+
+ logger.debug('User {} trying to delete project {}'.format(user, project_acessible))
+ if any('project-admin' in role for role in fail_users_reordered[user][0]):
+ rift.auto.mano.delete_project(pxy, project_acessible)
+ continue
+ with pytest.raises(Exception, message='User {} not authorised to delete project {}'.format(
+ user, project_acessible)) as excinfo:
+ rift.auto.mano.delete_project(pxy, project_acessible)
+
+ rift.auto.mano.close_session(user_session)
+
+ def delete_user_from_project(
+ self, project_proxy, target_user, target_project, user_domain):
+ project_xpath = (
+ "/project[name={project}]/project-config/user" +
+ "[user-name={user}][user-domain={domain}]"
+ )
+ # Check if the user exists for the project
+ ret_val = project_proxy.get_config(
+ project_xpath.format(
+ project=quoted_key(target_project),
+ user=quoted_key(target_user),
+ domain=quoted_key(user_domain)))
+
+ assert ret_val
+ # Delete the target_user from the target_project
+ project_proxy.delete_config(
+ project_xpath.format(
+ project=quoted_key(target_project),
+ user=quoted_key(target_user),
+ domain=quoted_key(user_domain))
+ )
+ # Verify that he is deleted
+ ret_val = project_proxy.get_config(
+ project_xpath.format(
+ project=quoted_key(target_project),
+ user=quoted_key(target_user),
+ domain=quoted_key(user_domain))
+ )
+ assert ret_val is None
+
+ @pytest.mark.skipif(
+ not pytest.config.getoption("--project-creation-test"),
+ reason="need --project-creation-test option to run")
+ def test_project_admin_users_role_authorization(
+ self, logger, user_roles, rw_user_proxy, session_class,
+ user_domain, confd_host, rw_conman_proxy, project_keyed_xpath,
+ rw_project_proxy, rw_rbac_int_proxy, tbac):
+ """Verify project admin & oper role operations on a single project."""
+ logger.debug(
+ "Create a project & 8 users each with its own project/mano role")
+ rift.auto.mano.create_project(rw_conman_proxy, 'project-vzw')
+ project_user_data = {}
+ for idx, role in enumerate(user_roles, 1):
+ user_name = 'project_vzw_user-{}'.format(idx)
+ if not tbac:
+ password = rift.auto.mano.generate_password()
+ else:
+ password = user_name
+ rift.auto.mano.create_user(
+ rw_user_proxy, user_name, password, user_domain)
+ rift.auto.mano.assign_project_role_to_user(
+ rw_project_proxy, role, user_name, 'project-vzw',
+ user_domain, rw_rbac_int_proxy)
+ project_user_data[user_name] = {"role": role, "password": password}
+ if "project-admin" in role:
+ project_admin_user = user_name
+
+ logger.debug("Project admin deleting roles from users.")
+ project_admin_session = rift.auto.mano.get_session(
+ session_class, confd_host, project_admin_user,
+ project_user_data[project_admin_user]["password"])
+ project_admin_proxy = project_admin_session.proxy(RwProjectYang)
+ for user in project_user_data:
+ role = project_user_data[user]["role"]
+ if project_admin_user == user:
+ continue
+ rift.auto.mano.revoke_project_role_from_user(
+ project_admin_proxy, role, user, 'project-vzw', user_domain)
+ rift.auto.mano.close_session(project_admin_session)
+
+ logger.debug("Verify project admin can assign another role to users")
+ project_admin_session = rift.auto.mano.get_session(
+ session_class, confd_host, project_admin_user,
+ project_user_data[project_admin_user]["password"])
+ project_admin_proxy = project_admin_session.proxy(RwProjectYang)
+ for user in project_user_data:
+ role = 'rw-project:project-oper'
+ if project_admin_user == user:
+ continue
+ rift.auto.mano.assign_project_role_to_user(
+ project_admin_proxy, role, user, 'project-vzw',
+ user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.close_session(project_admin_session)
+
+ # Verify the user able to read project
+ for user in project_user_data:
+ user_session = rift.auto.mano.get_session(
+ session_class, confd_host, user,
+ project_user_data[user]["password"])
+ user_project_pxy = user_session.proxy(RwProjectYang)
+ logger.debug("verifying user able to read project")
+ xpath = "/project[name={project}]/project-config"
+ ret_val = user_project_pxy.get_config(
+ xpath.format(project=quoted_key('project-vzw')))
+ assert ret_val
+ rift.auto.mano.close_session(user_session)
+
+ logger.debug("Verify if project admin can replace roles for users")
+ project_admin_session = rift.auto.mano.get_session(
+ session_class, confd_host, project_admin_user,
+ project_user_data[project_admin_user]["password"])
+ project_admin_proxy = project_admin_session.proxy(RwProjectYang)
+ for user in project_user_data:
+ if project_admin_user != user:
+ xpath = (
+ "/project[name={project}]/project-config/user" +
+ "[user-name={user}][user-domain={domain}]")
+ new_role = (
+ RwProjectYang.
+ YangData_RwProject_Project_ProjectConfig_User_Role.
+ from_dict({
+ 'role': 'rw-project-mano:account-admin'})
+ )
+ project_admin_proxy.replace_config(
+ xpath.format(
+ project=quoted_key('project-vzw'),
+ user=quoted_key(user),
+ domain=quoted_key(user_domain)), new_role)
+ ret_val = project_admin_proxy.get_config(
+ xpath.format(
+ project=quoted_key('project-vzw'),
+ user=quoted_key(user),
+ domain=quoted_key(user_domain),
+ role=quoted_key('rw-project-mano:lcm-oper')))
+ assert ret_val
+ rift.auto.mano.close_session(project_admin_session)
+
+ logger.debug("Verify if users able to change its own user details")
+ for user in project_user_data:
+ if tbac:
+ break
+ password = project_user_data[user]["password"]
+ user_session = rift.auto.mano.get_session(
+ session_class, confd_host, user, password)
+ user_proxy = user_session.proxy(RwUserYang)
+ rift.auto.mano.update_password(
+ user_proxy, user, user, user_domain, rw_rbac_int_proxy)
+ project_user_data[user]["new_password"] = user
+ rift.auto.mano.close_session(user_session)
+
+ logger.debug(
+ "{} trying to connect ".format(user) +
+ "with its old password {}".format(password)
+ )
+
+ message = ('{} not supposed to '.format(user) +
+ 'log-in with old passwd {}'.format(password))
+ with pytest.raises(Exception, message=message):
+ rift.auto.mano.get_session(
+ session_class, confd_host, user,
+ password, timeout=SESSION_CONNECT_TIMEOUT)
+
+ # Verify the user should be able to log-in with new password
+ logger.debug(
+ "User {} trying to log-in with its updated password {}".format(
+ user, project_user_data[user]["new_password"]))
+
+ usession_updated_passwd = rift.auto.mano.get_session(
+ session_class, confd_host, user,
+ project_user_data[user]["new_password"])
+
+ # project admin able to delete users from the project database
+ if tbac:
+ password = project_user_data[project_admin_user]["password"]
+ else:
+ password = project_user_data[project_admin_user]["new_password"]
+ project_admin_session = rift.auto.mano.get_session(
+ session_class, confd_host, project_admin_user, password)
+ project_admin_proxy = project_admin_session.proxy(RwProjectYang)
+
+ for user in project_user_data:
+ if user == project_admin_user:
+ continue
+ logger.debug('deleting user {} from project project-vzw'.format(user))
+ self.delete_user_from_project(
+ project_admin_proxy, user, 'project-vzw', user_domain)
+ rift.auto.mano.close_session(project_admin_session)
+
+ @pytest.mark.skipif(
+ not pytest.config.getoption("--project-creation-test"),
+ reason="need --project-creation-test option to run")
+ def test_multi_project_multi_users_role_authorization(
+ self, logger, user_roles, rw_user_proxy, session_class,
+ user_domain, confd_host, rw_conman_proxy, project_keyed_xpath,
+ rw_project_proxy, rw_rbac_int_proxy, tbac, rbac_user_passwd):
+ """Verify that users with roles doesn't have unauthorized access."""
+ """
+ Case 01. rbac_user2 has different roles in project1 and project2.
+ Case 02. rbac_user4 has project-admin in project3 and project4.
+ Case 03. rbac_user9 has project-oper in project5 and project6.
+ """
+
+ # The sample user data
+ role1 = 'rw-project:project-admin'
+ role2 = 'rw-project:project-oper'
+ project_user_data = {
+ "project1": {
+ "rbac_user1": role1,
+ "rbac_user2": role2,
+ },
+ "project2": {
+ "rbac_user2": role1,
+ "rbac_user3": role2,
+ },
+ "project3": {
+ "rbac_user4": role1,
+ "rbac_user5": role2,
+
+ },
+ "project4": {
+ "rbac_user4": role1,
+ "rbac_user6": role2,
+ },
+ "project5": {
+ "rbac_user7": role1,
+ "rbac_user9": role2,
+ },
+ "project6": {
+ "rbac_user8": role1,
+ "rbac_user9": role2,
+ }
+ }
+ # Create projects
+ for idx in range(1, 7):
+ rift.auto.mano.create_project(
+ rw_conman_proxy, 'project{}'.format(idx))
+ # Create users
+ for idx in range(1, 10):
+ rift.auto.mano.create_user(
+ rw_user_proxy, 'rbac_user{}'.format(idx),
+ rbac_user_passwd, user_domain)
+ # Assign roles to users according to the project_user_data
+ for idx in range(1, 7):
+ project = 'project{}'.format(idx)
+ for user_name, role in project_user_data[project].items():
+ rift.auto.mano.assign_project_role_to_user(
+ rw_project_proxy, role, user_name, project,
+ user_domain, rw_rbac_int_proxy)
+
+ def project_access(
+ user_name, target_project, session_class,
+ confd_host, logger):
+ """Verify if user has access to target project."""
+ password = rbac_user_passwd
+ if tbac:
+ password = user_name
+ user_session = rift.auto.mano.get_session(
+ session_class, confd_host, user_name, password)
+ logger.debug("{} trying to access {}".format(
+ user_name, target_project) +
+ "/project-state"
+ )
+ pxy = user_session.proxy(RwProjectYang)
+ # Verify is user has access to /project
+ project_xpath = '/project[name={}]/project-state'.format(
+ quoted_key(target_project)
+ )
+ response = pxy.get_config(project_xpath, list_obj=True)
+ assert response
+ # Verify is user has access to /project/project-config/user
+ project_user_xpath = (
+ "/project[name={project}]/project-config/" +
+ "user[user-name={user}][user-domain={domain}]"
+ )
+ target_user = list(project_user_data[target_project].keys())[0]
+ pxy = user_session.proxy(RwProjectYang)
+ response = pxy.get_config(
+ project_user_xpath.format(
+ project=quoted_key(target_project),
+ user=quoted_key(target_user),
+ domain=quoted_key(user_domain)
+ )
+ )
+ assert response
+ rift.auto.mano.close_session(user_session)
+
+ # Case 01. rbac_user2 has different roles in project1 and project2.
+
+ logger.debug('Veryfy rbac_user1 of project1 has no access to project2')
+ with pytest.raises(
+ Exception,
+ message="rbac_user1 accessed project2 which its not part of."):
+ project_access(
+ 'rbac_user1', 'project2', session_class, confd_host, logger)
+
+ logger.debug('Verify rbac_user2 has access to project1 and project2')
+ project_access(
+ 'rbac_user2', 'project1', session_class, confd_host, logger)
+ project_access(
+ 'rbac_user2', 'project2', session_class, confd_host, logger)
+
+ # Case 02. rbac_user4 has project-admin in project3 and project4.
+
+ logger.debug('Verify rbac_user4 has access to project 3 & project4')
+ project_access(
+ 'rbac_user4', 'project4', session_class, confd_host, logger)
+ project_access(
+ 'rbac_user4', 'project3', session_class, confd_host, logger)
+
+ logger.debug('Two users in project3 exchanges roles & check access')
+ rift.auto.mano.revoke_project_role_from_user(
+ rw_project_proxy, role1, 'rbac_user4',
+ 'project3', user_domain)
+ rift.auto.mano.revoke_project_role_from_user(
+ rw_project_proxy, role2, 'rbac_user5',
+ 'project3', user_domain)
+ rift.auto.mano.assign_project_role_to_user(
+ rw_project_proxy, role2, 'rbac_user4',
+ 'project3', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.assign_project_role_to_user(
+ rw_project_proxy, role1, 'rbac_user5',
+ 'project3', user_domain, rw_rbac_int_proxy)
+
+ logger.debug('rbac_user5 trying its access on project3 and project4')
+ project_access(
+ 'rbac_user5', 'project3', session_class,
+ confd_host, logger
+ )
+ with pytest.raises(
+ Exception,
+ message="rbac_user5 accessed project4 which its not part of."):
+ project_access(
+ 'rbac_user5', 'project4', session_class,
+ confd_host, logger
+ )
+
+ # 'rbac_user5'(admin role) revoking the role from rbac-user4
+ password = rbac_user_passwd
+ if tbac:
+ password = 'rbac_user5'
+ rbac_user2_session = rift.auto.mano.get_session(
+ session_class, confd_host, 'rbac_user5', password)
+ rbac_user2_prjt_pxy = rbac_user2_session.proxy(RwProjectYang)
+ self.delete_user_from_project(
+ rbac_user2_prjt_pxy, 'rbac_user4', 'project3', user_domain)
+
+ # Create new user 'del-user'
+ rift.auto.mano.create_user(
+ rw_user_proxy, 'del-user', rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_project_role_to_user(
+ rw_project_proxy, role2, 'del-user', 'project3',
+ user_domain, rw_rbac_int_proxy)
+ # Delete 'del-user' with 'rbac_user5'(admin role)
+ self.delete_user_from_project(
+ rbac_user2_prjt_pxy, 'del-user', 'project3', user_domain)
+
+ logger.debug(
+ 'rbac_user4 try to access project3 which its not a part of anymore'
+ )
+ with pytest.raises(
+ Exception,
+ message="rbac_user4 accessed project3 which its not part of."):
+ project_access(
+ 'rbac_user4', 'project3', session_class,
+ confd_host, logger)
+
+ logger.debug('rbac_user4 try to access project4 which its a part of.')
+ project_access(
+ 'rbac_user4', 'project4', session_class,
+ confd_host, logger)
+
+ # Case 03. rbac_user9 has project-oper in project5 and project6.
+
+ logger.debug('rbac_user9 try to access project5 & project6')
+ project_access(
+ 'rbac_user9', 'project5', session_class,
+ confd_host, logger)
+ project_access(
+ 'rbac_user9', 'project6', session_class,
+ confd_host, logger)
+
+ logger.debug(
+ 'rbac_user8 try to access to project5 which its not part of.'
+ )
+ with pytest.raises(
+ Exception,
+ message="rbac_user8 accessed project5 which its not part of."):
+ project_access(
+ 'rbac_user8', 'project5', session_class,
+ confd_host, logger)
+
+ logger.debug(
+ 'rbac_user7 try to access to project6 which its not part of.'
+ )
+ with pytest.raises(
+ Exception,
+ message="rbac_user7 accessed project6 which its not part of."):
+ project_access(
+ 'rbac_user7', 'project6', session_class,
+ confd_host, logger)
+
+
+ @pytest.mark.skipif(not pytest.config.getoption("--user-creation-test"), reason="need --user-creation-test option to run")
+ def test_user_create_delete_authorization(self, logger, users_test_data, session_class, confd_host, rw_user_proxy,
+ rbac_user_passwd, user_domain, tbac, rw_rbac_int_proxy):
+ """Verifies only users with certain roles can create/delete users and set the password of an user"""
+ write_users, read_users, fail_users = users_test_data
+
+ # Create a dummy user with admin/admin
+ dummy_user_name = 'dummy-user'
+ rift.auto.mano.create_user(rw_user_proxy, dummy_user_name, rbac_user_passwd, user_domain)
+
+ # Check users in write_users dict able to create/delete an user and able to set password for others
+ logger.debug('Verifying users which are authorised to create/delete an user')
+ for user in write_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, write_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, write_users[user][1])
+ pxy = user_session.proxy(RwUserYang)
+
+ user_name = 'new-user-{}'.format(user)
+ logger.debug('Trying to create user {}'.format(user_name))
+ rift.auto.mano.create_user(pxy, user_name, rbac_user_passwd, user_domain)
+
+ logger.debug('Trying to delete user {}'.format(user_name))
+ rift.auto.mano.delete_user(pxy, user_name, user_domain)
+
+ if not tbac: # password update is not allowed for external users in tbac
+ new_passwd = rift.auto.mano.generate_password()
+ # Check users in write_users dict able to set password for other user (dummy-user)
+ logger.debug('User {} trying to update password for user {}'.format(user, dummy_user_name))
+ rift.auto.mano.update_password(pxy, dummy_user_name, new_passwd, user_domain, rw_rbac_int_proxy)
+
+ # Verify dummy_user_name able to log-in with its new password
+ logger.debug('User {} trying to log-in with its updated password {}'.format(dummy_user_name, new_passwd))
+ dummy_user_session_updated_passwd = rift.auto.mano.get_session(session_class, confd_host, dummy_user_name,
+ new_passwd)
+
+ # Verify the user not able to log-in with old password
+ with pytest.raises(Exception, message='User {} not supposed to log-in with its old password {}'.format(
+ dummy_user_name, rbac_user_passwd)) as excinfo:
+ logger.debug('User {} trying to connect with its old password {}'.format(user, rbac_user_passwd))
+ rift.auto.mano.get_session(session_class, confd_host, dummy_user_name, rbac_user_passwd,
+ timeout=SESSION_CONNECT_TIMEOUT)
+
+ rift.auto.mano.close_session(dummy_user_session_updated_passwd)
+ rift.auto.mano.close_session(user_session)
+
+ # Check users in read_users dict able to read user list (path: /user-config)
+ logger.debug('Verifying users which are authorised to read user list')
+ for user in read_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, read_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, read_users[user][1])
+ pxy = user_session.proxy(RwUserYang)
+ logger.debug('User {} trying to access /user-config xpath'.format(user))
+ user_config = pxy.get_config('/user-config')
+ assert [user.user_name for user in user_config.user]
+
+ rift.auto.mano.close_session(user_session)
+
+ # Check users in fail_users dict not able to create/delete an user
+ logger.debug('Verifying users which are not supposed to create/delete an user')
+ for user in fail_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, fail_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, fail_users[user][1])
+ pxy = user_session.proxy(RwUserYang)
+
+ user_name = 'new-user-{}'.format(user)
+
+ with pytest.raises(Exception, message='User {} not authorised to create user {}'.format(
+ user, user_name)) as excinfo:
+ logger.debug('User {} trying to create an user {}'.format(user, user_name))
+ rift.auto.mano.create_user(pxy, user_name, rbac_user_passwd, user_domain)
+
+ with pytest.raises(Exception, message='User {} not authorised to delete user {}'.format(
+ user, dummy_user_name)) as excinfo:
+ logger.debug('User {} trying to delete user {}'.format(user, dummy_user_name))
+ rift.auto.mano.delete_user(pxy, dummy_user_name, user_domain)
+
+ rift.auto.mano.close_session(user_session)
+
+ if not tbac: # password update is not allowed for external users in tbac
+ # Check all users able to set their own password
+ logger.debug('Verifying an user able to set its own password')
+ for user, role_passwd_tuple in dict(write_users, **dict(read_users, **fail_users)).items():
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, role_passwd_tuple))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, role_passwd_tuple[1])
+ pxy = user_session.proxy(RwUserYang)
+
+ new_passwd = rift.auto.mano.generate_password()
+ logger.debug('User {} trying to update its password to {}'.format(user, new_passwd))
+ rift.auto.mano.update_password(pxy, user, new_passwd, user_domain, rw_rbac_int_proxy)
+
+ # Verify the user should be able to log-in with new password
+ logger.debug('User {} trying to log-in with its updated password {}'.format(user, new_passwd))
+ user_session_updated_passwd = rift.auto.mano.get_session(session_class, confd_host, user, new_passwd)
+
+ # Verify the user not able to log-in with old password
+ with pytest.raises(Exception, message='User {} not supposed to log-in with its old password {}'.format(
+ user, role_passwd_tuple[1])) as excinfo:
+ logger.debug('User {} trying to connect with its old password {}'.format(user, role_passwd_tuple[1]))
+ rift.auto.mano.get_session(session_class, confd_host, user, rbac_user_passwd, timeout=SESSION_CONNECT_TIMEOUT)
+
+ rift.auto.mano.close_session(user_session)
+ rift.auto.mano.close_session(user_session_updated_passwd)
+
+
+ @pytest.mark.skipif(not pytest.config.getoption("--account-test"), reason="need --account-test option to run")
+ def test_account_create_delete_authorization(self, users_test_data, mgmt_session, logger, cloud_module, fmt_cloud_xpath,
+ fmt_prefixed_cloud_xpath, project_acessible, cloud_account, session_class, confd_host):
+ """Verifies only users with certain roles can create/read/delete cloud, sdn accounts"""
+ write_users, read_users, fail_users = users_test_data
+ xpath_no_pfx = fmt_cloud_xpath.format(project=quoted_key(project_acessible), account_name=quoted_key(cloud_account.name))
+ xpath = fmt_prefixed_cloud_xpath.format(project=quoted_key(project_acessible), account_name=quoted_key(cloud_account.name))
+
+ # Check users in write_users dict able to create/delete cloud accounts
+ logger.debug('Verifying users which are authorised to create/delete cloud accounts')
+ for user in write_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, write_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, write_users[user][1])
+ cloud_pxy = user_session.proxy(cloud_module)
+
+ logger.debug('Trying to create a cloud account')
+ cloud_pxy.replace_config(xpath, cloud_account)
+ response = cloud_pxy.get(xpath_no_pfx)
+ assert response.name == cloud_account.name
+ assert response.account_type == cloud_account.account_type
+
+ logger.debug('Trying to delete the cloud account')
+ cloud_pxy.delete_config(xpath)
+ assert cloud_pxy.get(xpath_no_pfx) is None
+
+ rift.auto.mano.close_session(user_session)
+
+ # admin user creating a cloud account which read_users will be trying to read
+ logger.debug('admin user creating cloud account {}'.format(cloud_account.name))
+ admin_cloud_proxy = mgmt_session.proxy(cloud_module)
+ admin_cloud_proxy.replace_config(xpath, cloud_account)
+ assert admin_cloud_proxy.get(xpath_no_pfx).name == cloud_account.name
+
+ # Check users in read_users dict able to read cloud accounts
+ logger.debug('Verifying users which are authorised to read cloud accounts')
+ for user in read_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, read_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, read_users[user][1])
+ cloud_pxy = user_session.proxy(cloud_module)
+
+ response = cloud_pxy.get(xpath_no_pfx)
+ assert response.name == cloud_account.name
+ assert response.account_type == cloud_account.account_type
+
+ rift.auto.mano.close_session(user_session)
+
+ # Check users in fail_users dict not able to delete/read cloud accounts
+ logger.debug('Verifying users which are not authorised to read/delete cloud accounts')
+ for user in fail_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, fail_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, fail_users[user][1])
+ cloud_pxy = user_session.proxy(cloud_module)
+
+ with pytest.raises(Exception, message='User {} not authorised to delete cloud account {}'.format(
+ user, cloud_account.name)) as excinfo:
+ logger.debug('User {} trying to delete cloud account {}'.format(user, cloud_account.name))
+ cloud_pxy.delete_config(xpath)
+
+ # logger.debug('User {} trying to access cloud account {}'.format(user, cloud_account.name))
+ # assert cloud_pxy.get(xpath_no_pfx) is None
+ rift.auto.mano.close_session(user_session)
+
+ # admin user deleting the cloud account
+ logger.debug('admin user deleting cloud account {}'.format(cloud_account.name))
+ admin_cloud_proxy.delete_config(xpath)
+ assert admin_cloud_proxy.get(xpath_no_pfx) is None
+
+ # Check users in fail_users dict not able to create cloud accounts
+ logger.debug('Verifying users which are not authorised to create cloud accounts')
+ for user in fail_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, fail_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, fail_users[user][1])
+ cloud_pxy = user_session.proxy(cloud_module)
+
+ with pytest.raises(Exception, message='User {} not authorised to create cloud account {}'.format(
+ user, cloud_account.name)) as excinfo:
+ logger.debug('User {} trying to create a cloud account {}'.format(user, cloud_account.name))
+ cloud_pxy.replace_config(xpath, cloud_account)
+
+ rift.auto.mano.close_session(user_session)
+
+ @staticmethod
+ def delete_descriptors(project, vnfd_proxy, nsd_proxy, vnfd_xpath, nsd_xpath, fmt_vnfd_id_xpath, fmt_nsd_id_xpath):
+ nsds = nsd_proxy.get('{}/nsd'.format(nsd_xpath), list_obj=True)
+ for nsd in nsds.nsd:
+ xpath = fmt_nsd_id_xpath.format(project=quoted_key(project), nsd_id=quoted_key(nsd.id))
+ nsd_proxy.delete_config(xpath)
+ nsds = nsd_proxy.get('{}/nsd'.format(nsd_xpath), list_obj=True)
+ assert nsds is None or len(nsds.nsd) == 0
+
+ vnfds = vnfd_proxy.get('{}/vnfd'.format(vnfd_xpath), list_obj=True)
+ for vnfd_record in vnfds.vnfd:
+ xpath = fmt_vnfd_id_xpath.format(project=quoted_key(project), vnfd_id=quoted_key(vnfd_record.id))
+ vnfd_proxy.delete_config(xpath)
+
+ vnfds = vnfd_proxy.get('{}/vnfd'.format(vnfd_xpath), list_obj=True)
+ assert vnfds is None or len(vnfds.vnfd) == 0
+
+ @pytest.mark.skipif(not pytest.config.getoption("--onboarding-test"), reason="need --onboarding-test option to run")
+ def test_onboarding_authorization(self, users_test_data, logger, descriptors, session_class, confd_host,
+ fmt_vnfd_catalog_xpath, fmt_nsd_catalog_xpath, fmt_nsd_id_xpath, fmt_vnfd_id_xpath, project_acessible, mgmt_session):
+ """Verifies only users with certain roles can onboard/update/delete a package"""
+
+ descriptor_vnfds, descriptor_nsd = descriptors[:-1], descriptors[-1]
+ write_users, read_users, fail_users = users_test_data
+ logger.debug('The descriptrs being used: {}'.format(descriptors))
+ nsd_xpath = fmt_nsd_catalog_xpath.format(project=quoted_key(project_acessible))
+ vnfd_xpath = fmt_vnfd_catalog_xpath.format(project=quoted_key(project_acessible))
+
+ def onboard(user_session, project):
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(user_session, descriptor, project=project)
+
+ def verify_descriptors(vnfd_pxy, nsd_pxy, vnfd_count, nsd_count):
+ catalog = vnfd_pxy.get_config(vnfd_xpath)
+ actual_vnfds = catalog.vnfd
+ assert len(actual_vnfds) == vnfd_count, 'There should be {} vnfds'.format(vnfd_count)
+ catalog = nsd_pxy.get_config(nsd_xpath)
+ actual_nsds = catalog.nsd
+ assert len(actual_nsds) == nsd_count, 'There should be {} nsd'.format(nsd_count)
+
+ # Check users in write_users dict able to onboard/delete descriptors
+ logger.debug('Verifying users which are authorised to onboard/delete descriptors')
+ for user in write_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, write_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, write_users[user][1])
+ vnfd_pxy = user_session.proxy(RwProjectVnfdYang)
+ nsd_pxy = user_session.proxy(RwProjectNsdYang)
+ logger.debug('Trying to onboard ping-pong descriptors')
+ onboard(user_session, project_acessible)
+ logger.debug('Verifying if the descriptors are uploaded')
+ verify_descriptors(vnfd_pxy, nsd_pxy, len(descriptor_vnfds), 1)
+
+ logger.debug('Trying to delete descriptors')
+ TestRbacVerification.delete_descriptors(project_acessible, vnfd_pxy, nsd_pxy, vnfd_xpath, nsd_xpath,
+ fmt_vnfd_id_xpath, fmt_nsd_id_xpath)
+
+ rift.auto.mano.close_session(user_session)
+
+ # onboard the descriptors using mgmt_session which read_users will try to read
+ logger.debug('admin user uploading the descriptors which read_users will try to read')
+ onboard(mgmt_session, project_acessible)
+ admin_vnfd_pxy = mgmt_session.proxy(RwProjectVnfdYang)
+ admin_nsd_pxy = mgmt_session.proxy(RwProjectNsdYang)
+ logger.debug('Verifying if the descriptors are uploaded')
+ verify_descriptors(admin_vnfd_pxy, admin_nsd_pxy, len(descriptor_vnfds), 1)
+
+ # Check users in read_users dict able to read already onboarded descriptors
+ logger.debug('Verifying users which are authorised to read descriptors')
+ for user in read_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, read_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, read_users[user][1])
+ vnfd_pxy = user_session.proxy(RwProjectVnfdYang)
+ nsd_pxy = user_session.proxy(RwProjectNsdYang)
+
+ logger.debug('Trying to read ping-pong descriptors')
+ verify_descriptors(vnfd_pxy, nsd_pxy, len(descriptor_vnfds), 1)
+
+ rift.auto.mano.close_session(user_session)
+
+ # Check users in fail_users dict not able to onboard/delete descriptors
+ logger.debug('Verifying users which are not supposed to delete descriptors')
+ for user in fail_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, fail_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, fail_users[user][1])
+ vnfd_pxy = user_session.proxy(RwProjectVnfdYang)
+ nsd_pxy = user_session.proxy(RwProjectNsdYang)
+
+ with pytest.raises(Exception, message='User {} not authorised to delete descriptors'.format(user)) as excinfo:
+ logger.debug('User {} trying to delete descriptors'.format(user))
+ TestRbacVerification.delete_descriptors(project_acessible, vnfd_pxy, nsd_pxy, vnfd_xpath, nsd_xpath,
+ fmt_vnfd_id_xpath, fmt_nsd_id_xpath)
+
+ rift.auto.mano.close_session(user_session)
+
+ logger.debug('Deleting the descriptors as fail_users trying to upload the descriptors')
+ TestRbacVerification.delete_descriptors(project_acessible, admin_vnfd_pxy, admin_nsd_pxy, vnfd_xpath, nsd_xpath,
+ fmt_vnfd_id_xpath, fmt_nsd_id_xpath)
+
+ logger.debug('Verifying users which are not supposed to create descriptors')
+ for user in fail_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, fail_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, fail_users[user][1])
+ vnfd_pxy = user_session.proxy(RwProjectVnfdYang)
+ nsd_pxy = user_session.proxy(RwProjectNsdYang)
+
+ with pytest.raises(Exception, message='User {} not authorised to onboard descriptors'.format(user)) as excinfo:
+ logger.debug('User {} trying to onboard ping-pong descriptors'.format(user))
+ onboard(user_session)
+
+ rift.auto.mano.close_session(user_session)
+
+ @pytest.mark.skipif(not pytest.config.getoption("--nsr-test"),
+ reason="need --nsr-test option to run")
+ def test_nsr_authorization(self, users_test_data, logger, cloud_account,
+ cloud_module, descriptors, session_class,
+ confd_host, fmt_cloud_xpath,
+ fmt_prefixed_cloud_xpath, mgmt_session, fmt_nsd_id_xpath, fmt_vnfd_id_xpath,
+ project_acessible, fmt_nsd_catalog_xpath, fmt_vnfd_catalog_xpath):
+ """Verifies only users with certain roles can
+ create/read/delete nsr/vlr/vnfr
+ """
+
+ descriptor_vnfds, descriptor_nsd = descriptors[:-1], descriptors[-1]
+ write_users, read_users, fail_users = users_test_data
+
+ # Cloud account creation
+ logger.debug('Creating a cloud account which will be used for NS instantiation')
+ cloud_pxy = mgmt_session.proxy(cloud_module)
+ cloud_pxy.replace_config(fmt_prefixed_cloud_xpath.format(project=quoted_key(project_acessible),
+ account_name=quoted_key(cloud_account.name)),
+ cloud_account)
+ response = cloud_pxy.get(
+ fmt_cloud_xpath.format(project=quoted_key(project_acessible), account_name=quoted_key(cloud_account.name)))
+ assert response.name == cloud_account.name
+
+ cloud_pxy.wait_for(fmt_cloud_xpath.format(project=quoted_key(project_acessible), account_name=quoted_key(
+ cloud_account.name)) + '/connection-status/status', 'success', timeout=30, fail_on=['failure'])
+
+ # Upload the descriptors
+ nsd_xpath = fmt_nsd_catalog_xpath.format(project=quoted_key(project_acessible))
+ vnfd_xpath = fmt_vnfd_catalog_xpath.format(project=quoted_key(project_acessible))
+ logger.debug('Uploading descriptors {} which will be used for NS instantiation'.format(descriptors))
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(mgmt_session, descriptor, project=project_acessible)
+ admin_nsd_pxy = mgmt_session.proxy(RwProjectNsdYang)
+ nsd_catalog = admin_nsd_pxy.get_config(nsd_xpath)
+ assert nsd_catalog
+ nsd = nsd_catalog.nsd[0]
+ nsr = rift.auto.descriptor.create_nsr(cloud_account.name, nsd.name, nsd)
+
+ # Check users in write_users dict able to instantiate/delete a NS
+ logger.debug('Verifying users which are authorised to instantiate/delete a NS')
+ for user in write_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, write_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, write_users[user][1])
+ rwnsr_pxy = user_session.proxy(RwNsrYang)
+ rwvnfr_pxy = user_session.proxy(RwVnfrYang)
+ rwvlr_pxy = user_session.proxy(RwVlrYang)
+
+ logger.info("Trying to instantiate the Network Service")
+ rift.auto.descriptor.instantiate_nsr(nsr, rwnsr_pxy, logger,
+ project=project_acessible)
+
+ logger.info("Trying to terminate the Network Service")
+ rift.auto.descriptor.terminate_nsr(rwvnfr_pxy, rwnsr_pxy,
+ rwvlr_pxy, logger,
+ project_acessible)
+
+ # Instantiate a NS which the read_users, fail_users will try to
+ # read/delete.
+ admin_rwnsr_pxy = mgmt_session.proxy(RwNsrYang)
+ admin_rwvnfr_pxy = mgmt_session.proxy(RwVnfrYang)
+ admin_rwvlr_pxy = mgmt_session.proxy(RwVlrYang)
+ logger.debug('admin user instantiating NS which the read_users, fail_users will try to read/delete.')
+ rift.auto.descriptor.instantiate_nsr(nsr, admin_rwnsr_pxy, logger, project=project_acessible)
+
+ # Check users in read_users, write_users dict able to read vnfr-console, vnfr-catalog, ns-instance-opdata
+ p_xpath = '/project[name={}]'.format(quoted_key(project_acessible))
+ read_xpaths = ['/ns-instance-opdata', '/vnfr-catalog', '/vnfr-console']
+ logger.debug('Verifying users which are authorised to read vnfr-catalog, ns-instance-opdata, vnfr-console etc')
+ for user, role_passwd_tuple in dict(write_users, **read_users).items():
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, role_passwd_tuple))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, role_passwd_tuple[1])
+ rwnsr_pxy = user_session.proxy(RwNsrYang)
+ rwvnfr_pxy = user_session.proxy(RwVnfrYang)
+ for xpath in read_xpaths:
+ logger.debug('Trying to read xpath: {}'.format(p_xpath+xpath))
+ proxy_ = rwvnfr_pxy if 'vnfr' in xpath else rwnsr_pxy
+ assert proxy_.get(p_xpath+xpath)
+
+ rift.auto.mano.close_session(user_session)
+
+ # Check users in fail_users dict not able to terminate a NS
+ logger.debug('Verifying users which are NOT authorised to terminate a NS')
+ for user in fail_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, fail_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, fail_users[user][1])
+ rwnsr_pxy = user_session.proxy(RwNsrYang)
+ rwvnfr_pxy = user_session.proxy(RwVnfrYang)
+
+ with pytest.raises(Exception, message='User {} not authorised to terminate NS'.format(user)) as excinfo:
+ logger.debug('User {} trying to delete NS'.format(user))
+ rift.auto.descriptor.terminate_nsr(rwvnfr_pxy, rwnsr_pxy,
+ logger, admin_rwvlr_pxy,
+ project=project_acessible)
+ rift.auto.mano.close_session(user_session)
+
+ # Terminate the NS instantiated by admin user
+ logger.debug('admin user terminating the NS')
+ rift.auto.descriptor.terminate_nsr(admin_rwvnfr_pxy,
+ admin_rwnsr_pxy,
+ admin_rwvlr_pxy, logger,
+ project=project_acessible)
+
+ # Check users in fail_users dict not able to instantiate a NS
+ nsr.id = str(uuid.uuid4())
+ logger.debug('Verifying users which are NOT authorised to instantiate a NS')
+ for user in fail_users:
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, fail_users[user]))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, fail_users[user][1])
+ rwnsr_pxy = user_session.proxy(RwNsrYang)
+ rwvnfr_pxy = user_session.proxy(RwVnfrYang)
+
+ with pytest.raises(Exception, message='User {} not authorised to instantiate NS'.format(user)) as excinfo:
+ logger.debug('User {} trying to instantiate NS'.format(user))
+ rift.auto.descriptor.instantiate_nsr(nsr, rwnsr_pxy, logger, project=project_acessible)
+ rift.auto.mano.close_session(user_session)
+
+ # delete cloud accounts and descriptors; else deleting project in teardown fails
+ cloud_pxy.delete_config(fmt_prefixed_cloud_xpath.format(project=quoted_key(project_acessible),
+ account_name=quoted_key(cloud_account.name)))
+ admin_vnfd_pxy = mgmt_session.proxy(RwProjectVnfdYang)
+ TestRbacVerification.delete_descriptors(project_acessible, admin_vnfd_pxy, admin_nsd_pxy, vnfd_xpath, nsd_xpath,
+ fmt_vnfd_id_xpath, fmt_nsd_id_xpath)
+
+ @pytest.mark.skipif(not pytest.config.getoption("--syslog-server-test"), reason="need --syslog-server-test option to run")
+ def test_set_syslog_server_authorization(self, mgmt_session, users_test_data, session_class, confd_host, logger):
+ """Verifies only users with certain roles can set syslog server"""
+ write_users, read_users, fail_users = users_test_data
+ admin_log_mgmt_pxy = mgmt_session.proxy(RwlogMgmtYang)
+
+ def update_syslog_server_address(user_log_mgmt_pxy):
+ ip = '127.0.0.{}'.format(random.randint(0,255))
+ sink_obj = RwlogMgmtYang.Logging_Sink.from_dict({'server_address': ip})
+
+ syslog_name = admin_log_mgmt_pxy.get_config('/logging').sink[0].name
+ logger.debug('updating the syslog {} server_address to {}'.format(syslog_name, ip))
+ user_log_mgmt_pxy.merge_config('/logging/sink[name={sink_name}]'.format(sink_name=quoted_key(syslog_name)), sink_obj)
+ assert [sink.server_address for sink in admin_log_mgmt_pxy.get_config('/logging').sink if sink.name == syslog_name][0] == ip
+
+ for user, role_passwd_tuple in dict(write_users, **dict(read_users, **fail_users)).items():
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, role_passwd_tuple))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, role_passwd_tuple[1])
+ user_log_mgmt_pxy = user_session.proxy(RwlogMgmtYang)
+
+ if user in write_users:
+ logger.debug('User {} should be able to update the syslog server address'.format(user))
+ update_syslog_server_address(user_log_mgmt_pxy)
+
+ if user in fail_users:
+ with pytest.raises(Exception, message='User {} not authorised to set syslog server address'.format(user)) as excinfo:
+ logger.debug('User {} trying to update the syslog server address. It should fail'.format(user))
+ update_syslog_server_address(user_log_mgmt_pxy)
+
+ if user in read_users:
+ logger.debug('User {} trying to read the syslog server address'.format(user))
+ logging_obj = user_log_mgmt_pxy.get_config('/logging')
+ assert logging_obj.sink[0]
+ assert logging_obj.sink[0].server_address
+
+ @pytest.mark.skipif(not pytest.config.getoption("--redundancy-role-test"), reason="need --redundancy-role-test option to run")
+ def test_redundancy_config_authorization(self, mgmt_session, users_test_data, session_class, confd_host, logger, redundancy_config_test_roles):
+ """Verifies only users with certain roles can set redundancy-config or read redundancy-state"""
+ write_users, read_users, fail_users = users_test_data
+ admin_redundancy_pxy = mgmt_session.proxy(RwRedundancyYang)
+ site_nm_pfx = 'ha_site_'
+
+ def create_redundancy_site(user_redundancy_pxy, site_nm):
+ site_id = '127.0.0.1'
+ site_obj = RwRedundancyYang.YangData_RwRedundancy_RedundancyConfig_Site.from_dict({'site_name': site_nm, 'site_id': site_id})
+
+ logger.debug('Creating redundancy site {}'.format(site_nm))
+ user_redundancy_pxy.create_config('/rw-redundancy:redundancy-config/rw-redundancy:site', site_obj)
+ assert [site.site_name for site in admin_redundancy_pxy.get_config('/redundancy-config/site', list_obj=True).site if site.site_name == site_nm]
+
+ def delete_redundancy_site(user_redundancy_pxy, site_nm):
+ logger.debug('Deleting redundancy site {}'.format(site_nm))
+ user_redundancy_pxy.delete_config('/rw-redundancy:redundancy-config/rw-redundancy:site[rw-redundancy:site-name={}]'.format(quoted_key(site_nm)))
+ assert not [site.site_name for site in admin_redundancy_pxy.get_config('/redundancy-config/site', list_obj=True).site if site.site_name == site_nm]
+
+ # Create a redundancy site which fail user will try to delete/ read user will try to read
+ create_redundancy_site(admin_redundancy_pxy, 'test_site')
+
+ for user, role_passwd_tuple in dict(write_users, **dict(read_users, **fail_users)).items():
+ logger.debug('Verifying user:(role,password) {}:{}'.format(user, role_passwd_tuple))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, role_passwd_tuple[1])
+ user_redundancy_pxy = user_session.proxy(RwRedundancyYang)
+
+ if user in write_users:
+ site_nm = '{}_{}'.format(site_nm_pfx, user)
+ logger.debug('User {} should be able to create a new redundancy site {}'.format(user, site_nm))
+ create_redundancy_site(user_redundancy_pxy, site_nm)
+
+ logger.debug('User {} should be able to delete a redundancy site {}'.format(user, site_nm))
+ delete_redundancy_site(user_redundancy_pxy, site_nm)
+
+ assert user_redundancy_pxy.get('/redundancy-state')
+
+ if user in fail_users:
+ site_nm = '{}_{}'.format(site_nm_pfx, user)
+ with pytest.raises(Exception, message='User {} not authorised to create redundancy site'.format(user)) as excinfo:
+ logger.debug('User {} trying to create redundancy site {}. It should fail'.format(user, site_nm))
+ create_redundancy_site(user_redundancy_pxy, site_nm)
+
+ with pytest.raises(Exception, message='User {} not authorised to delete redundancy site'.format(user)) as excinfo:
+ logger.debug('User {} trying to delete redundancy site {}. It should fail'.format(user, site_nm))
+ delete_redundancy_site(user_redundancy_pxy, 'test_site')
+
+ if user in read_users:
+ logger.debug('User {} trying to read redundancy-config'.format(user))
+ assert user_redundancy_pxy.get('/redundancy-state')
+ assert user_redundancy_pxy.get('/redundancy-config')
+
+
+@pytest.mark.depends('test_rbac_roles_setup')
+@pytest.mark.teardown('test_rbac_roles_setup')
+@pytest.mark.incremental
+class TestRbacTeardown(object):
+ def test_delete_project(self, rw_project_proxy, logger, project_keyed_xpath, project_acessible):
+ """Deletes projects used for the test"""
+ if rw_project_proxy.get_config(project_keyed_xpath.format(project_name=quoted_key(project_acessible))+'/project-state', list_obj=True):
+ logger.debug('Deleting project {}'.format(project_acessible))
+ rift.auto.mano.delete_project(rw_project_proxy, project_acessible)
+
+ def test_delete_users(self, users_test_data, logger, rw_user_proxy, rbac_platform_proxy, platform_config_keyed_xpath,
+ user_keyed_xpath, user_domain, rw_conman_proxy, project_acessible):
+ """Deletes the users which are part of rbac test-data and verify their deletion"""
+ write_users, read_users, fail_users = users_test_data
+
+ for user, role_passwd_tuple in dict(write_users, **dict(read_users, **fail_users)).items():
+ logger.debug('Deleting user:(role,password) {}:{}'.format(user, role_passwd_tuple))
+ if any('platform' in role for role in role_passwd_tuple[0]):
+ rbac_platform_proxy.delete_config(platform_config_keyed_xpath.format(user=quoted_key(user), domain=quoted_key(user_domain)))
+ rw_user_proxy.delete_config(user_keyed_xpath.format(user=quoted_key(user), domain=quoted_key(user_domain)))
+
+ # Verify if the user is deleted
+ user_config = rw_user_proxy.get_config('/user-config')
+ current_users_list = [user.user_name for user in user_config.user]
+
+ assert user not in current_users_list
+
+ # Verify only two users should be present now: oper & admin
+ user_config = rw_user_proxy.get_config('/user-config')
+ current_users_list = [user.user_name for user in user_config.user]
+
+ logger.debug('Current users list after deleting all test users: {}'.format(current_users_list))
+ expected_empty_user_list = [user for user in users_test_data if user in current_users_list]
+ assert not expected_empty_user_list
diff --git a/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_usages.py b/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_usages.py
new file mode 100644
index 0000000..cff1c9c
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/rbac/test_rbac_usages.py
@@ -0,0 +1,549 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+
+import gi
+import pytest
+import time
+import random
+import rift.auto.mano
+import rift.auto.descriptor
+
+gi.require_version('RwConmanYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
+gi.require_version('RwProjectNsdYang', '1.0')
+gi.require_version('RwNsrYang', '1.0')
+gi.require_version('RwVnfrYang', '1.0')
+gi.require_version('RwRbacInternalYang', '1.0')
+gi.require_version('RwRbacPlatformYang', '1.0')
+gi.require_version('RwProjectYang', '1.0')
+gi.require_version('RwUserYang', '1.0')
+gi.require_version('RwOpenidcProviderYang', '1.0')
+from gi.repository import (
+ RwConmanYang,
+ RwProjectVnfdYang,
+ RwProjectNsdYang,
+ RwNsrYang,
+ RwVnfrYang,
+ RwVlrYang,
+ RwRbacInternalYang,
+ RwRbacPlatformYang,
+ RwProjectYang,
+ RwUserYang,
+ RwOpenidcProviderYang,
+)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+@pytest.fixture(scope='session')
+def complex_scaling_factor():
+ return 10
+
+@pytest.mark.incremental
+class TestRbacSetup(object):
+ def test_onboarded_vnfds_project_independent(self, descriptors, logger, rbac_platform_proxy, rw_conman_proxy, rw_user_proxy,
+ rw_project_proxy, rbac_user_passwd, user_domain, fmt_vnfd_catalog_xpath, session_class, confd_host, fmt_vnfd_id_xpath, rw_rbac_int_proxy):
+ """Same VNFDs on boarded in two different projects. VNFD changes in one project shouldn't affect another."""
+ map_project_user_roles = {
+ 'user1': ('project_test_onboarded_vnfds_project_independent_1', 'rw-project-mano:catalog-admin'),
+ 'user2': ('project_test_onboarded_vnfds_project_independent_2', 'rw-project:project-admin'),
+ }
+ user_to_modify_vnfds, user_not_supposed_to_see_vnfd_changes = 'user1', 'user2'
+
+ modified_vnfd_name = 'test_rbac_vnfd'
+ user_sessions = {}
+ logger.debug('descriptors being used: {}'.format(descriptors))
+
+ for user, project_role_tuple in map_project_user_roles.items():
+ project_name, role = project_role_tuple
+ logger.debug('Creating user {} with {}'.format(user, project_role_tuple))
+
+ rift.auto.mano.create_project(rw_conman_proxy, project_name)
+ rift.auto.mano.create_user(rw_user_proxy, user, rbac_user_passwd, user_domain)
+ if 'platform' in role:
+ rift.auto.mano.assign_platform_role_to_user(rbac_platform_proxy, role, user, user_domain, rw_rbac_int_proxy)
+ else:
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, role, user,
+ project_name, user_domain, rw_rbac_int_proxy)
+
+ logger.debug('User {} onboarding the packages'.format(user))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, user, rbac_user_passwd)
+ user_sessions[user] = user_session
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(user_session, descriptor, project=project_name)
+
+ vnfd_pxy = user_sessions[user_to_modify_vnfds].proxy(RwProjectVnfdYang)
+ vnfd_xpath = '{}/vnfd'.format(fmt_vnfd_catalog_xpath.format(project=quoted_key(map_project_user_roles[user_to_modify_vnfds][0])))
+ for vnfd in vnfd_pxy.get(vnfd_xpath, list_obj=True).vnfd:
+ logger.debug('Changing the vnfd name from {} to {} for user {}'.format(vnfd.name, modified_vnfd_name, user_to_modify_vnfds))
+ vnfd.name = modified_vnfd_name
+ vnfd_pxy.replace_config(fmt_vnfd_id_xpath.format(
+ project=quoted_key(map_project_user_roles[user_to_modify_vnfds][0]), vnfd_id=quoted_key(vnfd.id)), vnfd)
+
+ for vnfd in vnfd_pxy.get(vnfd_xpath, list_obj=True).vnfd:
+ assert vnfd.name == modified_vnfd_name
+
+ vnfd_pxy = user_sessions[user_not_supposed_to_see_vnfd_changes].proxy(RwProjectVnfdYang)
+ vnfd_xpath = '{}/vnfd'.format(fmt_vnfd_catalog_xpath.format(project=quoted_key(map_project_user_roles[user_not_supposed_to_see_vnfd_changes][0])))
+ for vnfd in vnfd_pxy.get(vnfd_xpath, list_obj=True).vnfd:
+ logger.debug('Verifying the vnfd name {} for user {} did not change to {}'.format(
+ vnfd.name, user_not_supposed_to_see_vnfd_changes, modified_vnfd_name))
+ assert vnfd.name != modified_vnfd_name
+
+ def test_multi_projects_multi_vnf(
+ self, rw_project_proxy, rw_conman_proxy, cloud_account,
+ cloud_module, descriptors, session_class,
+ confd_host, user_domain, mgmt_session, fmt_nsd_catalog_xpath,
+ logger, rw_rbac_int_proxy):
+ """Creates multiple projects, cloud accounts and then
+ instantiates them. Then it lets the instantiated NS's run for a minute
+ after which gets terminated. Use the SCALE_FACTOR to adjust the number
+ of instantiations."""
+
+ def instantiate_nsr_not_wait(nsr, rwnsr_proxy, project='default'):
+ ns_instance_opdata_xpath = '/project[name={}]/ns-instance-opdata'.format(quoted_key(project))
+ rwnsr_proxy.create_config('/rw-project:project[rw-project:name={}]/nsr:ns-instance-config/nsr:nsr'.format(quoted_key(project)), nsr)
+ nsr_opdata = rwnsr_proxy.get('{}/nsr[ns-instance-config-ref={}]'.format(ns_instance_opdata_xpath, quoted_key(nsr.id)))
+ assert nsr_opdata is not None
+
+ nsr_opdata = rwnsr_proxy.get(ns_instance_opdata_xpath)
+ nsr_ = [nsr_ for nsr_ in nsr_opdata.nsr if nsr_.ns_instance_config_ref==nsr.id][0]
+
+ #Creating multiple projects according to the scale factor
+ SCALE_FACTOR = 5
+ PROJECT_LIST = {}
+ for idx in range(1,SCALE_FACTOR+1):
+ rift.auto.mano.create_project(rw_conman_proxy, 'cloud_project_{}'.format(idx))
+ PROJECT_LIST['cloud_project_{}'.format(idx)] = None
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, 'rw-project:project-admin', 'admin', 'cloud_project_{}'
+ .format(idx), 'system', rw_rbac_int_proxy)
+ #Creating cloud accounts, uploading descriptors, instantiating NS
+ for project_name in PROJECT_LIST:
+ rift.auto.mano.create_cloud_account(mgmt_session, cloud_account, project_name)
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(mgmt_session, descriptor, project=project_name)
+ admin_nsd_pxy = mgmt_session.proxy(RwProjectNsdYang)
+ nsd_catalog = admin_nsd_pxy.get_config(fmt_nsd_catalog_xpath.format(project=quoted_key(project_name)))
+ assert nsd_catalog
+ nsd = nsd_catalog.nsd[0]
+ nsr = rift.auto.descriptor.create_nsr(cloud_account.name, nsd.name, nsd)
+ PROJECT_LIST[project_name] = nsr
+
+ for project_name, NSR in PROJECT_LIST.items():
+ admin_rwnsr_pxy = mgmt_session.proxy(RwNsrYang)
+ admin_rwvnfr_pxy = mgmt_session.proxy(RwVnfrYang)
+ admin_rwvlr_pxy = mgmt_session.proxy(RwVlrYang)
+ instantiate_nsr_not_wait(NSR, admin_rwnsr_pxy,
+ project=project_name)
+
+ # Waiting for NS's to get started and configured.
+ for project_name in PROJECT_LIST:
+ admin_rwnsr_pxy = mgmt_session.proxy(RwNsrYang)
+ nsr_opdata = admin_rwnsr_pxy.get('/rw-project:project[rw-project:name={}]/ns-instance-opdata'.format(quoted_key(project_name)))
+ nsrs = nsr_opdata.nsr
+
+ for nsr in nsrs:
+ xpath = "/rw-project:project[rw-project:name={}]/ns-instance-opdata/nsr[ns-instance-config-ref={}]/operational-status".format(
+ quoted_key(project_name), quoted_key(nsr.ns_instance_config_ref))
+ admin_rwnsr_pxy.wait_for(xpath, "running", fail_on=['failed'], timeout=400)
+
+ for nsr in nsrs:
+ xpath = "/rw-project:project[rw-project:name={}]/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status".format(
+ quoted_key(project_name), quoted_key(nsr.ns_instance_config_ref))
+ admin_rwnsr_pxy.wait_for(xpath, "configured", fail_on=['failed'], timeout=400)
+
+ # Letting the started NS's run for a minute after which is terminated
+ start_time = time.time()
+ while (time.time() - start_time) < 60:
+ time.sleep(2)
+ for project_name in PROJECT_LIST:
+ rift.auto.descriptor.terminate_nsr(
+ admin_rwvnfr_pxy, admin_rwnsr_pxy, admin_rwvlr_pxy, logger,
+ project=project_name)
+
+ def test_descriptor_nsr_persistence_check(
+ self, rw_conman_proxy, rw_user_proxy, rw_project_proxy,
+ cloud_account, cloud_module, mgmt_session, descriptors, logger,
+ user_domain, session_class, confd_host, rbac_user_passwd,
+ fmt_nsd_catalog_xpath, rw_rbac_int_proxy):
+ """Creates a project and cloud account for it. Uploads descriptors.
+ Logs in as project-admin and checks if the uploaded descriptors
+ are still there, after which he logs out.
+ Then instantiates nsr. Again logs in as project admin and checks
+ if the instantiated nsr is still there."""
+ # Creating a project, assigning project admin and creating
+ # a cloud account for the project
+ for idx in range(1,6):
+ rift.auto.mano.create_project(rw_conman_proxy, 'xcloud_project_{}'.format(idx))
+ rift.auto.mano.create_user(rw_user_proxy, 'project_admin_{}'.format(idx), rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, 'rw-project:project-admin', 'project_admin_{}'
+ .format(idx), 'xcloud_project_{}'.format(idx), user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.create_cloud_account(mgmt_session, cloud_account, 'xcloud_project_{}'.format(idx))
+ #Uploading descriptors and verifying its existence from another user(project admin)
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(mgmt_session, descriptor, project='xcloud_project_{}'.format(idx))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, 'project_admin_{}'.format(idx), rbac_user_passwd)
+ project_admin_nsd_pxy = user_session.proxy(RwProjectNsdYang)
+ nsd_catalog = project_admin_nsd_pxy.get_config(fmt_nsd_catalog_xpath.format(project=quoted_key('xcloud_project_{}'.format(idx))))
+ assert nsd_catalog, "Descriptor Not found on try no: {}".format(idx)
+ nsd = nsd_catalog.nsd[0]
+ nsr = rift.auto.descriptor.create_nsr(cloud_account.name, nsd.name, nsd)
+ rift.auto.mano.close_session(user_session)
+ #Instantiating the nsr and verifying its existence from another user(project admin), after which it gets terminated
+ admin_rwnsr_pxy = mgmt_session.proxy(RwNsrYang)
+ admin_rwvnfr_pxy = mgmt_session.proxy(RwVnfrYang)
+ admin_rwvlr_pxy = mgmt_session.proxy(RwVlrYang)
+
+ rift.auto.descriptor.instantiate_nsr(nsr, admin_rwnsr_pxy, logger, project='xcloud_project_{}'.format(idx))
+ user_session = rift.auto.mano.get_session(session_class, confd_host, 'project_admin_{}'.format(idx), rbac_user_passwd)
+ pxy = user_session.proxy(RwNsrYang)
+ nsr_opdata = pxy.get('/rw-project:project[rw-project:name={}]/ns-instance-opdata'.format(quoted_key('xcloud_project_{}'.format(idx))))
+ nsrs = nsr_opdata.nsr
+ for nsr in nsrs:
+ xpath = "/rw-project:project[rw-project:name={}]/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status".format(
+ quoted_key('xcloud_project_{}'.format(idx)), quoted_key(nsr.ns_instance_config_ref))
+ pxy.wait_for(xpath, "configured", fail_on=['failed'], timeout=60)
+ rift.auto.mano.close_session(user_session)
+ rift.auto.descriptor.terminate_nsr(
+ admin_rwvnfr_pxy, admin_rwnsr_pxy, admin_rwvlr_pxy, logger,
+ project='xcloud_project_{}'.format(idx))
+
+ def delete_records(self, nsd_proxy, vnfd_proxy, project_name='default'):
+ """Delete the NSD & VNFD records."""
+ nsds = nsd_proxy.get(
+ "/rw-project:project[rw-project:name={}]/nsd-catalog/nsd".format(
+ quoted_key(project_name)),
+ list_obj=True)
+ for nsd in nsds.nsd:
+ xpath = (
+ "/rw-project:project[rw-project:name={}]".format(
+ quoted_key(project_name)) +
+ "/nsd-catalog/nsd[id={}]".format(quoted_key(nsd.id))
+ )
+ nsd_proxy.delete_config(xpath)
+
+ nsds = nsd_proxy.get(
+ "/rw-project:project[rw-project:name={}]/nsd-catalog/nsd".format(
+ quoted_key(project_name)),
+ list_obj=True)
+ assert nsds is None or len(nsds.nsd) == 0
+
+ vnfds = vnfd_proxy.get(
+ "/rw-project:project[rw-project:name={}]/vnfd-catalog/vnfd".format(
+ quoted_key(project_name)),
+ list_obj=True)
+ for vnfd_record in vnfds.vnfd:
+ xpath = (
+ "/rw-project:project[rw-project:name={}]/".format(
+ quoted_key(project_name)) +
+ "vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_record.id))
+ )
+ vnfd_proxy.delete_config(xpath)
+
+ vnfds = vnfd_proxy.get(
+ "/rw-project:project[rw-project:name={}]/vnfd-catalog/vnfd".format(
+ quoted_key(project_name)),
+ list_obj=True)
+ assert vnfds is None or len(vnfds.vnfd) == 0
+
+ def test_delete_project_and_vim_accounts(
+ self, rw_conman_proxy, rw_user_proxy, logger,
+ rbac_user_passwd, user_domain, rw_project_proxy, rw_rbac_int_proxy,
+ mgmt_session, cloud_module, cloud_account, descriptors,
+ fmt_nsd_catalog_xpath, session_class, confd_host):
+ """Testing vim accounts."""
+ # Create a project and three cloud accounts for it.
+ rift.auto.mano.create_project(rw_conman_proxy, 'vim_project')
+ rift.auto.mano.assign_project_role_to_user(
+ rw_project_proxy, 'rw-project:project-admin', 'admin',
+ 'vim_project', 'system', rw_rbac_int_proxy)
+ for idx in range(1, 4):
+ rift.auto.mano.create_cloud_account(
+ mgmt_session, cloud_account,
+ 'vim_project', 'cloud_account_{}'.format(idx))
+ # Uploading descriptors
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(
+ mgmt_session, descriptor, project='vim_project')
+ nsd_pxy = mgmt_session.proxy(RwProjectNsdYang)
+ nsd_catalog = nsd_pxy.get_config(fmt_nsd_catalog_xpath.format(
+ project=quoted_key('vim_project')))
+ assert nsd_catalog
+ nsd = nsd_catalog.nsd[0]
+ nsr = rift.auto.descriptor.create_nsr(
+ 'cloud_account_1', nsd.name, nsd)
+ # Instantiating the nsr
+ rwnsr_pxy = mgmt_session.proxy(RwNsrYang)
+ rift.auto.descriptor.instantiate_nsr(
+ nsr, rwnsr_pxy, logger, project='vim_project')
+ # Trying to delete the project before taking the instance down
+ with pytest.raises(
+ Exception,
+ message="Project deletion should've failed"):
+ rift.auto.mano.delete_project(rw_conman_proxy, 'vim_project')
+ # Trying to delete the vim account before taking the instance down
+ with pytest.raises(
+ Exception,
+ message="Vim account deletion should've failed"):
+ rift.auto.mano.delete_cloud_account(
+ mgmt_session, 'cloud_account_1', 'vim_project')
+ # Terminating the nsr
+ rwvnfr_pxy = mgmt_session.proxy(RwVnfrYang)
+ rwvlr_pxy = mgmt_session.proxy(RwVlrYang)
+ rift.auto.descriptor.terminate_nsr(
+ rwvnfr_pxy, rwnsr_pxy, rwvlr_pxy, logger, project='vim_project')
+ # Delete all cloud accounts for the project
+ for idx in range(1, 4):
+ rift.auto.mano.delete_cloud_account(
+ mgmt_session, 'cloud_account_{}'.format(idx), 'vim_project')
+ # Delete the uploaded descriptors
+ vnfd_proxy = mgmt_session.proxy(RwProjectVnfdYang)
+ self.delete_records(nsd_pxy, vnfd_proxy, 'vim_project')
+ # Delete the project
+ rift.auto.mano.delete_project(rw_conman_proxy, 'vim_project')
+ # Check in rw-rbac-internal if project is removed
+ rwinternal_xpath = '/rw-rbac-internal/role'
+ response = (
+ rw_rbac_int_proxy.get(
+ rwinternal_xpath, list_obj=True)
+ ).as_dict()['role']
+ keys = [role['keys'] for role in response if 'keys' in role]
+ for key in keys:
+ assert 'vim_project' not in key, "Improper project deletion"
+
+ @pytest.mark.skipif(
+ not pytest.config.getoption("--complex-scaling"),
+ reason="need --complex-scaling option to run")
+ def test_complex_scaling(
+ self, rw_conman_proxy, rw_user_proxy, rbac_user_passwd,
+ user_domain, rw_project_proxy, rw_rbac_int_proxy, logger,
+ rbac_platform_proxy, user_roles, platform_roles, mgmt_session,
+ cloud_module, cloud_account, rw_ro_account_proxy,
+ tbac, fmt_nsd_catalog_xpath, descriptors, complex_scaling_factor):
+ """Complex scaling - Default values.
+
+ No. of projects - 25 (Two users & two cloud accounts per project)
+ No. of users - 50 (Two roles per user)
+ No. of cloud accounts - 50
+ No. of RO accounts - 25 (50 if you are considering the default 'rift').
+ """
+ # This test can be controlled using complex_scaling_factor fixture
+ logger.debug('Creating projects')
+ for idx in range(1, complex_scaling_factor + 1):
+ rift.auto.mano.create_project(
+ rw_conman_proxy, 'scaling_project_{}'.format(idx)
+ )
+ logger.debug('Create users, cloud accounts double the no. of projects')
+ for idx in range(1, (2 * complex_scaling_factor) + 1):
+ project_index = int((idx + 1) / 2)
+ rift.auto.mano.create_user(
+ rw_user_proxy, 'scaling_user_{}'.format(idx),
+ rbac_user_passwd, user_domain)
+ # Each user has a project role & platform role
+ pr_role = random.choice(user_roles)
+ pl_role = random.choice(platform_roles)
+ rift.auto.mano.assign_project_role_to_user(
+ rw_project_proxy, pr_role, 'scaling_user_{}'.format(idx),
+ 'scaling_project_{}'.format(project_index), user_domain,
+ rw_rbac_int_proxy)
+ rift.auto.mano.assign_platform_role_to_user(
+ rbac_platform_proxy, pl_role,
+ 'scaling_user_{}'.format(idx), user_domain, rw_rbac_int_proxy)
+ # Creating two cloud accounts for each project
+ rift.auto.mano.create_cloud_account(
+ mgmt_session, cloud_account,
+ 'scaling_project_{}'.format(project_index),
+ 'cloud_account_{}'.format(idx)
+ )
+ logger.debug('Creating RO accounts')
+ for idx in range(1, complex_scaling_factor + 1):
+ rift.auto.mano.create_ro_account(
+ rw_ro_account_proxy, 'ro_account_{}'.format(idx),
+ 'scaling_project_{}'.format(idx)
+ )
+ # Uploading descriptors
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(
+ mgmt_session, descriptor,
+ project='scaling_project_{}'.format(idx)
+ )
+ nsd_pxy = mgmt_session.proxy(RwProjectNsdYang)
+ nsd_catalog = nsd_pxy.get_config(
+ fmt_nsd_catalog_xpath.format(
+ project=quoted_key('scaling_project_{}'.format(idx))
+ )
+ )
+ assert nsd_catalog
+
+ @pytest.mark.skipif(
+ not pytest.config.getoption("--complex-scaling"),
+ reason="need --complex-scaling option to run")
+ def test_complex_scaling_verification(
+ self, complex_scaling_factor, rw_project_proxy, rw_ro_account_proxy,
+ mgmt_session, fmt_nsd_catalog_xpath, cloud_module, logger):
+ """Reboot verification script for test_complex_scaling."""
+ for idx in range(1, complex_scaling_factor + 1):
+ # Verifying projects
+ logger.debug('Verification: projects, ro accounts started')
+ project_name = 'scaling_project_{}'.format(idx)
+ project_cm_config_xpath = '/project[name={project_name}]/project-state'
+ project_ = rw_project_proxy.get_config(
+ project_cm_config_xpath.format(
+ project_name=quoted_key(project_name)
+ ),
+ list_obj=True
+ )
+ assert project_
+ # Verifying RO Accounts
+ ro_account_name = 'ro_account_{}'.format(idx)
+ ro_obj = rw_ro_account_proxy.get_config(
+ '/project[name={}]/ro-account/account[name={}]'.format(
+ quoted_key(project_name), quoted_key(ro_account_name))
+ )
+ assert ro_obj.name == ro_account_name
+ assert ro_obj.ro_account_type == 'openmano'
+ logger.debug('Verification: descriptors, cloud accounts started')
+ # Verifying Descriptors
+ nsd_pxy = mgmt_session.proxy(RwProjectNsdYang)
+ nsd_catalog = nsd_pxy.get_config(
+ fmt_nsd_catalog_xpath.format(
+ project=quoted_key(project_name)
+ )
+ )
+ assert nsd_catalog
+ for idx in range(1, (2 * complex_scaling_factor) + 1):
+ # Verifying cloud accounts
+ project_index = int((idx + 1) / 2)
+ project_name = 'scaling_project_{}'.format(project_index)
+ cloud_acc_name = 'cloud_account_{}'.format(idx)
+ fmt_cloud_xpath = (
+ '/project[name={project}]/cloud/account[name={account_name}]'
+ )
+ cloud_pxy = mgmt_session.proxy(cloud_module)
+ response = cloud_pxy.get(fmt_cloud_xpath.format(
+ project=quoted_key(project_name),
+ account_name=quoted_key(cloud_acc_name))
+ )
+ assert response.name == cloud_acc_name
+
+
+ def test_change_visibility_same_session(self, session_class, rw_conman_proxy, confd_host, logger,
+ user_domain, project_keyed_xpath, rw_project_proxy, rw_rbac_int_proxy, rw_user_proxy):
+ """admin make changes which is seen by the operator already logged in for the same project.
+
+ oper is logged in. admin assigns oper to a new project X. oper should be able to see the new project X being \
+ in the same session without re-logging-in.
+ """
+ user = 'oper2' if user_domain != 'default' else 'oper'
+ oper_user, oper_passwd = [user]*2
+
+ if user_domain != 'default':
+ rift.auto.mano.create_user(rw_user_proxy, oper_user, oper_passwd, user_domain)
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, 'rw-project:project-oper', oper_user,
+ 'default', user_domain, rw_rbac_int_proxy)
+ oper_session = rift.auto.mano.get_session(session_class, confd_host, oper_user, oper_passwd)
+ oper_conman_pxy = oper_session.proxy(RwProjectYang)
+
+ default_project_cm_config_xpath = project_keyed_xpath.format(project_name=quoted_key('default'))+'/project-state'
+ assert oper_conman_pxy.get_config(default_project_cm_config_xpath, list_obj=True)
+
+ # admin assigns oper 'project-admin' role under a new project
+ new_project = 'project_test_change_visibility_same_session_1'
+ rift.auto.mano.create_project(rw_project_proxy, new_project)
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, 'rw-project:project-admin', oper_user, new_project,
+ user_domain, rw_rbac_int_proxy)
+
+ # Check oper user should be able to access the new project
+ new_project_cm_config_xpath = project_keyed_xpath.format(project_name=quoted_key(new_project))+'/project-state'
+ assert oper_conman_pxy.get_config(new_project_cm_config_xpath, list_obj=True)
+
+ def test_super_admin(
+ self, rw_user_proxy, rbac_platform_proxy, rw_project_proxy,
+ session_class, confd_host, rbac_user_passwd, user_domain,
+ rw_rbac_int_proxy):
+ """Variou tests on the super-admin role."""
+ # Creating two super admins and then deleting the first one.
+ rift.auto.mano.create_user(
+ rw_user_proxy, 'super_admin', rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_platform_role_to_user(
+ rbac_platform_proxy, 'rw-rbac-platform:super-admin',
+ 'super_admin', user_domain, rw_rbac_int_proxy)
+ rift.auto.mano.create_user(
+ rw_user_proxy, 'super_admin_2', rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_platform_role_to_user(
+ rbac_platform_proxy, 'rw-rbac-platform:super-admin',
+ 'super_admin_2', user_domain, rw_rbac_int_proxy)
+
+ user_session = rift.auto.mano.get_session(
+ session_class, confd_host, 'super_admin_2', rbac_user_passwd)
+ pxy = user_session.proxy(RwRbacPlatformYang)
+ role_keyed_path = (
+ "/rbac-platform-config/" +
+ "user[user-name={user}][user-domain={domain}]"
+ )
+ pxy.delete_config(role_keyed_path.format(
+ user=quoted_key('super_admin'), domain=quoted_key(user_domain))
+ )
+ pxy = user_session.proxy(RwUserYang)
+ rift.auto.mano.delete_user(pxy, 'super_admin', user_domain)
+ rift.auto.mano.close_session(user_session)
+
+ @pytest.mark.skipif(not pytest.config.getoption("--tbac"), reason="need --tbac option to run")
+ def test_token_expiry_timeout(self, mgmt_session, rw_user_proxy, rw_conman_proxy, rbac_user_passwd, user_domain,
+ confd_host, logger, rw_project_proxy, rw_rbac_int_proxy, session_class):
+ """Set 30 seconds as token-expiry-timeout; then verifies an user session is automatically expired after 30 secs"""
+ test_user, role = 'user-1', 'rw-project:project-oper'
+ test_proj = 'project_test_token_expiry_timeout'
+ token_expiry_timeout = 30
+
+ logger.debug('Creating user {} under project {} and assigning it {}'.format(test_user, test_proj, role))
+ rift.auto.mano.create_project(rw_conman_proxy, test_proj)
+ rift.auto.mano.create_user(rw_user_proxy, test_user, rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_project_role_to_user(rw_project_proxy, role, test_user, test_proj, user_domain, rw_rbac_int_proxy)
+
+ # admin user setting token_expiry_timeout
+ openidc_provider_xpath = '/rw-openidc-provider:openidc-provider-config'
+ openidc_provider = RwOpenidcProviderYang.YangData_RwOpenidcProvider_OpenidcProviderConfig.from_dict(
+ {'token_expiry_timeout': 30})
+ pxy = mgmt_session.proxy(RwOpenidcProviderYang)
+ logger.debug('Settig token_expiry_timeout to {} secs'.format(token_expiry_timeout))
+ pxy.replace_config(openidc_provider_xpath, openidc_provider)
+
+ # Verifying if token_expiry_timeout is set in openidc-provider-config
+ openidc_provider = pxy.get_config(openidc_provider_xpath)
+ assert openidc_provider
+ assert openidc_provider.token_expiry_timeout == token_expiry_timeout
+
+ def project_access(user_session):
+ user_conman_pxy = user_session.proxy(RwProjectYang)
+ assert user_conman_pxy.get_config('/project[name={}]/project-state'.format(quoted_key(test_proj)), list_obj=True)
+
+ # Log-in as test_user and validate operations under that user getting 'Unauthorized' after time-out
+ user_session = rift.auto.mano.get_session(session_class, confd_host, test_user, rbac_user_passwd)
+ project_access(user_session)
+
+ logger.debug('Sleeping for {} secs'.format(token_expiry_timeout))
+ time.sleep(token_expiry_timeout+5)
+
+ with pytest.raises(Exception, message='logged-in user able to access default project even after token expired'):
+ logger.debug('User {} trying to access default project. It should fail')
+ project_access(user_session)
+
+ # log-in as same user and perform the same operation. It should pass now.
+ user_session = rift.auto.mano.get_session(session_class, confd_host, test_user, rbac_user_passwd)
+ project_access(user_session)
diff --git a/rwlaunchpad/ra/pytest/ns/rbac/test_tbac_token.py b/rwlaunchpad/ra/pytest/ns/rbac/test_tbac_token.py
new file mode 100644
index 0000000..9db5ca1
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/rbac/test_tbac_token.py
@@ -0,0 +1,542 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+# RIFT_IO_STANDARD_COPYRIGHT_HEADER(BEGIN)
+# Author(s): Balaji Rajappa, Vishnu Narayanan K.A
+# Creation Date: 2017-07-07
+# RIFT_IO_STANDARD_COPYRIGHT_HEADER(END)
+
+import gi
+import json
+import urllib.parse
+
+import rift.auto.mano
+import pytest
+import tornado.httpclient
+import time
+import Cryptodome.PublicKey.RSA as RSA
+
+import oic.utils.jwt as oic_jwt
+import oic.utils.keyio as keyio
+from jwkest.jwk import RSAKey
+from rift.rwlib.util import certs
+gi.require_version('RwOpenidcProviderYang', '1.0')
+gi.require_version('RwRbacInternalYang', '1.0')
+gi.require_version('RwProjectNsdYang', '1.0')
+gi.require_version('RwProjectYang', '1.0')
+gi.require_version('RwKeyspec', '1.0')
+gi.require_version('RwConmanYang', '1.0')
+from gi.repository import ( # noqa
+ RwOpenidcProviderYang,
+ RwProjectNsdYang,
+ RwProjectYang,
+ RwRbacInternalYang,
+ RwConmanYang,
+)
+from gi.repository.RwKeyspec import quoted_key # noqa
+
+
+PRIVATE_KEY = """-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAs9bRFjWofNeWq2qtsvH9iDZXXbv5NQI6avK1hSt+0W0g3SXW
+hllNenZAhFpXHzZvJk2qEoNIRXIeonX4N62FBLD7ZoWHQDGahkyfhxML4jYA3KUa
+PWGeUvMlRPkoR4NjHA3zXQvD2FwTtcKCulGYQHRAAyATIcNq0kKZMuMAJxC5A7VD
+vQVb7vOaN01YxJt+L6KF0v4ZiYdse5yBI/X58i2gnLqy102Oqj2qZygazj5LLdTE
+sjgsiC9ln6kesbRayXiqi+RnF+BeKKlwGCuUpH+vFGxXmT6Kr4iEiGIHxAs/HZOS
+9m61z1eHjrce654mpqwbeqhsyQZswyab2IpERwIDAQABAoIBABrnK+gypr3mUnfa
+QZnfcZoK5w7yq9kuOCb/oAAH/bS+qofqvSjj+x8yyXwDN71Hm2EThTm3wfwBkmuj
+UjqiDqAhCbrQhucnhIJKvCKsyr5QbdiUKlS8Yb7u+MhUrZ3lHdJ4k8t7kxSu0ZQD
+QSM2SZx6x4iwJ6yJW1WQ+PIP21n8ejraQ9PzqpuUsNXh05DU8qN/nJHe311D5ZuB
+UnSHdfGaF+EBbNxPLzV028db+L9m3a+h87uZhyqwRlUXP+swlToVNvF74bs+mflz
+r5JN6CwRM3VamnwmcnE77D/zyCsP1Js9LgoxhzhdcUwIOYVWRzUUVRCsrtYOSGF7
+WBzC3WECgYEA0hGtnBw5rryubv0kWDjZoVGvuwDo7BOW1JFXZYJwvweEj7EjWFTY
+bVk+MYs1huG+0NpNuhw6IYmDPIEkoLVNGuTHBMnA+SzQx/xv719b1OmY0Wl8ikYd
+Xlmhxr7mjAJX4eqkVTrBGtsi6TCLdk3HnUdpXJQ0k2aUN6hNFJfsmhUCgYEA2ykP
+hdVzP1ZtXsHEfHSOfRPIzX9gCLETghntAf44MCF+hHZeEVnuTSrfeqELvy5qCarA
+FgjZ77p7q6R7YP2KBQUc/gzZStjGIOCPv9xI8otXrmQRVXOxWNafeDp+TOPa2o9S
+2bBovNmN4Kc+ayktATCVuabMbuGiMIPuRY1pR+sCgYEAmdJSEw7j+hy1ihYZJ/Sw
+/5xmFoQLCtspRgwLOAx07Jzfp6xpGkQ+mouPrA2oq1TgOeSwp8gFlQsxqvtRy9AW
+XswJI2tsv8jeNKKXgGuOPfCzcxxQEpxW4wC1ImglP35zxbzginxUbIrsHF7ssDsy
+IOvqrdzkRs8FV2AI2TyKByUCgYEAuhdDdwCnu0BH3g3qKUNPOiVyfAuMH9U8G1yo
+Quj6DORj6VYYyeLy1dNxr07QCqX+o/a44/zgEQ7ns/cWTGT8rQaKd62xVDx8/62u
+YdtKlah76zhM/6IdFLIo9o20cNWJH8xTLUT9ql2QexGHjraH4FrAx8M6E2zDqy5b
+Q/OvUcECgYAjt8XosvUiRpZ1ugMxwAx316IIEgs2u7k4xdQESnVhIOM3Ex5ikXkK
+I0Hu/2XPH3KO6+6BOhtdZ4qXLf4hikbIisgq3P87Fb2rUElYZjVm3vClYhEzx6ym
+bSWO/cZTpp9L14qMuWzb13pD20GExPOIBh1m0exvoL3M8JhLShutWw==
+-----END RSA PRIVATE KEY-----"""
+
+PUBLIC_KEY = """-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs9bRFjWofNeWq2qtsvH9
+iDZXXbv5NQI6avK1hSt+0W0g3SXWhllNenZAhFpXHzZvJk2qEoNIRXIeonX4N62F
+BLD7ZoWHQDGahkyfhxML4jYA3KUaPWGeUvMlRPkoR4NjHA3zXQvD2FwTtcKCulGY
+QHRAAyATIcNq0kKZMuMAJxC5A7VDvQVb7vOaN01YxJt+L6KF0v4ZiYdse5yBI/X5
+8i2gnLqy102Oqj2qZygazj5LLdTEsjgsiC9ln6kesbRayXiqi+RnF+BeKKlwGCuU
+pH+vFGxXmT6Kr4iEiGIHxAs/HZOS9m61z1eHjrce654mpqwbeqhsyQZswyab2IpE
+RwIDAQAB
+-----END PUBLIC KEY-----"""
+
+WRONG_PRIVATE_KEY = """-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA230Ic8gqYGrIYPffrgvS9ezrI94+TMwIX0A3nyi6nRBOAzuV
+OMP0L4OegDLnAkyUC4ZiH6B9uAJ1mbp4WsX0Q2a3FuGzscCfriV0JKRd4256Mj60
+bGq7xLqR/d62IzLrQ2eJCQe2IspwUIeAW301igwoPIGTfZurQ6drXBcbRVo7adry
+V3+TGsfQVge95IyVAPm4A7kcJsdQu9HsD7Hp9LIM35B3oHCOF7hHP/MEEAz84Q6q
+lpWxdTzSnIxDXWxS2BqPInKOIL5egpn69AfJKLj+QPpQymULx3FCeNKeHmSICHtP
+r0uTckEek0kfFT2W6hIU1w1f+Pkddhc1fY45VQIDAQABAoIBABvOsHZywqOqg659
+WPJk/xo3JOdLbdsu8lSW/zUD5PinKysPrm0drl8irr8RM+E/sHXxVZcqLyNT9HBA
+hqUBdVvgtIuKlsiLXe+jQR6vUFHTGlopRZSCxT08YeinAa5d8h59DIh/WJz5xtb9
+A88Tguf1eFeKFxSP11ff6yMkrkjP1KmvNRoTAC0MU3p/N6UT03roR9v6n4qGPF6p
+/fy6uhLWSJVl7IGFL18DEODid64ShK37VytnvLAMQp8OzL87OdoUW6qrA+z4FP59
+XSpXULxn6ayJG3VChT+Y+nb23rC6gzCYYb3qkSwep2xNqfblP8jL2k/NSlbshdiz
+j3BfK8ECgYEA6D7SMCXZ2hBYu8EBoGRmMLdtM+spps61JOAhgy2i9aNQ/YlKfuS9
+kvNFqT1DEpQsjcRmZIEVb5uJQJYUDx6zj4eUSzkISvziz43dg4RKpC/ktprp9RQ1
+8sAQD4n5Xy2chdTQHKfGl4oF5b16wpi0eE97XptDOlLgPhk167woUQUCgYEA8fAt
+8uZxw0aKkQbF+tYItsWQQP87dJGUeLna4F3T6q5L5WJYCtFqILiFfWwfcjEaOKWV
+JzKr0f9pLrRxXYdFUxNolOhA1hZCqZu2ZzpSlfsPWhp2WflGi6DqzSByhgVuwHbV
+pRl0TRE2dQVgpuXxxiURREHoHJPZRc+3sOwU+BECgYAZJXQssmx8J/jzm1pJu5U1
+ASdZz8Sawxbp/zqhsXdLkXtbeFoQk0PTfXO1d2Sjxldsoi9UAoYHp5ec3qMdX/2h
+NNThsDMtq2QDhSDO9KwASw9AllVuq9mLhzA1/oJ5w76G3xwJfkEKd29cCMAaAd7I
+iBKbk8QbtI2DK8ei1qSm4QKBgAPHvPAOqbhjYcbiVDWXIou4ioh5dHRd0fQQ81qO
+HMGN96Gd58JDg2T/fRZ4mgUuvzojXDFAmW6ujvYr25mag3rI0tmAx4KQ1nnP9Qmn
+36J4ScUepLrDKlcELKcH2sI9U32uXag2vZp2qmMpsljpPt3ZtmtanEXWCY8Nr9ET
+30ABAoGAQ63wGwq1LPS6t/zU6CwOlIzGNnHDquO7o1o/h8IPt3BN6yF0NEVItjdi
+fL2ZwmBCUbO6Y/Jb1kh4a0iohWF33nS3J4Q6wSQUfBMG5jDI7GfuKAgTQl+sMkOM
+xjyKrWs/y7HtiP/2vf83QVEL8Bxr3WXdXHj1EBHFEMWA576J6mk=
+-----END RSA PRIVATE KEY-----"""
+
+roles = (
+ 'rw-rbac-platform:super-admin', 'rw-project:project-admin',
+ 'rw-project-mano:catalog-admin', 'rw-project:project-oper'
+)
+
+
+class Jwt:
+ """Jwt."""
+
+ def __init__(
+ self, private_key=None, public_key=None,
+ iss=None, sub=None, aud=None):
+ """__init___."""
+ self.iss = iss
+ self.sub = sub
+ self.aud = aud
+ self.keyjar = keyio.KeyJar()
+ if private_key:
+ self._add_key_to_keyjar(private_key)
+ if public_key:
+ self._add_key_to_keyjar(public_key, owner=self.iss)
+
+ def _add_key_to_keyjar(self, pkey, owner=''):
+ kb = keyio.KeyBundle()
+ priv_key = RSA.importKey(pkey)
+ key = RSAKey().load_key(priv_key)
+ key.use = "sig"
+ kb.append(key)
+ self.keyjar.add_kb(owner, kb)
+
+ def sign_jwt(self):
+ """sign_jwt."""
+ jwt = oic_jwt.JWT(self.keyjar, iss=self.iss)
+ jws = jwt.pack(sub=self.sub, aud=self.aud)
+ return jws
+
+ def verify(self, jws):
+ """verify."""
+ jwt = oic_jwt.JWT(self.keyjar)
+ return jwt.unpack(jws)
+
+TOKEN_URL = "https://{}:8009/token"
+REVOKE_URL = "https://{}:8009/revoke"
+REST_GET_LOG_CONFIG = "https://{}:8008/api/running/logging"
+
+
+class State:
+ """State."""
+
+ def __init__(self):
+ """__init___."""
+ self.access_token = None
+ _, self.cert, _ = certs.get_bootstrap_cert_and_key()
+
+ def teardown(self):
+ """teardown."""
+ print("\n=== Done with Tests ===")
+
+
+@pytest.fixture(scope="session")
+def state():
+ """state."""
+ st = State()
+ yield st
+ st.teardown()
+
+
+@pytest.mark.incremental
+class TestJwtBearer:
+ """TestJwtBearer."""
+
+ def generate_keys(self, key_format='PEM'):
+ """Generate private & public keys."""
+ private = RSA.generate(2048)
+ pri_key = private.exportKey('PEM')
+ private_key = pri_key.decode('utf-8')
+ public = private.publickey()
+ pub_key = public.exportKey(key_format)
+ public_key = pub_key.decode('utf-8')
+ return private_key, public_key
+
+ def test_client_config(
+ self, rw_user_proxy, rbac_user_passwd, user_domain,
+ rbac_platform_proxy, rw_rbac_int_proxy, mgmt_session):
+ """Setting the public key in config."""
+ client_id = '111'
+ rift.auto.mano.create_user(
+ rw_user_proxy, 'test', rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_platform_role_to_user(
+ rbac_platform_proxy, 'rw-rbac-platform:super-admin', 'test',
+ user_domain, rw_rbac_int_proxy)
+ openidc_xpath = (
+ '/rw-openidc-provider:openidc-provider-config/' +
+ 'rw-openidc-provider:openidc-client' +
+ '[rw-openidc-provider:client-id={}]'.format(quoted_key(client_id))
+ )
+ config_object = (
+ RwOpenidcProviderYang.
+ YangData_RwOpenidcProvider_OpenidcProviderConfig_OpenidcClient.
+ from_dict({
+ 'client_id': client_id,
+ 'client_name': 'test',
+ 'user_name': 'test',
+ 'user_domain': user_domain,
+ 'public_key': PUBLIC_KEY}))
+ rw_open_idc_proxy = mgmt_session.proxy(RwOpenidcProviderYang)
+ rw_open_idc_proxy.create_config(openidc_xpath, config_object)
+
+ def test_get_token(self, state, confd_host):
+ """Get the token."""
+ jwt = Jwt(private_key=PRIVATE_KEY, iss="111",
+ sub="test", aud="https://{}:8009".format(confd_host))
+ jws = jwt.sign_jwt()
+ body_tuple = (
+ ("grant_type", "urn:ietf:params:oauth:grant-type:jwt-bearer"),
+ ("assertion", jws),
+ )
+
+ req = tornado.httpclient.HTTPRequest(
+ url=TOKEN_URL.format(confd_host),
+ method='POST',
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ ca_certs=state.cert,
+ body=urllib.parse.urlencode(body_tuple)
+ )
+ client = tornado.httpclient.HTTPClient()
+ resp = client.fetch(req)
+ token_resp = json.loads(resp.body.decode('utf-8'))
+ assert "access_token" in token_resp
+ state.access_token = token_resp["access_token"]
+
+ def test_api_access(self, state, confd_host):
+ """Test api access."""
+ assert state.access_token is not None
+ req = tornado.httpclient.HTTPRequest(
+ url=REST_GET_LOG_CONFIG.format(confd_host),
+ headers={
+ "Authorization": "Bearer " + state.access_token,
+ "Accept": "application/json",
+ },
+ ca_certs=state.cert,
+ )
+ client = tornado.httpclient.HTTPClient()
+ resp = client.fetch(req)
+ assert resp.code == 200 or resp.code == 204
+
+ def test_revoke_token(self, state, confd_host):
+ """Revoke a token."""
+ assert state.access_token is not None
+ body_tuple = (
+ ("token", state.access_token),
+ ("token_type_hint", "access_token"),
+ )
+ req = tornado.httpclient.HTTPRequest(
+ url=REVOKE_URL.format(confd_host),
+ method='POST',
+ headers={
+ "Authorization": "Bearer " + state.access_token,
+ "Content-Type": "application/x-www-form-urlencoded",
+ },
+ ca_certs=state.cert,
+ body=urllib.parse.urlencode(body_tuple)
+ )
+ client = tornado.httpclient.HTTPClient()
+ client.fetch(req)
+
+ def test_api_access_invalid_token(self, state, confd_host):
+ """Test access with invalid token."""
+ assert state.access_token is not None
+ req = tornado.httpclient.HTTPRequest(
+ url=REST_GET_LOG_CONFIG.format(confd_host),
+ headers={
+ "Authorization": "Bearer " + state.access_token,
+ "Accept": "application/json",
+ },
+ ca_certs=state.cert,
+ )
+ client = tornado.httpclient.HTTPClient()
+ with pytest.raises(tornado.httpclient.HTTPError) as excinfo:
+ client.fetch(req)
+ assert excinfo.value.code == 401
+ state.access_token = None
+
+ def test_invalid_client_id(self, state, confd_host):
+ """Test with invalid client-id."""
+ jwt = Jwt(private_key=PRIVATE_KEY, iss="invalid_client",
+ sub="test", aud="https://{}:8009".format(confd_host))
+ jws = jwt.sign_jwt()
+ body_tuple = (
+ ("grant_type", "urn:ietf:params:oauth:grant-type:jwt-bearer"),
+ ("assertion", jws),
+ )
+
+ req = tornado.httpclient.HTTPRequest(
+ url=TOKEN_URL.format(confd_host),
+ method='POST',
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ ca_certs=state.cert,
+ body=urllib.parse.urlencode(body_tuple)
+ )
+ client = tornado.httpclient.HTTPClient()
+ with pytest.raises(tornado.httpclient.HTTPError) as excinfo:
+ client.fetch(req)
+ assert excinfo.value.code == 400
+
+ def test_invalid_key(self, state, confd_host):
+ """Test with invalid key."""
+ jwt = Jwt(private_key=WRONG_PRIVATE_KEY, iss="111",
+ sub="test", aud="https://{}:8009".format(confd_host))
+ jws = jwt.sign_jwt()
+ body_tuple = (
+ ("grant_type", "urn:ietf:params:oauth:grant-type:jwt-bearer"),
+ ("assertion", jws),
+ )
+
+ req = tornado.httpclient.HTTPRequest(
+ url=TOKEN_URL.format(confd_host),
+ method='POST',
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ ca_certs=state.cert,
+ body=urllib.parse.urlencode(body_tuple)
+ )
+ client = tornado.httpclient.HTTPClient()
+ with pytest.raises(tornado.httpclient.HTTPError) as excinfo:
+ client.fetch(req)
+ assert excinfo.value.code == 400
+
+ def test_invalid_user(self, state, confd_host):
+ """Test with invalid user."""
+ jwt = Jwt(private_key=PRIVATE_KEY, iss="111",
+ sub="invalid_user", aud="https://{}:8009".format(confd_host))
+ jws = jwt.sign_jwt()
+ body_tuple = (
+ ("grant_type", "urn:ietf:params:oauth:grant-type:jwt-bearer"),
+ ("assertion", jws),
+ )
+
+ req = tornado.httpclient.HTTPRequest(
+ url=TOKEN_URL.format(confd_host),
+ method='POST',
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ ca_certs=state.cert,
+ body=urllib.parse.urlencode(body_tuple)
+ )
+ client = tornado.httpclient.HTTPClient()
+ with pytest.raises(tornado.httpclient.HTTPError) as excinfo:
+ client.fetch(req)
+ assert excinfo.value.code == 400
+
+ def test_check_basic_functionality(
+ self, rw_user_proxy, rbac_user_passwd, user_domain, state,
+ rbac_platform_proxy, rw_rbac_int_proxy, mgmt_session,
+ session_class, confd_host, rw_project_proxy, cloud_module,
+ cloud_account, descriptors, fmt_nsd_catalog_xpath, logger):
+ """Check basic functionality."""
+ # Add the users to our config with the public key.
+ logger.debug('Create users and add roles for them')
+ for idx in range(1, 5):
+ client_id = '111{}'.format(idx)
+ user_name = 'test_{}'.format(idx)
+ role = roles[idx - 1]
+ rift.auto.mano.create_user(
+ rw_user_proxy, user_name, rbac_user_passwd, user_domain)
+ if 'platform' in role:
+ rift.auto.mano.assign_platform_role_to_user(
+ rbac_platform_proxy, role, user_name,
+ user_domain, rw_rbac_int_proxy)
+ else:
+ rift.auto.mano.assign_project_role_to_user(
+ rw_project_proxy, role, user_name,
+ 'default', user_domain, rw_rbac_int_proxy)
+ openidc_xpath = (
+ '/rw-openidc-provider:openidc-provider-config/' +
+ 'rw-openidc-provider:openidc-client[rw-openidc-provider:' +
+ 'client-id={}]'.format(quoted_key(client_id))
+ )
+ # Generate PEM keys for some, while for others its openssh keys
+ logger.debug('Generate private & public keys for the user')
+ if idx % 2 == 0:
+ key_format = 'OpenSSH'
+ else:
+ key_format = 'PEM'
+ private_key, public_key = self.generate_keys(key_format)
+ config_object = (
+ RwOpenidcProviderYang.
+ YangData_RwOpenidcProvider_OpenidcProviderConfig_OpenidcClient.
+ from_dict({
+ 'client_id': client_id,
+ 'client_name': user_name,
+ 'user_name': user_name,
+ 'user_domain': user_domain,
+ 'public_key': public_key}))
+ rw_open_idc_proxy = mgmt_session.proxy(RwOpenidcProviderYang)
+ rw_open_idc_proxy.create_config(openidc_xpath, config_object)
+ # Create the jason web signature
+ jwt = Jwt(private_key=private_key, iss=client_id,
+ sub=user_name, aud="https://{}:8009".format(confd_host))
+ jws = jwt.sign_jwt()
+ body_tuple = (
+ ("grant_type", "urn:ietf:params:oauth:grant-type:jwt-bearer"),
+ ("assertion", jws),
+ )
+ # Get the token using the signature
+ req = tornado.httpclient.HTTPRequest(
+ url=TOKEN_URL.format(confd_host),
+ method='POST',
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ ca_certs=state.cert,
+ body=urllib.parse.urlencode(body_tuple)
+ )
+ client = tornado.httpclient.HTTPClient()
+ resp = client.fetch(req)
+ token_resp = json.loads(resp.body.decode('utf-8'))
+ assert "access_token" in token_resp
+ access_token = token_resp["access_token"]
+ user_session = rift.auto.mano.get_session(
+ session_class, confd_host, user_name,
+ rbac_user_passwd, access_token=access_token)
+ rw_rbac_internal_proxy = user_session.proxy(RwRbacInternalYang)
+ # According to the role, checking the functionality
+ if role == 'rw-rbac-platform:super-admin':
+ project_pxy = user_session.proxy(RwProjectYang)
+ rift.auto.mano.assign_project_role_to_user(
+ project_pxy, 'rw-project:project-admin', 'oper', 'default',
+ 'system', rw_rbac_internal_proxy)
+ elif role == 'rw-project:project-admin':
+ logger.debug('Creating cloud account.')
+ rift.auto.mano.create_cloud_account(
+ user_session, cloud_account)
+ elif role == 'rw-project-mano:catalog-admin':
+ logger.debug('Uploading descriptors')
+ for descriptor in descriptors:
+ rift.auto.descriptor.onboard(
+ user_session, descriptor, project='default')
+ nsd_pxy = user_session.proxy(RwProjectNsdYang)
+ nsd_catalog = nsd_pxy.get_config(
+ fmt_nsd_catalog_xpath.format(
+ project=quoted_key('default')))
+ assert nsd_catalog
+ else:
+ project_xpath = '/project[name={project_name}]/project-state'
+ rw_project_proxy = user_session.proxy(RwProjectYang)
+ project = rw_project_proxy.get_config(
+ project_xpath.format(project_name=quoted_key('default')), list_obj=True)
+ assert project
+
+ def test_with_expired_token(
+ self, state, rw_user_proxy, rbac_user_passwd, user_domain,
+ rbac_platform_proxy, rw_rbac_int_proxy, mgmt_session,
+ session_class, confd_host, cloud_module, cloud_account,
+ logger):
+ """Test with an expired token."""
+ # Set the expiry time for the token as 'expiry_timeout' seconds.
+ client_id = '222'
+ user_name = 'expired_token_user'
+ expiry_timeout = 1
+ rift.auto.mano.create_user(
+ rw_user_proxy, user_name, rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_platform_role_to_user(
+ rbac_platform_proxy, 'rw-rbac-platform:super-admin', user_name,
+ user_domain, rw_rbac_int_proxy)
+
+ openidc_provider_xpath = '/rw-openidc-provider:openidc-provider-config'
+ openidc_provider = (
+ RwOpenidcProviderYang.
+ YangData_RwOpenidcProvider_OpenidcProviderConfig.from_dict({
+ 'token_expiry_timeout': expiry_timeout}))
+ pxy = mgmt_session.proxy(RwOpenidcProviderYang)
+ pxy.replace_config(openidc_provider_xpath, openidc_provider)
+
+ # Verify if token_expiry_timeout is set in openidc-provider-config
+ openidc_provider = pxy.get_config(openidc_provider_xpath)
+ assert openidc_provider
+ assert openidc_provider.token_expiry_timeout == expiry_timeout
+ # Set the public key in our config
+ openidc_xpath = (
+ '/rw-openidc-provider:openidc-provider-config/' +
+ 'rw-openidc-provider:openidc-client' +
+ '[rw-openidc-provider:client-id={}]'.format(quoted_key(client_id))
+ )
+ config_object = (
+ RwOpenidcProviderYang.
+ YangData_RwOpenidcProvider_OpenidcProviderConfig_OpenidcClient.
+ from_dict({
+ 'client_id': client_id,
+ 'client_name': user_name,
+ 'user_name': user_name,
+ 'user_domain': user_domain,
+ 'public_key': PUBLIC_KEY}))
+ rw_open_idc_proxy = mgmt_session.proxy(RwOpenidcProviderYang)
+ rw_open_idc_proxy.create_config(openidc_xpath, config_object)
+ # Generate the signature
+ jwt = Jwt(private_key=PRIVATE_KEY, iss=client_id,
+ sub=user_name, aud="https://{}:8009".format(confd_host))
+ jws = jwt.sign_jwt()
+ body_tuple = (
+ ("grant_type", "urn:ietf:params:oauth:grant-type:jwt-bearer"),
+ ("assertion", jws),
+ )
+ logger.debug('Get the token using the signature')
+ req = tornado.httpclient.HTTPRequest(
+ url=TOKEN_URL.format(confd_host),
+ method='POST',
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ ca_certs=state.cert,
+ body=urllib.parse.urlencode(body_tuple)
+ )
+ client = tornado.httpclient.HTTPClient()
+ resp = client.fetch(req)
+ token_resp = json.loads(resp.body.decode('utf-8'))
+ assert "access_token" in token_resp
+ access_token = token_resp["access_token"]
+ # Wait out the expiry timout
+ user_session = rift.auto.mano.get_session(
+ session_class, confd_host, user_name,
+ rbac_user_passwd, access_token=access_token)
+ time.sleep(expiry_timeout + 5)
+ with pytest.raises(
+ Exception,
+ message='Task done with expired token'):
+ user_conman_pxy = user_session.proxy(RwProjectYang)
+ assert user_conman_pxy.get_config(
+ '/project[name={}]/project-state'.format(quoted_key('default')), list_obj=True)
diff --git a/rwlaunchpad/ra/pytest/ns/restapitest/test_inputs/test_inputs.json b/rwlaunchpad/ra/pytest/ns/restapitest/test_inputs/test_inputs.json
new file mode 100644
index 0000000..470bb77
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/restapitest/test_inputs/test_inputs.json
@@ -0,0 +1,38 @@
+{
+ "uint64": [0, 1, -1, "riftio", "riftio@riftio.com",
+ 922337203685477580717263457123647172364, "", null,
+ "rif~t¶*¤500"],
+ "uint32": [0, 1, -1, "riftio", "riftio@riftio.com",
+ 922337203685477580717263457123647172364, "", null,
+ "rif~t¶*¤500"],
+ "uint16": [0, 1, -1, "riftio", "riftio@riftio.com",
+ 922337203685477580717263457123647172364, "", null,
+ "rif~t¶*¤500"],
+ "uint8": [0, 1, -1, "riftio", "riftio@riftio.com",
+ 922337203685477580717263457123647172364, "", null,
+ "rif~t¶*¤500"],
+ "decimal64": [0, 1, -1, "riftio", "riftio@riftio.com",
+ 922337203685477580.717263457123647172364, "", null,
+ "rif~t¶*¤500"],
+ "int64": [0, 1, -1, "riftio", "riftio@riftio.com",
+ 922337203685477580717263457123647172364, "", null,
+ "rif~t¶*¤500"],
+ "int32": [0, 1, -1, "riftio", "riftio@riftio.com",
+ 922337203685477580717263457123647172364, "", null,
+ "rif~t¶*¤500"],
+ "int16": [0, 1, -1, "riftio", "riftio@riftio.com",
+ 922337203685477580717263457123647172364, "", null,
+ "rif~t¶*¤500"],
+ "int8": [0, 1, -1, "riftio", "riftio@riftio.com",
+ 922337203685477580717263457123647172364, "", null,
+ "rif~t¶*¤500"],
+ "string": [0, 1, -1, "riftio", "riftio@riftio.com",
+ 922337203685477580717263457123647172364,
+ 1313213.1321313, "~~&^%*()", "", null,
+ "rif~t¶*¤500"],
+ "union": ["1.1.1.1", null, 0, 1, -1,
+ 22337203685477580717263457123647172364,
+ 1313213.1321313, "~~&^%*()", "", null,
+ "rif~t¶*¤500", "256.256.256.256",
+ "0.0.0.0"]
+}
diff --git a/rwlaunchpad/ra/pytest/ns/restapitest/test_project_restapi.py b/rwlaunchpad/ra/pytest/ns/restapitest/test_project_restapi.py
new file mode 100644
index 0000000..6857570
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/restapitest/test_project_restapi.py
@@ -0,0 +1,308 @@
+# !/usr/bin/env python
+"""
+#
+# Copyright 2017 RIFT.io Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+@author Anoop Valluthadam (anoop.valluthadam@riftio.com), Vishnu Narayanan K.A
+@brief Create/Delete/Other operations of Projects and User
+"""
+
+import os
+
+from utils.imports import * # noqa
+from utils.traversal_engine import traverse_it
+from utils.utils import parse_input_data
+from utils.tbac_token_utils import * # noqa
+
+headers = {'content-type': 'application/json'}
+
+
+class TestRestAPI(object):
+ """TestRestAPI."""
+
+ def traverse_and_find_all_keys(self, it, key_dict):
+ """Find all keys and their data types present in the json schema.
+
+ Args:
+ it (dict): the json
+ key_dict (dict): will be populated with the keys & their datatypes
+ Returns:
+ key_dict (dict): will be populated with the keys & their datatypes
+ """
+ if (isinstance(it, list)):
+ for item in it:
+ self.traverse_and_find_all_keys(item, key_dict)
+ return key_dict
+
+ elif (isinstance(it, dict)):
+ for key in it.keys():
+ if key == 'name' and 'data-type' in it:
+ if isinstance(it['data-type'], dict):
+ dtype = next(iter(it['data-type']))
+ if ((it[key] in key_dict) and
+ (dtype not in key_dict[it[key]])):
+
+ key_dict[it[key]].append(dtype)
+
+ elif it[key] not in key_dict:
+ key_dict[it[key]] = [dtype]
+ else:
+ pass
+ else:
+ if ((it[key] in key_dict) and
+ (it['data-type'] not in key_dict[it[key]])):
+
+ key_dict[it[key]].append(it['data-type'])
+
+ elif it[key] not in key_dict:
+ key_dict[it[key]] = [it['data-type']]
+ else:
+ pass
+ self.traverse_and_find_all_keys(it[key], key_dict)
+ return key_dict
+ else:
+ return None
+
+ def create_post_call(
+ self, data, confd_host, url, logger, state, number_of_tests):
+ """Create the POST.
+
+ Args:
+ data (dict): JSON data
+ confd_host (string): IP addr of the Launchpad
+ url (string): the url for the post call
+ logger (logger Object): log object
+ state: for the tbac token
+ number_of_tests (list): test & error cases count
+ Returns:
+ number_of_tests (list): test & error cases count
+ Raises:
+ requests.exceptions.ConnectionError: in case we loose connection
+ from the Launchpad, mostly when Launchpad crashes
+
+ """
+ number_of_tests[0] += 1
+
+ key = next(iter(data))
+ if 'project' in url:
+ name = str(data[key][0]["name"])
+ new_url = url + name
+ elif 'user-config' in url:
+ name = str(data[key]['user'][0]['user-name'])
+ domain = str(data[key]['user'][0]['user-domain'])
+ data = data['rw-user:user-config']
+ new_url = url + '/user/' + name + ',' + domain
+ else:
+ raise Exception('Something wrong with the URL')
+
+ logger.debug(data)
+ headers['Authorization'] = 'Bearer ' + state.access_token
+ try:
+ create_result = state.session.post(
+ url, data=json.dumps(data),
+ headers=headers, verify=False)
+ get_result = state.session.get(
+ new_url,
+ headers=headers, verify=False)
+ delete_result = state.session.delete(
+ new_url,
+ headers=headers, verify=False)
+ except requests.exceptions.ConnectionError:
+ logger.error('Crashed for the data: \n{}'.format(data))
+ number_of_tests[1] += 1
+ exit(1)
+
+ logger.debug(
+ 'create result:\n{}\n{}\n'.format(
+ create_result.status_code, create_result.text))
+ logger.debug(
+ 'get result:\n{}\n{}\n'.format(
+ get_result.status_code, get_result.text))
+ logger.debug(
+ 'delete result:\n{}\n{}\n'.format(
+ delete_result.status_code, delete_result.text))
+
+ return number_of_tests
+
+ def get_schema(self, confd_host, url, property_=None):
+ """Get schema.
+
+ Args:
+ confd_host (string): Launchpad IP
+ property_ (string): vnfd/nsd/user etc
+ Returns:
+ schema (JSON): Schema in JSON format
+ """
+ headers = {'content-type': 'application/json'}
+
+ result = requests.get(url, auth=HTTPBasicAuth('admin', 'admin'),
+ headers=headers, verify=False)
+
+ schema = json.loads(result.text)
+
+ return schema
+
+ def traverse_call(
+ self, test_input, data, k_dict, confd_host, logger,
+ number_of_tests, depth, url, state):
+ """Traversing through the values from the test IP JSON.
+
+ Args:
+ test_input (string): the data from the test IP JSON
+ data (json): schema data
+ k_dict (dict): dictionary of the JSON IP
+ confd_host (string): Launchpad IP
+ logger (logger obj): log object
+ number_of_tests (list): test & error cases count
+ depth (int): depth of the json
+ url (string): the url for the post call
+ state: for the tbac token
+ Returns:
+ number_of_tests (list): test & error cases count
+ """
+ for key, kdata_types in k_dict.items():
+ for kdata_type in kdata_types:
+ if kdata_type in test_input:
+ test_values = test_input[kdata_type]
+ for test_value in test_values:
+ test_data = {kdata_type: test_value}
+ # Actual traversal call which will generate data
+ json_data = traverse_it(
+ data, original=False,
+ test_value=test_data, test_key=key,
+ max_depth=depth)
+
+ number_of_tests = self.create_post_call(
+ json_data, confd_host, url,
+ logger, state, number_of_tests)
+
+ return number_of_tests
+
+ def test_get_token(
+ self, rw_user_proxy, rbac_user_passwd, user_domain,
+ rbac_platform_proxy, rw_rbac_int_proxy, mgmt_session, state):
+ """Setting the public key in config and get token."""
+ client_id = '1234'
+ rift.auto.mano.create_user(
+ rw_user_proxy, 'test', rbac_user_passwd, user_domain)
+ rift.auto.mano.assign_platform_role_to_user(
+ rbac_platform_proxy, 'rw-rbac-platform:super-admin', 'test',
+ user_domain, rw_rbac_int_proxy)
+ openidc_xpath = (
+ '/rw-openidc-provider:openidc-provider-config/' +
+ 'rw-openidc-provider:openidc-client' +
+ '[rw-openidc-provider:client-id={}]'.format(quoted_key(client_id))
+ )
+ config_object = (
+ RwOpenidcProviderYang.
+ YangData_RwOpenidcProvider_OpenidcProviderConfig_OpenidcClient.
+ from_dict({
+ 'client_id': client_id,
+ 'client_name': 'test',
+ 'user_name': 'test',
+ 'user_domain': 'tbacdomain',
+ 'public_key': PUBLIC_KEY}))
+ rw_open_idc_proxy = mgmt_session.proxy(RwOpenidcProviderYang)
+ rw_open_idc_proxy.create_config(openidc_xpath, config_object)
+
+ # Get the token
+ jwt = Jwt(private_key=PRIVATE_KEY, iss=client_id,
+ sub="test", aud="https://locahost:8009")
+ jws = jwt.sign_jwt()
+ body_tuple = (
+ ("grant_type", "urn:ietf:params:oauth:grant-type:jwt-bearer"),
+ ("assertion", jws),
+ )
+
+ req = tornado.httpclient.HTTPRequest(
+ url=TOKEN_URL,
+ method='POST',
+ headers={"Content-Type": "application/x-www-form-urlencoded"},
+ ca_certs=state.cert,
+ body=urllib.parse.urlencode(body_tuple)
+ )
+ client = tornado.httpclient.HTTPClient()
+ resp = client.fetch(req)
+ token_resp = json.loads(resp.body.decode('utf-8'))
+ assert "access_token" in token_resp
+ state.access_token = token_resp["access_token"]
+
+ auth_value = 'Bearer ' + state.access_token
+ state.session = requests.Session()
+ state.session.headers.update({
+ 'content-type': 'application/json',
+ 'Authorization': auth_value
+ })
+
+ def test_user_restapi(self, confd_host, logger, state):
+ """Test user creation restapi."""
+ rift_install = os.getenv('RIFT_INSTALL')
+ file_path = (
+ '{}/usr/rift/systemtest/pytest/'.format(rift_install) +
+ 'system/ns/restapitest/test_inputs/test_inputs.json')
+ test_input = parse_input_data(file_path)
+ schema_url_for_user = (
+ "https://{}:8008/v2/api/schema/user-config/".format(confd_host)
+ )
+ url_for_user = (
+ "https://{}:8008/v2/api/config/user-config".format(confd_host)
+ )
+ data = self.get_schema(confd_host, schema_url_for_user)
+
+ key_dict = {}
+ k_dict = self.traverse_and_find_all_keys(data, key_dict)
+
+ number_of_tests = [0, 0] # [total no. of tests, no. of erros]
+ # Traverse with depth but with out any specific key
+ for depth in range(14, 15):
+ number_of_tests = self.traverse_call(
+ test_input, data["user-config"], k_dict, confd_host,
+ logger, number_of_tests, depth, url_for_user, state)
+ logger.debug(
+ 'No of tests ran for userapi: {}'.format(number_of_tests[0]))
+ logger.debug(
+ 'No of crashed tests for userapi:{}'.format(number_of_tests[1]))
+
+ def test_project_restapi(self, confd_host, logger, state):
+ """Test project creation restapi."""
+ rift_install = os.getenv('RIFT_INSTALL')
+ file_path = (
+ '{}/usr/rift/systemtest/pytest/'.format(rift_install) +
+ 'system/ns/restapitest/test_inputs/test_inputs.json')
+ test_input = parse_input_data(file_path)
+
+ schema_url_for_project = (
+ "https://{}:8008/v2/api/schema/project/".format(confd_host)
+ )
+ url_for_project = (
+ "https://{}:8008/v2/api/config/project/".format(confd_host)
+ )
+ data = self.get_schema(confd_host, schema_url_for_project)
+
+ key_dict = {}
+ k_dict = self.traverse_and_find_all_keys(data, key_dict)
+
+ number_of_tests = [0, 0] # [total no. of tests, no. of erros]
+
+ # Traverse with depth but with out any specific key
+ for depth in range(5, 6):
+ number_of_tests = self.traverse_call(
+ test_input, data["project"], k_dict, confd_host,
+ logger, number_of_tests, depth, url_for_project, state)
+ logger.debug(
+ 'No of tests ran for projectapi: {}'.format(number_of_tests[0]))
+ logger.debug(
+ 'No of crashed tests for projectapi:{}'.format(number_of_tests[1]))
diff --git a/rwlaunchpad/ra/pytest/ns/restapitest/utils/__init__.py b/rwlaunchpad/ra/pytest/ns/restapitest/utils/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/restapitest/utils/__init__.py
diff --git a/rwlaunchpad/ra/pytest/ns/restapitest/utils/imports.py b/rwlaunchpad/ra/pytest/ns/restapitest/utils/imports.py
new file mode 100644
index 0000000..942c696
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/restapitest/utils/imports.py
@@ -0,0 +1,39 @@
+# !/usr/bin/env python
+"""
+#
+# Copyright 2017 RIFT.io Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+@file imports.py
+@author Anoop Valluthadam (anoop.valluthadam@riftio.com)
+"""
+
+import json # noqa
+import socket # noqa
+import struct # noqa
+import requests # noqa
+import random # noqa
+import logging # noqa
+import uuid # noqa
+import decimal # noqa
+import argparse # noqa
+import datetime # noqa
+import time # noqa
+
+from logging import handlers # noqa
+from signal import SIGTERM # noqa
+from requests.auth import HTTPBasicAuth # noqa
+from random import choice # noqa
+from string import ascii_lowercase # noqa
diff --git a/rwlaunchpad/ra/pytest/ns/restapitest/utils/tbac_token_utils.py b/rwlaunchpad/ra/pytest/ns/restapitest/utils/tbac_token_utils.py
new file mode 100644
index 0000000..2d4fe85
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/restapitest/utils/tbac_token_utils.py
@@ -0,0 +1,198 @@
+#!/usr/bin/env python3
+"""
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""
+# RIFT_IO_STANDARD_COPYRIGHT_HEADER(BEGIN)
+# Author(s): Balaji Rajappa, Vishnu Narayanan K.A
+# Creation Date: 2017-07-07
+# RIFT_IO_STANDARD_COPYRIGHT_HEADER(END)
+
+import gi
+import json
+import urllib.parse
+
+import rift.auto.mano
+import pytest
+import tornado.httpclient
+import time
+import Cryptodome.PublicKey.RSA as RSA
+
+import oic.utils.jwt as oic_jwt
+import oic.utils.keyio as keyio
+from jwkest.jwk import RSAKey
+from rift.rwlib.util import certs
+gi.require_version('RwOpenidcProviderYang', '1.0')
+gi.require_version('RwRbacInternalYang', '1.0')
+gi.require_version('RwProjectNsdYang', '1.0')
+gi.require_version('RwProjectYang', '1.0')
+gi.require_version('RwKeyspec', '1.0')
+gi.require_version('RwConmanYang', '1.0')
+from gi.repository import ( # noqa
+ RwOpenidcProviderYang,
+ RwProjectNsdYang,
+ RwProjectYang,
+ RwRbacInternalYang,
+ RwConmanYang,
+)
+from gi.repository.RwKeyspec import quoted_key # noqa
+
+
+@pytest.fixture(scope='session')
+def rbac_user_passwd():
+ """A common password being used for all rbac users."""
+ return 'mypasswd'
+
+
+@pytest.fixture(scope='session')
+def user_domain(tbac):
+ """user-domain being used in this rbac test."""
+ if tbac:
+ return 'tbacdomain'
+ return 'system'
+
+
+PRIVATE_KEY = """-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAs9bRFjWofNeWq2qtsvH9iDZXXbv5NQI6avK1hSt+0W0g3SXW
+hllNenZAhFpXHzZvJk2qEoNIRXIeonX4N62FBLD7ZoWHQDGahkyfhxML4jYA3KUa
+PWGeUvMlRPkoR4NjHA3zXQvD2FwTtcKCulGYQHRAAyATIcNq0kKZMuMAJxC5A7VD
+vQVb7vOaN01YxJt+L6KF0v4ZiYdse5yBI/X58i2gnLqy102Oqj2qZygazj5LLdTE
+sjgsiC9ln6kesbRayXiqi+RnF+BeKKlwGCuUpH+vFGxXmT6Kr4iEiGIHxAs/HZOS
+9m61z1eHjrce654mpqwbeqhsyQZswyab2IpERwIDAQABAoIBABrnK+gypr3mUnfa
+QZnfcZoK5w7yq9kuOCb/oAAH/bS+qofqvSjj+x8yyXwDN71Hm2EThTm3wfwBkmuj
+UjqiDqAhCbrQhucnhIJKvCKsyr5QbdiUKlS8Yb7u+MhUrZ3lHdJ4k8t7kxSu0ZQD
+QSM2SZx6x4iwJ6yJW1WQ+PIP21n8ejraQ9PzqpuUsNXh05DU8qN/nJHe311D5ZuB
+UnSHdfGaF+EBbNxPLzV028db+L9m3a+h87uZhyqwRlUXP+swlToVNvF74bs+mflz
+r5JN6CwRM3VamnwmcnE77D/zyCsP1Js9LgoxhzhdcUwIOYVWRzUUVRCsrtYOSGF7
+WBzC3WECgYEA0hGtnBw5rryubv0kWDjZoVGvuwDo7BOW1JFXZYJwvweEj7EjWFTY
+bVk+MYs1huG+0NpNuhw6IYmDPIEkoLVNGuTHBMnA+SzQx/xv719b1OmY0Wl8ikYd
+Xlmhxr7mjAJX4eqkVTrBGtsi6TCLdk3HnUdpXJQ0k2aUN6hNFJfsmhUCgYEA2ykP
+hdVzP1ZtXsHEfHSOfRPIzX9gCLETghntAf44MCF+hHZeEVnuTSrfeqELvy5qCarA
+FgjZ77p7q6R7YP2KBQUc/gzZStjGIOCPv9xI8otXrmQRVXOxWNafeDp+TOPa2o9S
+2bBovNmN4Kc+ayktATCVuabMbuGiMIPuRY1pR+sCgYEAmdJSEw7j+hy1ihYZJ/Sw
+/5xmFoQLCtspRgwLOAx07Jzfp6xpGkQ+mouPrA2oq1TgOeSwp8gFlQsxqvtRy9AW
+XswJI2tsv8jeNKKXgGuOPfCzcxxQEpxW4wC1ImglP35zxbzginxUbIrsHF7ssDsy
+IOvqrdzkRs8FV2AI2TyKByUCgYEAuhdDdwCnu0BH3g3qKUNPOiVyfAuMH9U8G1yo
+Quj6DORj6VYYyeLy1dNxr07QCqX+o/a44/zgEQ7ns/cWTGT8rQaKd62xVDx8/62u
+YdtKlah76zhM/6IdFLIo9o20cNWJH8xTLUT9ql2QexGHjraH4FrAx8M6E2zDqy5b
+Q/OvUcECgYAjt8XosvUiRpZ1ugMxwAx316IIEgs2u7k4xdQESnVhIOM3Ex5ikXkK
+I0Hu/2XPH3KO6+6BOhtdZ4qXLf4hikbIisgq3P87Fb2rUElYZjVm3vClYhEzx6ym
+bSWO/cZTpp9L14qMuWzb13pD20GExPOIBh1m0exvoL3M8JhLShutWw==
+-----END RSA PRIVATE KEY-----"""
+
+PUBLIC_KEY = """-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs9bRFjWofNeWq2qtsvH9
+iDZXXbv5NQI6avK1hSt+0W0g3SXWhllNenZAhFpXHzZvJk2qEoNIRXIeonX4N62F
+BLD7ZoWHQDGahkyfhxML4jYA3KUaPWGeUvMlRPkoR4NjHA3zXQvD2FwTtcKCulGY
+QHRAAyATIcNq0kKZMuMAJxC5A7VDvQVb7vOaN01YxJt+L6KF0v4ZiYdse5yBI/X5
+8i2gnLqy102Oqj2qZygazj5LLdTEsjgsiC9ln6kesbRayXiqi+RnF+BeKKlwGCuU
+pH+vFGxXmT6Kr4iEiGIHxAs/HZOS9m61z1eHjrce654mpqwbeqhsyQZswyab2IpE
+RwIDAQAB
+-----END PUBLIC KEY-----"""
+
+WRONG_PRIVATE_KEY = """-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA230Ic8gqYGrIYPffrgvS9ezrI94+TMwIX0A3nyi6nRBOAzuV
+OMP0L4OegDLnAkyUC4ZiH6B9uAJ1mbp4WsX0Q2a3FuGzscCfriV0JKRd4256Mj60
+bGq7xLqR/d62IzLrQ2eJCQe2IspwUIeAW301igwoPIGTfZurQ6drXBcbRVo7adry
+V3+TGsfQVge95IyVAPm4A7kcJsdQu9HsD7Hp9LIM35B3oHCOF7hHP/MEEAz84Q6q
+lpWxdTzSnIxDXWxS2BqPInKOIL5egpn69AfJKLj+QPpQymULx3FCeNKeHmSICHtP
+r0uTckEek0kfFT2W6hIU1w1f+Pkddhc1fY45VQIDAQABAoIBABvOsHZywqOqg659
+WPJk/xo3JOdLbdsu8lSW/zUD5PinKysPrm0drl8irr8RM+E/sHXxVZcqLyNT9HBA
+hqUBdVvgtIuKlsiLXe+jQR6vUFHTGlopRZSCxT08YeinAa5d8h59DIh/WJz5xtb9
+A88Tguf1eFeKFxSP11ff6yMkrkjP1KmvNRoTAC0MU3p/N6UT03roR9v6n4qGPF6p
+/fy6uhLWSJVl7IGFL18DEODid64ShK37VytnvLAMQp8OzL87OdoUW6qrA+z4FP59
+XSpXULxn6ayJG3VChT+Y+nb23rC6gzCYYb3qkSwep2xNqfblP8jL2k/NSlbshdiz
+j3BfK8ECgYEA6D7SMCXZ2hBYu8EBoGRmMLdtM+spps61JOAhgy2i9aNQ/YlKfuS9
+kvNFqT1DEpQsjcRmZIEVb5uJQJYUDx6zj4eUSzkISvziz43dg4RKpC/ktprp9RQ1
+8sAQD4n5Xy2chdTQHKfGl4oF5b16wpi0eE97XptDOlLgPhk167woUQUCgYEA8fAt
+8uZxw0aKkQbF+tYItsWQQP87dJGUeLna4F3T6q5L5WJYCtFqILiFfWwfcjEaOKWV
+JzKr0f9pLrRxXYdFUxNolOhA1hZCqZu2ZzpSlfsPWhp2WflGi6DqzSByhgVuwHbV
+pRl0TRE2dQVgpuXxxiURREHoHJPZRc+3sOwU+BECgYAZJXQssmx8J/jzm1pJu5U1
+ASdZz8Sawxbp/zqhsXdLkXtbeFoQk0PTfXO1d2Sjxldsoi9UAoYHp5ec3qMdX/2h
+NNThsDMtq2QDhSDO9KwASw9AllVuq9mLhzA1/oJ5w76G3xwJfkEKd29cCMAaAd7I
+iBKbk8QbtI2DK8ei1qSm4QKBgAPHvPAOqbhjYcbiVDWXIou4ioh5dHRd0fQQ81qO
+HMGN96Gd58JDg2T/fRZ4mgUuvzojXDFAmW6ujvYr25mag3rI0tmAx4KQ1nnP9Qmn
+36J4ScUepLrDKlcELKcH2sI9U32uXag2vZp2qmMpsljpPt3ZtmtanEXWCY8Nr9ET
+30ABAoGAQ63wGwq1LPS6t/zU6CwOlIzGNnHDquO7o1o/h8IPt3BN6yF0NEVItjdi
+fL2ZwmBCUbO6Y/Jb1kh4a0iohWF33nS3J4Q6wSQUfBMG5jDI7GfuKAgTQl+sMkOM
+xjyKrWs/y7HtiP/2vf83QVEL8Bxr3WXdXHj1EBHFEMWA576J6mk=
+-----END RSA PRIVATE KEY-----"""
+
+roles = (
+ 'rw-rbac-platform:super-admin', 'rw-project:project-admin',
+ 'rw-project-mano:catalog-admin', 'rw-project:project-oper'
+)
+
+
+class Jwt:
+ """Jwt."""
+
+ def __init__(
+ self, private_key=None, public_key=None,
+ iss=None, sub=None, aud=None):
+ """__init___."""
+ self.iss = iss
+ self.sub = sub
+ self.aud = aud
+ self.keyjar = keyio.KeyJar()
+ if private_key:
+ self._add_key_to_keyjar(private_key)
+ if public_key:
+ self._add_key_to_keyjar(public_key, owner=self.iss)
+
+ def _add_key_to_keyjar(self, pkey, owner=''):
+ kb = keyio.KeyBundle()
+ priv_key = RSA.importKey(pkey)
+ key = RSAKey().load_key(priv_key)
+ key.use = "sig"
+ kb.append(key)
+ self.keyjar.add_kb(owner, kb)
+
+ def sign_jwt(self):
+ """sign_jwt."""
+ jwt = oic_jwt.JWT(self.keyjar, iss=self.iss)
+ jws = jwt.pack(sub=self.sub, aud=self.aud)
+ return jws
+
+ def verify(self, jws):
+ """verify."""
+ jwt = oic_jwt.JWT(self.keyjar)
+ return jwt.unpack(jws)
+
+TOKEN_URL = "https://localhost:8009/token"
+REVOKE_URL = "https://localhost:8009/revoke"
+REST_GET_LOG_CONFIG = "https://localhost:8008/api/running/logging"
+
+
+class State:
+ """State."""
+
+ def __init__(self):
+ """__init___."""
+ self.access_token = None
+ _, self.cert, _ = certs.get_bootstrap_cert_and_key()
+
+ def teardown(self):
+ """teardown."""
+ print("\n=== Done with Tests ===")
+
+
+@pytest.fixture(scope="session")
+def state():
+ """state."""
+ st = State()
+ yield st
+ st.teardown()
\ No newline at end of file
diff --git a/rwlaunchpad/ra/pytest/ns/restapitest/utils/traversal_engine.py b/rwlaunchpad/ra/pytest/ns/restapitest/utils/traversal_engine.py
new file mode 100644
index 0000000..f476ed8
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/restapitest/utils/traversal_engine.py
@@ -0,0 +1,262 @@
+
+from .imports import * # noqa
+
+
+def populate_data(data_type, original=True, test_value={}, keys={}):
+ """Generate data from schema depends its Data-type
+ Args:
+ data_type (string): data_type from the test IP json
+ original (boolean): if it is True,
+ will generate normal JSON with randon
+ values
+ test_value (dict): will be like this {'string': '-1'}, means, if
+ string data typr comes, data will be -1
+ keys (dict): if this is present, value testing for this particular
+ key
+ Returns:
+ string_ (string): string value
+ """
+
+ if original:
+ if (isinstance(data_type, dict)):
+ if 'enumeration' in data_type:
+ string_ = list(data_type['enumeration']['enum'])[0]
+ return string_
+ if 'leafref' in data_type:
+ data_type = 'leafref'
+ if 'union' in data_type:
+ data_type = 'union'
+
+ if data_type == 'string':
+ string_ = ''.join(choice(ascii_lowercase) for i in range(12))
+ elif data_type == 'uint64':
+ string_ = uuid.uuid4().int & (1 << 64) - 1
+ elif data_type == 'uint8':
+ string_ = uuid.uuid4().int & (1 << 8) - 1
+ elif data_type == 'uint32':
+ string_ = uuid.uuid4().int & (1 << 32) - 1
+ elif data_type == 'uint16':
+ string_ = uuid.uuid4().int & (1 << 16) - 1
+ elif data_type == 'decimal64':
+ string_ = float(decimal.Decimal('%d.%d'
+ % (random.randint(0, 2134342),
+ random.randint(0, 999))))
+ elif data_type == 'int64':
+ string_ = random.randint(0, 1000000000000)
+ elif data_type == 'int32':
+ string_ = random.randint(0, 1000000000)
+ elif data_type == 'int16':
+ string_ = random.randint(0, 10000)
+ elif data_type == 'leafref':
+ string_ = 'leafref_data-type'
+ elif data_type == 'union':
+ string_ = socket.inet_ntoa(
+ struct.pack('>I', random.randint(1, 0xffffffff)))
+ elif data_type == 'boolean':
+ string_ = True
+ else:
+ string_ = data_type
+
+ return string_
+ else:
+ if (isinstance(data_type, dict)):
+ if 'enumeration' in data_type:
+ string_ = list(data_type['enumeration']['enum'])[0]
+ return string_
+ if 'leafref' in data_type:
+ data_type = 'leafref'
+ if 'union' in data_type:
+ data_type = 'union'
+
+ # print(data_type, test_value)
+ if not (isinstance(data_type, dict)):
+ if keys and keys[list(keys)[0]]:
+ if list(keys.values())[0] in keys:
+ if data_type in test_value:
+ return test_value[data_type]
+ else:
+ if data_type in test_value:
+ return test_value[data_type]
+
+ if data_type == 'string':
+ string_ = ''.join(choice(ascii_lowercase) for i in range(12))
+ elif data_type == 'uint64':
+ string_ = uuid.uuid4().int & (1 << 64) - 1
+ elif data_type == 'uint8':
+ string_ = uuid.uuid4().int & (1 << 8) - 1
+ elif data_type == 'uint32':
+ string_ = uuid.uuid4().int & (1 << 32) - 1
+ elif data_type == 'uint16':
+ string_ = uuid.uuid4().int & (1 << 16) - 1
+ elif data_type == 'decimal64':
+ string_ = float(decimal.Decimal('%d.%d'
+ % (random.randint(0, 99999999),
+ random.randint(0, 999))))
+ elif data_type == 'int64':
+ string_ = random.randint(0, 99999999)
+ elif data_type == 'int32':
+ string_ = random.randint(0, 999999)
+ elif data_type == 'int16':
+ string_ = random.randint(0, 999999)
+ elif data_type == 'leafref':
+ string_ = 'leafref_data-type'
+ elif data_type == 'union':
+ string_ = socket.inet_ntoa(
+ struct.pack('>I', random.randint(1, 0xffffffff)))
+ elif data_type == 'boolean':
+ string_ = True
+ else:
+ string_ = data_type
+
+ return string_
+
+
+def traverse_it(it, path='', data_json={}, original=True, test_value={},
+ test_key=None, avoid=[], depth=0, max_depth=0):
+ """Main recursicve traversel method, which will go through the schema
+ and generate data JSON
+
+ Args:
+ it (json): schema
+ data_json (dict): used to generate the data for particular key which is
+ present in this dict
+ original (boolean): used to generate original(complete) data JSON
+ test_value (dict): data type and the corresponding value which is
+ getting replaced generated
+ test_key (string): the key which is gonna get tested
+ avoid (list): these keys will get avoided while JSON is getting
+ created
+ depth (int): depth of the JSON
+ max_depth (int: will be the max depth of the JSON)
+
+ Returns:
+ Json data
+ """
+
+ if (isinstance(it, list)):
+ temp = {}
+ depth += 1
+ if depth == max_depth:
+ return []
+ for item in it:
+ # print(path)
+
+ x = traverse_it(item, path=path, data_json=data_json,
+ original=original,
+ test_value=test_value, test_key=test_key,
+ avoid=avoid,
+ depth=depth,
+ max_depth=max_depth)
+ temp.update(x)
+ return temp
+ elif (isinstance(it, dict)):
+ if 'name' in it.keys():
+ if it['name'] == 'disabled':
+ temp = [{it['name']: ''}, {}]
+ return random.choice(temp)
+ path = path + '/' + it['name']
+ if 'type' in it.keys():
+
+ if it['type'] == 'container':
+ depth += 1
+ if depth == max_depth:
+ return {}
+ data_json = {
+ it['name']: traverse_it(it['properties'],
+ path=path, data_json=data_json,
+ original=original,
+ test_value=test_value,
+ test_key=test_key,
+ avoid=avoid,
+ depth=depth,
+ max_depth=max_depth)
+ }
+ return data_json
+ elif it['type'] == 'list':
+ for item_check in it['properties']:
+
+ if 'data-type' in item_check:
+ if (isinstance(item_check['data-type'], dict)):
+ if 'leafref' in item_check['data-type']:
+ temp = {it['name']: []}
+ return temp
+ depth += 1
+
+ if depth == max_depth:
+ return {}
+
+ temp = {
+ it['name']:
+ [traverse_it(it['properties'], path=path,
+ data_json=data_json,
+ original=original,
+ test_value=test_value, test_key=test_key,
+ avoid=avoid,
+ depth=depth,
+ max_depth=max_depth)]
+ }
+ return temp
+ elif it['type'] == 'case':
+ for item_check in it['properties']:
+ if 'data-type' in item_check:
+ if (isinstance(item_check['data-type'], dict)):
+ if 'leafref' in item_check['data-type']:
+ return {}
+ depth += 1
+ if depth == max_depth:
+ return {}
+
+ return traverse_it(it['properties'][0], path=path,
+ data_json=data_json,
+ original=original,
+ test_value=test_value, test_key=test_key,
+ avoid=avoid,
+ depth=depth,
+ max_depth=max_depth)
+ elif it['type'] == 'choice':
+ depth += 1
+
+ if depth == max_depth:
+ return {}
+
+ return traverse_it(it['properties'][0], path=path,
+ data_json=data_json,
+ original=original,
+ test_value=test_value, test_key=test_key,
+ avoid=avoid,
+ depth=depth,
+ max_depth=max_depth)
+ elif it['type'] == 'leaf':
+ # print(data_json)
+ if it['name'] in avoid:
+ return {}
+ if 'data-type' in it:
+ if 'subnet-address' == it['name']:
+ data = '255.255.255.0/24'
+ elif 'numa-unaware' == it['name']:
+ data = ''
+ elif 'ephemeral' == it['name']:
+ data = ''
+ else:
+ data = populate_data(it['data-type'],
+ original=original,
+ test_value=test_value,
+ keys={it['name']: test_key})
+ return {it['name']: data}
+ else:
+ if 'subnet-address' == it['name']:
+ data = '255.255.255.0/24'
+ elif 'numa-unaware' == it['name']:
+ data = ''
+ elif 'ephemeral' == it['name']:
+ data = ''
+ else:
+ data = populate_data(it['data-type'],
+ original=original,
+ test_value=test_value,
+ keys={it['name']: test_key})
+ return {it['name']: data}
+
+ else:
+ print('Error in the JSON!')
+ exit(1)
diff --git a/rwlaunchpad/ra/pytest/ns/restapitest/utils/utils.py b/rwlaunchpad/ra/pytest/ns/restapitest/utils/utils.py
new file mode 100644
index 0000000..c664572
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/restapitest/utils/utils.py
@@ -0,0 +1,28 @@
+
+from .imports import * # noqa
+
+
+def parse_cli():
+ """Parse command line options
+ """
+
+ parser = argparse.ArgumentParser()
+ parser.add_argument("--confd-host", help="confd IP",
+ dest='confd_host',
+ default='127.0.0.1')
+ args = parser.parse_args()
+
+ return args
+
+
+def parse_input_data(file_name):
+ """
+ open the input file and make into a python Dict Obj
+ """
+
+ data = ''
+
+ with open(file_name, 'r') as ipf:
+ data = json.load(ipf)
+
+ return data
diff --git a/rwlaunchpad/ra/pytest/ns/test_multiple_ns_instantiation.py b/rwlaunchpad/ra/pytest/ns/test_multiple_ns_instantiation.py
new file mode 100644
index 0000000..ed1da4c
--- /dev/null
+++ b/rwlaunchpad/ra/pytest/ns/test_multiple_ns_instantiation.py
@@ -0,0 +1,186 @@
+#!/usr/bin/env python
+#
+# Copyright 2016-2017 RIFT.io Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+import gi
+import numpy as np
+import os
+import pytest
+import random
+import time
+
+import rift.auto.descriptor
+from rift.auto.os_utils import get_mem_usage, print_mem_usage
+gi.require_version('RwNsrYang', '1.0')
+gi.require_version('RwProjectNsdYang', '1.0')
+gi.require_version('RwVnfrYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
+from gi.repository import (
+ RwNsrYang,
+ RwVnfrYang,
+ RwVlrYang,
+ RwProjectNsdYang,
+ RwProjectVnfdYang,
+ )
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
+
+@pytest.fixture(scope='module')
+def rwvnfr_proxy(request, mgmt_session):
+ return mgmt_session.proxy(RwVnfrYang)
+
+
+@pytest.fixture(scope='module')
+def rwvlr_proxy(request, mgmt_session):
+ return mgmt_session.proxy(RwVlrYang)
+
+
+@pytest.fixture(scope='module')
+def rwnsr_proxy(request, mgmt_session):
+ return mgmt_session.proxy(RwNsrYang)
+
+
+@pytest.fixture(scope='module')
+def nsd_proxy(request, mgmt_session):
+ return mgmt_session.proxy(RwProjectNsdYang)
+
+
+@pytest.fixture(scope='module')
+def vnfd_proxy(request, mgmt_session):
+ return mgmt_session.proxy(RwProjectVnfdYang)
+
+
+@pytest.mark.setup('multiple_ns_setup')
+@pytest.mark.depends('launchpad')
+@pytest.mark.incremental
+class TestMultipleNsSetup(object):
+ def test_onboard_descriptors(self, logger, mgmt_session, descriptors, nsd_proxy, vnfd_proxy):
+ """Onboards the VNF, NS packages required for the test"""
+ vnfds, nsds = [], []
+ for descriptor in descriptors:
+ pkg_type = rift.auto.descriptor.get_package_type(descriptor)
+ if pkg_type == 'NSD':
+ nsds.append(descriptor)
+ elif pkg_type == 'VNFD':
+ vnfds.append(descriptor)
+
+ pkgs_in_upload_seq = vnfds + nsds
+ logger.debug('Packages in sequence of upload: {}'.format([os.path.basename(pkg) for pkg in pkgs_in_upload_seq]))
+
+ for pkg in pkgs_in_upload_seq:
+ logger.debug('Uploading package {}'.format(pkg))
+ rift.auto.descriptor.onboard(mgmt_session, pkg) # Raise exception if the upload is not successful
+
+ # Verify if the packages are uploaded
+ assert len(vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog').vnfd) == len(vnfds)
+ assert len(nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog').nsd) == len(nsds)
+
+
+@pytest.mark.depends('multiple_ns_setup')
+@pytest.mark.incremental
+class TestMultipleNsInstantiate(object):
+ def test_instantiate_ns_mem_check(self, logger, rwvnfr_proxy, nsd_proxy,
+ rwnsr_proxy, rwvlr_proxy,
+ cloud_account_name, descriptors):
+ """It runs over a loop. In each loop, it instantiates a NS,
+ terminates the NS, checks memory usage of the system.
+ During memory check, it verifies whether current system
+ mem usage exceeds base memory-usage by a defined threshold.
+ """
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
+
+ # Random NSD sequence generation for NS instantiation
+ iteration, no_of_hours = map(float, pytest.config.getoption('--multiple-ns-instantiate').split(','))
+ nsd_count = len([pkg for pkg in descriptors if 'nsd.' in pkg])
+ nsd_instantiate_seq = np.random.choice(list(range(nsd_count)), int(iteration))
+ random.shuffle(nsd_instantiate_seq)
+
+ logger.debug('nsd instantiaion sequence: {}'.format([catalog.nsd[seq].name for seq in nsd_instantiate_seq]))
+
+ # Collect mem-usage of the system
+ base_system_rss = get_mem_usage()
+ print_mem_usage()
+
+ start_time = time.time()
+ total_duration_in_secs = no_of_hours * 60 * 60
+ # Loop through NSD instantiation sequence and instantiate the NS
+ for idx, seq in enumerate(nsd_instantiate_seq, 1):
+ # Instantiating NS
+ nsd = catalog.nsd[seq]
+ logger.debug('Iteration {}: Instantiating NS {}'.format(idx, nsd.name))
+
+ nsr = rift.auto.descriptor.create_nsr(cloud_account_name, nsd.name, nsd)
+ rwnsr_proxy.create_config('/rw-project:project[rw-project:name="default"]/ns-instance-config/nsr', nsr)
+
+ # Verify if NS reaches active state
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata/nsr[ns-instance-config-ref={}]'.format(quoted_key(nsr.id)))
+ assert nsr_opdata is not None
+
+ # Verify NSR instances enter 'running' operational-status
+ for nsr in rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata').nsr:
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/operational-status".format(
+ quoted_key(nsr.ns_instance_config_ref))
+ rwnsr_proxy.wait_for(xpath, "running", fail_on=['failed'], timeout=400)
+
+ # Verify NSR instances enter 'configured' config-status
+ for nsr in rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata').nsr:
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status".format(quoted_key(nsr.ns_instance_config_ref))
+ rwnsr_proxy.wait_for(xpath, "configured", fail_on=['failed'], timeout=400)
+
+ time.sleep(30) # Let it run for few secs before terminating it
+
+ # Terminates the NSR
+ rift.auto.descriptor.terminate_nsr(rwvnfr_proxy, rwnsr_proxy,
+ rwvlr_proxy, logger)
+
+ time.sleep(30) # After NS termination, wait for few secs before collecting mem-usage
+
+ # Get the mem-usage and compare it with base mem-usage
+ print_mem_usage()
+ curr_system_rss = get_mem_usage()
+ threshold = 5
+ mem_usage_inc = 100 * (curr_system_rss - base_system_rss) / base_system_rss
+ if mem_usage_inc > threshold:
+ assert False, 'There is an increase of {}%% during sequence {}. Base system-rss- {}; Current system-rss- {}'.format(
+ mem_usage_inc, idx, base_system_rss, curr_system_rss)
+
+ if (time.time() - start_time) > total_duration_in_secs:
+ logger.debug('NS instantiation has been happening for last {} hours (provided limit). Exiting.'.format(
+ no_of_hours))
+ break
+
+
+@pytest.mark.depends('multiple_ns_setup')
+@pytest.mark.teardown('multiple_ns_setup')
+@pytest.mark.incremental
+class TestMultipleNsTeardown(object):
+ def test_delete_descritors(self, nsd_proxy, vnfd_proxy):
+ """Deletes VNF, NS descriptors"""
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
+ for nsd in nsds.nsd:
+ xpath = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd[id={}]".format(quoted_key(nsd.id))
+ nsd_proxy.delete_config(xpath)
+
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
+ assert nsds is None or len(nsds.nsd) == 0
+
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
+ for vnfd_record in vnfds.vnfd:
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_record.id))
+ vnfd_proxy.delete_config(xpath)
+
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
+ assert vnfds is None or len(vnfds.vnfd) == 0
diff --git a/rwlaunchpad/ra/pytest/ns/test_onboard.py b/rwlaunchpad/ra/pytest/ns/test_onboard.py
index 5951ce8..83f74bf 100644
--- a/rwlaunchpad/ra/pytest/ns/test_onboard.py
+++ b/rwlaunchpad/ra/pytest/ns/test_onboard.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.io Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -21,12 +21,16 @@
@brief Onboard descriptors
"""
+import gi
import json
import logging
+import numpy as np
import os
import pytest
-import shlex
+import random
import requests
+import requests_toolbelt
+import shlex
import shutil
import subprocess
import time
@@ -34,32 +38,42 @@
import rift.auto.mano
import rift.auto.session
+import rift.auto.descriptor
-import gi
gi.require_version('RwNsrYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
gi.require_version('RwLaunchpadYang', '1.0')
gi.require_version('RwBaseYang', '1.0')
+gi.require_version('RwStagingMgmtYang', '1.0')
+gi.require_version('RwPkgMgmtYang', '1.0')
+gi.require_version('RwVlrYang', '1.0')
from gi.repository import (
RwcalYang,
- NsdYang,
+ RwProjectNsdYang,
RwNsrYang,
RwVnfrYang,
NsrYang,
VnfrYang,
VldYang,
- RwVnfdYang,
+ RwProjectVnfdYang,
RwLaunchpadYang,
- RwBaseYang
+ RwBaseYang,
+ RwStagingMgmtYang,
+ RwPkgMgmtYang,
+ RwImageMgmtYang,
+ RwTypes,
+ RwVlrYang
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
logging.basicConfig(level=logging.DEBUG)
@pytest.fixture(scope='module')
def vnfd_proxy(request, mgmt_session):
- return mgmt_session.proxy(RwVnfdYang)
+ return mgmt_session.proxy(RwProjectVnfdYang)
@pytest.fixture(scope='module')
def rwvnfr_proxy(request, mgmt_session):
@@ -71,8 +85,13 @@
@pytest.fixture(scope='module')
+def rwvlr_proxy(request, mgmt_session):
+ return mgmt_session.proxy(RwVlrYang)
+
+
+@pytest.fixture(scope='module')
def nsd_proxy(request, mgmt_session):
- return mgmt_session.proxy(NsdYang)
+ return mgmt_session.proxy(RwProjectNsdYang)
@pytest.fixture(scope='module')
@@ -88,30 +107,6 @@
def endpoint():
return "upload"
-def create_nsr(nsd, input_param_list, cloud_account_name):
- """
- Create the NSR record object
-
- Arguments:
- nsd - NSD
- input_param_list - list of input-parameter objects
-
- Return:
- NSR object
- """
- nsr = RwNsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
-
- nsr.id = str(uuid.uuid4())
- nsr.name = rift.auto.mano.resource_name(nsr.id)
- nsr.short_name = "nsr_short_name"
- nsr.description = "This is a description"
- nsr.nsd.from_dict(nsd.as_dict())
- nsr.admin_status = "ENABLED"
- nsr.input_parameter.extend(input_param_list)
- nsr.cloud_account = cloud_account_name
-
- return nsr
-
def upload_descriptor(
logger,
@@ -200,47 +195,25 @@
host=host,
endpoint=endpoint)
-def terminate_nsr(rwvnfr_proxy, rwnsr_proxy, logger, wait_after_kill=True):
- """
- Terminate the instance and check if the record is deleted.
- Asserts:
- 1. NSR record is deleted from instance-config.
+def get_ns_cloud_resources(rwvnfr_proxy, rwvlr_proxy):
+ """Returns a collection of ports, networks, VMs used by this NS"""
+ ns_cloud_resources = {'ports':[], 'vms':[], 'networks':[]}
- """
- logger.debug("Terminating NSRs")
+ # Get ports and VMs associated with each VNF
+ vnfrs = rwvnfr_proxy.get('/rw-project:project[rw-project:name="default"]/vnfr-catalog/vnfr', list_obj=True)
+ for vnfr in vnfrs.vnfr:
+ for cp in vnfr.connection_point:
+ ns_cloud_resources['ports'].append(cp.connection_point_id)
+ for vdur in vnfr.vdur:
+ ns_cloud_resources['vms'].append(vdur.vim_id)
- nsr_path = "/ns-instance-config"
- nsr = rwnsr_proxy.get_config(nsr_path)
- nsrs = nsr.nsr
+ # Get the network associated with each NS
+ vlrs = rwvlr_proxy.get('/rw-project:project[rw-project:name="default"]/vlr-catalog/vlr', list_obj=True)
+ for vlr in vlrs.vlr:
+ ns_cloud_resources['networks'].append(vlr.network_id)
- xpaths = []
- for nsr in nsrs:
- xpath = "/ns-instance-config/nsr[id='{}']".format(nsr.id)
- rwnsr_proxy.delete_config(xpath)
- xpaths.append(xpath)
-
- if wait_after_kill:
- time.sleep(30)
- else:
- time.sleep(5)
-
- for xpath in xpaths:
- nsr = rwnsr_proxy.get_config(xpath)
- assert nsr is None
-
- # Get the ns-instance-config
- ns_instance_config = rwnsr_proxy.get_config("/ns-instance-config")
-
- # Termination tests
- vnfr = "/vnfr-catalog/vnfr"
- vnfrs = rwvnfr_proxy.get(vnfr, list_obj=True)
- assert vnfrs is None or len(vnfrs.vnfr) == 0
-
- # nsr = "/ns-instance-opdata/nsr"
- # nsrs = rwnsr_proxy.get(nsr, list_obj=True)
- # assert len(nsrs.nsr) == 0
-
+ return ns_cloud_resources
@pytest.mark.setup('nsr')
@@ -249,7 +222,7 @@
class TestNsrStart(object):
"""A brief overview of the steps performed.
1. Generate & on-board new descriptors
- 2. Start the NSR
+ 2. Start the NSR
"""
def test_upload_descriptors(
@@ -260,32 +233,168 @@
mgmt_session,
scheme,
cert,
- descriptors
+ descriptors,
+ iteration,
):
"""Generates & On-boards the descriptors.
+
+ 1. Request a staging area: RPC returns an endpoint and port
+ 1. Upload the file to the endpoint, return the endpoint to download
+ 2. Reconstruct the URL and trigger an RPC upload for the package.
"""
+ # We are instantiating the NS twice in port-sequencing test. Seconds NS instantiation will be using already uploaded
+ # descriptors with updated interface positional values.
+ if iteration==1 and pytest.config.getoption("--port-sequencing"):
+ pytest.skip()
endpoint = "upload"
for file_name in descriptors:
- onboard_descriptor(
- mgmt_session.host,
- file_name,
- logger,
- endpoint,
- scheme,
- cert)
+
+ ip = RwStagingMgmtYang.YangInput_RwStagingMgmt_CreateStagingArea.from_dict({
+ "package_type": "VNFD"})
+
+ if "nsd" in file_name:
+ ip.package_type = "NSD"
+
+ data = mgmt_session.proxy(RwStagingMgmtYang).rpc(ip)
+ form = requests_toolbelt.MultipartEncoder(fields={
+ 'file': (os.path.basename(file_name),
+ open(file_name, 'rb'),
+ 'application/octet-stream')
+ })
+
+ response = requests.post(
+ "{}://{}:{}/{}".format(
+ scheme,
+ mgmt_session.host,
+ data.port,
+ data.endpoint),
+ data=form.to_string(),
+ cert=cert, # cert is a tuple
+ verify=False,
+ headers={"Content-Type": "multipart/form-data"})
+
+ resp = json.loads(response.text)
+ url = "https://{}:{}{}".format(mgmt_session.host, data.port, resp['path'])
+
+ ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageCreate.from_dict({
+ "package_type": "VNFD",
+ "external_url": url
+ })
+
+ if "nsd" in file_name:
+ ip.package_type = "NSD"
+
+ # trigger the upload.
+ resp = mgmt_session.proxy(RwPkgMgmtYang).rpc(ip)
+
+ wait_onboard_transaction_finished(
+ logger,
+ resp.transaction_id,
+ scheme,
+ cert,
+ host=mgmt_session.host,
+ endpoint=endpoint)
descriptor_vnfds, descriptor_nsd = descriptors[:-1], descriptors[-1]
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
actual_vnfds = catalog.vnfd
assert len(actual_vnfds) == len(descriptor_vnfds), \
"There should {} vnfds".format(len(descriptor_vnfds))
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
actual_nsds = catalog.nsd
assert len(actual_nsds) == 1, "There should only be a single nsd"
+ @pytest.mark.skipif(not pytest.config.getoption('--upload-images-multiple-accounts'),
+ reason="need --upload-images-multiple-accounts option to run")
+ def test_images_uploaded_multiple_accounts(self, logger, mgmt_session, random_image_name, cloud_accounts, cal):
+ image_mgmt_proxy = mgmt_session.proxy(RwImageMgmtYang)
+ upload_jobs = image_mgmt_proxy.get('/rw-project:project[rw-project:name="default"]/upload-jobs')
+ logger.info('Embedded image name(apart from ping pong Fedora images): {}'.format(random_image_name))
+ for job in upload_jobs.job:
+ assert image_mgmt_proxy.wait_for('/rw-project:project[rw-project:name="default"]/upload-jobs/job[id={}]/status'.format(quoted_key(job.id)), 'COMPLETED', timeout=240)
+ assert len(job.upload_tasks) == len(cloud_accounts)
+ for upload_task in job.upload_tasks:
+ assert upload_task.status == 'COMPLETED'
+
+ assert len(upload_jobs.job) == 3
+
+ # Check whether images are present in VIMs
+ for account in cloud_accounts:
+ rc, res = cal.get_image_list(RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList.from_dict(account.as_dict()))
+ assert rc == RwTypes.RwStatus.SUCCESS
+ assert [image for image in res.imageinfo_list if image.name == random_image_name]
+
+ @pytest.mark.skipif(not pytest.config.getoption("--vnf-onboard-delete"), reason="need --vnf-onboard-delete option to run")
+ def test_upload_delete_descriptors(self, logger, mgmt_session, vnfd_proxy, descriptors, vnf_onboard_delete):
+ """Randomly upload and delete VNFs. With each upload/delete, verify if the VNF
+ gets uploaded/deleted successfully.
+ """
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]"
+ iteration, vnf_count = map(int, vnf_onboard_delete.split(','))
+
+ # Get the VNF paths to be used for onboarding
+ all_vnfs = [pkg_path for pkg_path in descriptors if '_nsd' not in os.path.basename(pkg_path)]
+ if vnf_count > len(all_vnfs):
+ vnf_count = len(all_vnfs)
+ available_vnfs = random.sample(all_vnfs, vnf_count)
+
+ # Get the add, delete iterations
+ add_del_seq = list(np.random.choice(['add', 'del'], iteration))
+ random.shuffle(add_del_seq)
+ logger.info('Vnf add-delete iteration sequence: {}'.format(add_del_seq))
+
+ uploaded_vnfs = {}
+
+ def get_vnfd_list():
+ """Returns list of VNFDs"""
+ vnfd_obj = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
+ return vnfd_obj.vnfd if vnfd_obj else []
+
+ def delete_vnfd():
+ """Deletes a VNFD"""
+ vnf_path, vnfd_id = random.choice(list(uploaded_vnfs.items()))
+ logger.info('Deleting VNF {} having id {}'.format(os.path.basename(vnf_path), vnfd_id))
+ vnfd_proxy.delete_config(xpath.format(quoted_key(vnfd_id)))
+ uploaded_vnfs.pop(vnf_path)
+ available_vnfs.append(vnf_path)
+ assert not [vnfd for vnfd in get_vnfd_list() if vnfd.id == vnfd_id]
+
+ for op_type in add_del_seq:
+ if op_type =='del':
+ if uploaded_vnfs:
+ delete_vnfd()
+ continue
+ op_type = 'add'
+
+ if op_type == 'add':
+ if not available_vnfs:
+ delete_vnfd()
+ continue
+ vnf_path = random.choice(available_vnfs)
+ logger.info('Adding VNF {}'.format(os.path.basename(vnf_path)))
+ rift.auto.descriptor.onboard(mgmt_session, vnf_path)
+ vnfs = get_vnfd_list()
+ assert len(vnfs) == len(uploaded_vnfs) + 1
+ vnfd = [vnfd for vnfd in vnfs if vnfd.id not in list(uploaded_vnfs.values())]
+ assert len(vnfd) == 1
+ vnfd = vnfd[0]
+ assert vnfd.name
+ assert vnfd.connection_point
+ assert vnfd.vdu
+ uploaded_vnfs[vnf_path] = vnfd.id
+ available_vnfs.remove(vnf_path)
+
+ assert len(get_vnfd_list()) == len(uploaded_vnfs)
+ logger.info('Onboarded VNFs : {}'.format(uploaded_vnfs))
+
+ assert len(available_vnfs) + len(uploaded_vnfs) == vnf_count
+ # cleanup - Delete VNFs(if any)
+ for vnfd_id in uploaded_vnfs.values():
+ vnfd_proxy.delete_config(xpath.format(quoted_key(vnfd_id)))
+
@pytest.mark.feature("upload-image")
def test_upload_images(self, descriptor_images, cloud_host, cloud_user, cloud_tenants):
@@ -295,7 +404,7 @@
[(tenant, "private") for tenant in cloud_tenants])
for image_location in descriptor_images:
- image = RwcalYang.ImageInfoItem.from_dict({
+ image = RwcalYang.YangData_RwProject_Project_VimResources_ImageinfoList.from_dict({
'name': os.path.basename(image_location),
'location': image_location,
'disk_format': 'qcow2',
@@ -304,14 +413,85 @@
def test_set_scaling_params(self, nsd_proxy):
- nsds = nsd_proxy.get('/nsd-catalog')
+ nsds = nsd_proxy.get('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = nsds.nsd[0]
for scaling_group in nsd.scaling_group_descriptor:
scaling_group.max_instance_count = 2
- nsd_proxy.replace_config('/nsd-catalog/nsd[id="{}"]'.format(
- nsd.id), nsd)
+ nsd_proxy.replace_config('/rw-project:project[rw-project:name="default"]/nsd-catalog/nsd[id={}]'.format(
+ quoted_key(nsd.id)), nsd)
+ @pytest.mark.skipif(not (pytest.config.getoption("--update-vnfd-instantiate") or pytest.config.getoption("--port-sequencing")),
+ reason="need --update-vnfd-instantiate or --port-sequencing option to run")
+ def test_update_vnfd(self, vnfd_proxy, iteration, port_sequencing_intf_positions):
+ """Updates few fields of ping pong VNFDs and verify those changes
+ """
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]"
+ vnfd_catalog = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd"
+
+ if iteration==0 and pytest.config.getoption("--port-sequencing"):
+ pytest.skip()
+
+ def get_vnfd():
+ vnfds = vnfd_proxy.get(vnfd_catalog, list_obj=True)
+ dict_ = {}
+
+ # Get ping pong VNFDs
+ for vnfd in vnfds.vnfd:
+ if 'ping' in vnfd.name:
+ dict_['ping'] = vnfd
+ if 'pong' in vnfd.name:
+ dict_['pong'] = vnfd
+ return dict_
+
+ vnfds_dict = get_vnfd()
+ update_data = {'ping':{'static_ip_address':'31.31.31.60'}, 'pong':{'static_ip_address':'31.31.31.90'}}
+ port_sequencing_intf_positions_tmp = port_sequencing_intf_positions[:]
+
+ # Modify/add fields in VNFDs
+ for name_, vnfd in vnfds_dict.items():
+ if pytest.config.getoption('--update-vnfd-instantiate'):
+ vnfd.vdu[0].interface[1].static_ip_address = update_data[name_]['static_ip_address']
+ if pytest.config.getoption('--port-sequencing'):
+ vnfd_intf_list = vnfd.vdu[0].interface
+ # for ping vnfd, remove positional values from all interfaces
+ # for pong vnfd, modify the positional values as per fixture port_sequencing_intf_positions
+ if 'ping' in vnfd.name:
+ tmp_intf_list = []
+ for i in range(len(vnfd_intf_list)):
+ tmp_intf_dict = vnfd_intf_list[-1].as_dict()
+ del tmp_intf_dict['position']
+ vnfd_intf_list.pop()
+ tmp_intf_list.append(tmp_intf_dict)
+ for intf_dict_without_positional_values in tmp_intf_list:
+ new_intf = vnfd.vdu[0].interface.add()
+ new_intf.from_dict(intf_dict_without_positional_values)
+
+ if 'pong' in vnfd.name:
+ for intf in vnfd_intf_list:
+ if 'position' in intf:
+ intf.position = port_sequencing_intf_positions_tmp.pop()
+
+ # Update/save the VNFDs
+ for vnfd in vnfds_dict.values():
+ vnfd_proxy.replace_config(xpath.format(quoted_key(vnfd.id)), vnfd)
+
+ # Match whether data is updated
+ vnfds_dict = get_vnfd()
+ assert vnfds_dict
+ for name_, vnfd in vnfds_dict.items():
+ if pytest.config.getoption('--update-vnfd-instantiate'):
+ assert vnfd.vdu[0].interface[1].static_ip_address == update_data[name_]['static_ip_address']
+ if pytest.config.getoption('--port-sequencing'):
+ if 'ping' in vnfd.name:
+ for intf in vnfd.vdu[0].interface:
+ assert 'position' not in intf.as_dict()
+ if 'pong' in vnfd.name:
+ tmp_positional_values_list = []
+ for intf in vnfd.vdu[0].interface:
+ if 'position' in intf.as_dict():
+ tmp_positional_values_list.append(intf.position)
+ assert set(tmp_positional_values_list) == set(port_sequencing_intf_positions)
def test_instantiate_nsr(self, logger, nsd_proxy, rwnsr_proxy, base_proxy, cloud_account_name):
@@ -329,47 +509,72 @@
config_param.value,
running_config.input_parameter))
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
input_parameters = []
- descr_xpath = "/nsd:nsd-catalog/nsd:nsd[nsd:id='%s']/nsd:description" % nsd.id
- descr_value = "New NSD Description"
+ descr_xpath = "/nsd:nsd-catalog/nsd:nsd/nsd:vendor"
+ descr_value = "New Vendor"
in_param_id = str(uuid.uuid4())
- input_param_1 = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter(
+ input_param_1 = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter(
xpath=descr_xpath,
value=descr_value)
input_parameters.append(input_param_1)
- nsr = create_nsr(nsd, input_parameters, cloud_account_name)
+ nsr = rift.auto.descriptor.create_nsr(cloud_account_name, nsd.name, nsd, input_param_list=input_parameters)
logger.info("Instantiating the Network Service")
- rwnsr_proxy.create_config('/ns-instance-config/nsr', nsr)
+ rwnsr_proxy.create_config('/rw-project:project[rw-project:name="default"]/ns-instance-config/nsr', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata/nsr[ns-instance-config-ref="{}"]'.format(nsr.id))
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata/nsr[ns-instance-config-ref={}]'.format(quoted_key(nsr.id)))
assert nsr_opdata is not None
# Verify the input parameter configuration
- running_config = rwnsr_proxy.get_config("/ns-instance-config/nsr[id='%s']" % nsr.id)
+ running_config = rwnsr_proxy.get_config("/rw-project:project[rw-project:name='default']/ns-instance-config/nsr[id=%s]" % quoted_key(nsr.id))
for input_param in input_parameters:
verify_input_parameters(running_config, input_param)
def test_wait_for_nsr_started(self, rwnsr_proxy):
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ """Verify NSR instances enter 'running' operational-status
+ """
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
for nsr in nsrs:
- xpath = "/ns-instance-opdata/nsr[ns-instance-config-ref='{}']/operational-status".format(nsr.ns_instance_config_ref)
- rwnsr_proxy.wait_for(xpath, "running", fail_on=['failed'], timeout=240)
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/operational-status".format(quoted_key(nsr.ns_instance_config_ref))
+ rwnsr_proxy.wait_for(xpath, "running", fail_on=['failed'], timeout=400)
+
+ def test_wait_for_nsr_configured(self, rwnsr_proxy):
+ """Verify NSR instances enter 'configured' config-status
+ """
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
+ nsrs = nsr_opdata.nsr
+
+ for nsr in nsrs:
+ xpath = "/rw-project:project[rw-project:name='default']/ns-instance-opdata/nsr[ns-instance-config-ref={}]/config-status".format(quoted_key(nsr.ns_instance_config_ref))
+ rwnsr_proxy.wait_for(xpath, "configured", fail_on=['failed'], timeout=400)
@pytest.mark.teardown('nsr')
@pytest.mark.depends('launchpad')
@pytest.mark.incremental
class TestNsrTeardown(object):
- def test_terminate_nsr(self, rwvnfr_proxy, rwnsr_proxy, logger, cloud_type):
+
+ def test_delete_embedded_images(self, random_image_name, cloud_accounts, cal):
+ """Deletes images embedded in VNF from VIM. It only deletes additional images, not
+ the Fedora ping pong images"""
+ for account in cloud_accounts:
+ rc, rsp = cal.get_image_list(RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList.from_dict(account.as_dict()))
+ assert rc == RwTypes.RwStatus.SUCCESS
+ if rsp is not None:
+ for image in rsp.imageinfo_list:
+ if random_image_name in image.name:
+ cal.delete_image(RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList.from_dict(account.as_dict()), image.id)
+
+ def test_terminate_nsr(self, rwvnfr_proxy, rwnsr_proxy, logger, cloud_type,
+ rwvlr_proxy, vim_clients, cloud_account_name):
"""
Terminate the instance and check if the record is deleted.
@@ -377,32 +582,66 @@
1. NSR record is deleted from instance-config.
"""
- logger.debug("Terminating NSR")
+ # Collects the Cloud resources like ports, networks, VMs used by the current NS
+ ns_cloud_resources = get_ns_cloud_resources(rwvnfr_proxy, rwvlr_proxy)
+ logger.info('Cloud resources used by NS: {}'.format(ns_cloud_resources))
+ logger.debug("Terminating NSR")
wait_after_kill = True
if cloud_type == "mock":
wait_after_kill = False
- terminate_nsr(rwvnfr_proxy, rwnsr_proxy, logger, wait_after_kill=wait_after_kill)
+ rift.auto.descriptor.terminate_nsr(rwvnfr_proxy, rwnsr_proxy,
+ rwvlr_proxy, logger,
+ wait_after_kill=wait_after_kill)
+ # Collect all the ports, networks VMs from openstack and
+ # check if previously collected resources (i.e ns_cloud_resources) are still present in this collection
+ start_time = time.time()
+ while time.time()-start_time < 240:
+ try:
+ vim_client = vim_clients[cloud_account_name]
+ vim_resources = dict()
+ vim_resources['networks'] = vim_client.neutron_network_list()
+ vim_resources['vms'] = vim_client.nova_server_list()
+ vim_resources['ports'] = vim_client.neutron_port_list()
- def test_delete_records(self, nsd_proxy, vnfd_proxy):
+ for resource_type in ns_cloud_resources.keys():
+ logger.debug("Verifying all %s resources have been removed from vim", resource_type)
+ vim_resource_ids = [
+ vim_resource['id'] for vim_resource in vim_resources[resource_type]
+ if 'shared' not in vim_resource.keys()
+ or not vim_resource['shared']
+ ]
+ for ns_resource_id in ns_cloud_resources[resource_type]:
+ logger.debug('Verifying %s resource %s removed', resource_type, ns_resource_id)
+ assert ns_resource_id not in vim_resource_ids
+ return
+ except AssertionError:
+ time.sleep(10)
+ raise AssertionError("Resources not cleared from openstack")
+
+ def test_delete_records(self, nsd_proxy, vnfd_proxy, iteration):
"""Delete the NSD & VNFD records
Asserts:
The records are deleted.
"""
- nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+ # We are instantiating the NS twice in port-sequencing test. Seconds NS instantiation will be using already uploaded
+ # descriptors with updated interface positional values.
+ if iteration==0 and pytest.config.getoption("--port-sequencing"):
+ pytest.skip()
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
for nsd in nsds.nsd:
- xpath = "/nsd-catalog/nsd[id='{}']".format(nsd.id)
+ xpath = "/rw-project:project[rw-project:name='default']/nsd-catalog/nsd[id={}]".format(quoted_key(nsd.id))
nsd_proxy.delete_config(xpath)
- nsds = nsd_proxy.get("/nsd-catalog/nsd", list_obj=True)
+ nsds = nsd_proxy.get("/rw-project:project[rw-project:name='default']/nsd-catalog/nsd", list_obj=True)
assert nsds is None or len(nsds.nsd) == 0
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
for vnfd_record in vnfds.vnfd:
- xpath = "/vnfd-catalog/vnfd[id='{}']".format(vnfd_record.id)
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_record.id))
vnfd_proxy.delete_config(xpath)
- vnfds = vnfd_proxy.get("/vnfd-catalog/vnfd", list_obj=True)
+ vnfds = vnfd_proxy.get("/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd", list_obj=True)
assert vnfds is None or len(vnfds.vnfd) == 0
diff --git a/rwlaunchpad/ra/pytest/test_failover.py b/rwlaunchpad/ra/pytest/test_failover.py
index 60ba82a..d24fbff 100755
--- a/rwlaunchpad/ra/pytest/test_failover.py
+++ b/rwlaunchpad/ra/pytest/test_failover.py
@@ -20,15 +20,17 @@
@brief System test of stopping launchpad on master and
validating configuration on standby
"""
+import argparse
+import gi
import os
+import subprocess
import sys
import time
-import argparse
-import subprocess
-import gi
-from gi.repository import RwVnfdYang
+from gi.repository import RwProjectVnfdYang
from gi.repository import RwVnfrYang
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
import rift.auto.proxy
from rift.auto.session import NetconfSession
@@ -46,10 +48,10 @@
Tuple: VNFD and its corresponding VNFR entry
"""
def get_vnfd(vnfd_id):
- xpath = "/vnfd-catalog/vnfd[id='{}']".format(vnfd_id)
- return proxy(RwVnfdYang).get(xpath)
+ xpath = "/rw-project:project[rw-project:name='default']/vnfd-catalog/vnfd[id={}]".format(quoted_key(vnfd_id))
+ return proxy(RwProjectVnfdYang).get(xpath)
- vnfr = "/vnfr-catalog/vnfr"
+ vnfr = "/rw-project:project[rw-project:name='default']/vnfr-catalog/vnfr"
print ("START")
vnfrs = proxy(RwVnfrYang).get(vnfr, list_obj=True)
print ("STOP")
diff --git a/rwlaunchpad/ra/pytest/test_launchpad.py b/rwlaunchpad/ra/pytest/test_launchpad.py
index a6f5ae7..2a275bc 100644
--- a/rwlaunchpad/ra/pytest/test_launchpad.py
+++ b/rwlaunchpad/ra/pytest/test_launchpad.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
"""
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,12 +22,17 @@
@brief System test of basic launchpad functionality
"""
+import gi
import pytest
-import gi
gi.require_version('RwsdnalYang', '1.0')
from gi.repository import RwsdnalYang
+from gi.repository import RwSdnYang
+from gi.repository import RwRoAccountYang
+
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
@pytest.mark.setup('sdn')
@pytest.mark.feature('sdn')
@@ -40,11 +45,36 @@
SDN name and accout type.
'''
proxy = mgmt_session.proxy(RwsdnalYang)
- sdn_account = RwsdnalYang.SDNAccount(
+ sdn_account = RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList(
name=sdn_account_name,
account_type=sdn_account_type)
- xpath = "/sdn-accounts/sdn-account-list[name='%s']" % sdn_account_name
- proxy.create_config(xpath, sdn_account)
+ xpath = "/rw-project:project[rw-project:name='default']/sdn-accounts/sdn-account-list[name=%s]" % quoted_key(sdn_account_name)
+ proxy.replace_config(xpath, sdn_account)
+ sdn_account = proxy.get(xpath)
+
+ def test_create_openstack_sdn_account(self, mgmt_session, openstack_sdn_account_name, cloud_account):
+ '''Configure sdn account
+
+ Asserts:
+ SDN name and account type.
+ '''
+ proxy = mgmt_session.proxy(RwSdnYang)
+ sdn_account = RwSdnYang.YangData_RwProject_Project_Sdn_Account.from_dict({
+ 'name': openstack_sdn_account_name,
+ 'account_type': 'openstack',
+ 'openstack': {
+ 'admin': cloud_account.openstack.admin,
+ 'key': cloud_account.openstack.key,
+ 'secret': cloud_account.openstack.secret,
+ 'auth_url': cloud_account.openstack.auth_url,
+ 'tenant': cloud_account.openstack.tenant,
+ 'project_domain': cloud_account.openstack.project_domain,
+ 'user_domain': cloud_account.openstack.user_domain,
+ 'region': cloud_account.openstack.region,
+ }})
+
+ xpath = "/rw-project:project[rw-project:name='default']/sdn/account[name={}]".format(quoted_key(openstack_sdn_account_name))
+ proxy.replace_config(xpath, sdn_account)
sdn_account = proxy.get(xpath)
@pytest.mark.depends('sdn')
@@ -58,10 +88,23 @@
sdn_account.account_type is what was configured
'''
proxy = mgmt_session.proxy(RwsdnalYang)
- xpath = "/sdn-accounts/sdn-account-list[name='%s']" % sdn_account_name
+ xpath = "/rw-project:project[rw-project:name='default']/sdn-accounts/sdn-account-list[name=%s]" % quoted_key(sdn_account_name)
sdn_account = proxy.get_config(xpath)
assert sdn_account.account_type == sdn_account_type
+ def test_openstack_sdn_account_connection_status(self, mgmt_session, openstack_sdn_account_name):
+ '''Verify connection status on openstack sdn account
+
+ Asserts:
+ openstack sdn account is successfully connected
+ '''
+ proxy = mgmt_session.proxy(RwSdnYang)
+ proxy.wait_for(
+ '/rw-project:project[rw-project:name="default"]/sdn/account[name={}]/connection-status/status'.format(quoted_key(openstack_sdn_account_name)),
+ 'success',
+ timeout=30,
+ fail_on=['failure'])
+
@pytest.mark.teardown('sdn')
@pytest.mark.feature('sdn')
@pytest.mark.incremental
@@ -69,15 +112,22 @@
def test_delete_odl_sdn_account(self, mgmt_session, sdn_account_name):
'''Unconfigure sdn account'''
proxy = mgmt_session.proxy(RwsdnalYang)
- xpath = "/sdn-accounts/sdn-account-list[name='%s']" % sdn_account_name
+ xpath = "/rw-project:project[rw-project:name='default']/sdn-accounts/sdn-account-list[name=%s]" % quoted_key(sdn_account_name)
+ proxy.delete_config(xpath)
+
+ def test_delete_openstack_sdn_account(self, mgmt_session, openstack_sdn_account_name):
+ '''Unconfigure sdn account'''
+ proxy = mgmt_session.proxy(RwSdnYang)
+ xpath = '/rw-project:project[rw-project:name="default"]/sdn/account[name={}]'.format(quoted_key(openstack_sdn_account_name))
proxy.delete_config(xpath)
@pytest.mark.setup('launchpad')
+@pytest.mark.depends('sdn')
@pytest.mark.usefixtures('cloud_account')
@pytest.mark.incremental
class TestLaunchpadSetup:
- def test_create_cloud_accounts(self, mgmt_session, cloud_module, cloud_xpath, cloud_accounts):
+ def test_create_cloud_accounts(self, mgmt_session, cloud_module, cloud_xpath, cloud_accounts, l2_port_chaining, openstack_sdn_account_name):
'''Configure cloud accounts
Asserts:
@@ -85,16 +135,14 @@
'''
proxy = mgmt_session.proxy(cloud_module)
for cloud_account in cloud_accounts:
- xpath = '{}[name="{}"]'.format(cloud_xpath, cloud_account.name)
+ if l2_port_chaining:
+ cloud_account.sdn_account = openstack_sdn_account_name
+ xpath = '{}[name={}]'.format(cloud_xpath, quoted_key(cloud_account.name))
proxy.replace_config(xpath, cloud_account)
response = proxy.get(xpath)
assert response.name == cloud_account.name
assert response.account_type == cloud_account.account_type
-@pytest.mark.depends('launchpad')
-@pytest.mark.usefixtures('cloud_account')
-@pytest.mark.incremental
-class TestLaunchpad:
def test_account_connection_status(self, mgmt_session, cloud_module, cloud_xpath, cloud_accounts):
'''Verify connection status on each cloud account
@@ -104,11 +152,26 @@
proxy = mgmt_session.proxy(cloud_module)
for cloud_account in cloud_accounts:
proxy.wait_for(
- '{}[name="{}"]/connection-status/status'.format(cloud_xpath, cloud_account.name),
+ '{}[name={}]/connection-status/status'.format(cloud_xpath, quoted_key(cloud_account.name)),
'success',
timeout=30,
fail_on=['failure'])
+ @pytest.mark.feature('openmano')
+ def test_create_ro_accounts(self, mgmt_session, ro_accounts):
+ for name, ro_account in ro_accounts.items():
+ mgmt_session.proxy(RwRoAccountYang).create_config('/rw-project:project[rw-project:name="default"]/ro-account/account', ro_account)
+
+ @pytest.mark.feature('openmano')
+ def test_ro_account_connection_status(self, mgmt_session, ro_accounts):
+ for name, ro_account in ro_accounts.items():
+ mgmt_session.proxy(RwRoAccountYang).wait_for((
+ '/rw-project:project[rw-project:name="default"]'
+ '/ro-account-state/account[name={account_name}]/connection-status/status'
+ ).format(account_name=quoted_key(ro_account.name)),
+ 'success',
+ timeout=30,
+ fail_on=['failure'])
@pytest.mark.teardown('launchpad')
@pytest.mark.usefixtures('cloud_account')
@@ -118,5 +181,11 @@
'''Unconfigure cloud_account'''
proxy = mgmt_session.proxy(cloud_module)
for cloud_account in cloud_accounts:
- xpath = "{}[name='{}']".format(cloud_xpath, cloud_account.name)
+ xpath = "{}[name={}]".format(cloud_xpath, quoted_key(cloud_account.name))
proxy.delete_config(xpath)
+
+ @pytest.mark.feature('openmano')
+ def test_delete_ro_accounts(self, mgmt_session, ro_accounts):
+ for name, ro_account in ro_accounts.items():
+ xpath = "/rw-project:project[rw-project:name='default']/ro-account/account[name={}]"
+ mgmt_session.proxy(RwRoAccountYang).delete_config(xpath.format(quoted_key(name)))
diff --git a/rwlaunchpad/ra/pytest/test_start_standby.py b/rwlaunchpad/ra/pytest/test_start_standby.py
index cf0e5d9..80e4e7f 100755
--- a/rwlaunchpad/ra/pytest/test_start_standby.py
+++ b/rwlaunchpad/ra/pytest/test_start_standby.py
@@ -51,7 +51,7 @@
cmd_template = ("ssh_root {remote_ip} -q -o BatchMode=yes -o "
" UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -- "
- " \"rm -rf /tmp/corosync; cd {rift_install}; {rift_root}/rift-shell -e -- {rift_install}/usr/bin/rwmain -m /tmp/manifest.xml\"").format(
+ " \"rm -rf /tmp/corosync; cd {rift_install}; {rift_root}/rift-shell -- {rift_install}/usr/bin/rwmain -m /tmp/manifest.xml\"").format(
remote_ip=remote_ip,
rift_root=rift_root,
rift_install=rift_install)
diff --git a/rwlaunchpad/ra/racfg/complex_scaling.racfg b/rwlaunchpad/ra/racfg/complex_scaling.racfg
new file mode 100644
index 0000000..742b299
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/complex_scaling.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_COMPLEX_SCALING",
+ "commandline":"./complex_scaling --test-name 'TC_COMPLEX_SCALING' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --complex-scaling --multiple-ns-instantiate 0,0",
+ "test_description":"System test to perform a multi event test",
+ "allow_production_launchpad": true,
+ "run_as_root": true,
+ "status":"broken",
+ "keywords":["nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/embedded_images_vnf_multiple_accounts_systest_openstack.racfg b/rwlaunchpad/ra/racfg/embedded_images_vnf_multiple_accounts_systest_openstack.racfg
new file mode 100644
index 0000000..f6b4280
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/embedded_images_vnf_multiple_accounts_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_EMBEDDED_IMAGES_VNF_MULTIPLE_VIM_ACCOUNTS",
+ "commandline":"./accounts_creation_onboard_systest --test-name 'TC_EMBEDDED_IMAGES_VNF_MULTIPLE_VIM_ACCOUNTS' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --upload-images-multiple-accounts",
+ "test_description":"System test to check whether images embedded in VNF package get uploaded to all VIM accounts(Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"broken",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/gui_test_launchpad_ui.racfg b/rwlaunchpad/ra/racfg/gui_test_launchpad_ui.racfg
new file mode 100644
index 0000000..03c7577
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/gui_test_launchpad_ui.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_GUI_TEST_LAUNCHPAD",
+ "commandline":"./gui_test_launchpad_ui --test-name 'TC_GUI_TEST_LAUNCHPAD' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf",
+ "test_description":"System test to cehck the basic functionality of the ui",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"broken",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/ha_basics_systest.racfg b/rwlaunchpad/ra/racfg/ha_basics_systest.racfg
new file mode 100644
index 0000000..d2e151c
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/ha_basics_systest.racfg
@@ -0,0 +1,25 @@
+{
+ "test_name":"TC_HA_BASICS_TEST",
+ "commandline":"./ha_basics_systest --test-name 'TC_HA_BASICS_SYSTEMTEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf",
+ "test_description":"System test to validate HA failover between active, standby systems",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "target_vm":"lp_active",
+ "vms":[
+ {
+ "name": "lp_active",
+ "type": "container",
+ "modes":[]
+ },
+ {
+ "name": "lp_standby",
+ "type": "container",
+ "modes":[]
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/ha_deletion_operations.racfg b/rwlaunchpad/ra/racfg/ha_deletion_operations.racfg
new file mode 100644
index 0000000..6ffb2d4
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/ha_deletion_operations.racfg
@@ -0,0 +1,25 @@
+{
+ "test_name":"TC_HA_DELETION_OPERATIONS",
+ "commandline":"./ha_deletion_operations --test-name 'TC_HA_DELETION_OPERATIONS' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf",
+ "test_description":"System test to validate some deletion operations on the ha system",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"broken",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "target_vm":"lp_active",
+ "vms":[
+ {
+ "name": "lp_active",
+ "type": "container",
+ "modes":[]
+ },
+ {
+ "name": "lp_standby",
+ "type": "container",
+ "modes":[]
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/ha_multiple_failovers_systest.racfg b/rwlaunchpad/ra/racfg/ha_multiple_failovers_systest.racfg
new file mode 100644
index 0000000..952b7fb
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/ha_multiple_failovers_systest.racfg
@@ -0,0 +1,25 @@
+{
+ "test_name":"TC_HA_MULTIPLE_FAILOVERS_TEST",
+ "commandline":"./ha_multiple_failovers_systest --test-name 'TC_HA_MULTIPLE_FAILOVERS_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --ha-multiple-failovers",
+ "test_description":"System test to validate multiple HA failover between active, standby systems",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 3300,
+ "networks":[],
+ "target_vm":"lp_active",
+ "vms":[
+ {
+ "name": "lp_active",
+ "type": "container",
+ "modes":[]
+ },
+ {
+ "name": "lp_standby",
+ "type": "container",
+ "modes":[]
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/ha_nsr_systest.racfg b/rwlaunchpad/ra/racfg/ha_nsr_systest.racfg
new file mode 100644
index 0000000..da226bb
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/ha_nsr_systest.racfg
@@ -0,0 +1,25 @@
+{
+ "test_name":"TC_HA_NSR_TEST",
+ "commandline":"./ha_basics_systest --test-name 'TC_HA_NSR_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --nsr-test",
+ "test_description":"System test to validate HA failover between active, standby systems when NSRs are instantiated across different projects",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 3000,
+ "networks":[],
+ "target_vm":"lp_active",
+ "vms":[
+ {
+ "name": "lp_active",
+ "type": "container",
+ "modes":[]
+ },
+ {
+ "name": "lp_standby",
+ "type": "container",
+ "modes":[]
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/l2port_chaining_systest_openstack.racfg b/rwlaunchpad/ra/racfg/l2port_chaining_systest_openstack.racfg
new file mode 100644
index 0000000..70cdbe8
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/l2port_chaining_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_L2PORT_CHAINING",
+ "commandline":"./l2port_chaining_systest --test-name 'TC_L2PORT_CHAINING' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --l2-port-chaining",
+ "test_description":"System test to check L2 port chaining feature (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"broken",
+ "keywords":["nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/metadata_vdud_systest_openstack.racfg b/rwlaunchpad/ra/racfg/metadata_vdud_systest_openstack.racfg
new file mode 100644
index 0000000..2828b7b
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/metadata_vdud_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_METADATA_VDUD_CFGFILE",
+ "commandline":"./metadata_vdud_systest --test-name 'TC_METADATA_VDUD_CFGFILE' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --metadata-vdud-cfgfile",
+ "test_description":"System test to check metadata for vdud feature (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/multi_tenant_systest_openstack.racfg b/rwlaunchpad/ra/racfg/multi_tenant_systest_openstack.racfg
index c9adde4..287393a 100644
--- a/rwlaunchpad/ra/racfg/multi_tenant_systest_openstack.racfg
+++ b/rwlaunchpad/ra/racfg/multi_tenant_systest_openstack.racfg
@@ -3,9 +3,11 @@
"commandline":"./launchpad_systest --test-name 'TC_MULTI_TENANT_OPENSTACK' --cloud-type 'openstack' --cloud-host={cloud_host} --user={user} {tenants} --sysinfo",
"test_description":"System test for multiple tenants(Openstack)",
"required_tenants":2,
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
"run_as_root": false,
"status":"working",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "keywords":["ci","nightly","MANO","openstack"],
"timelimit": 1800,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/multivm_vnf_slb_systest.racfg b/rwlaunchpad/ra/racfg/multivm_vnf_slb_systest.racfg
index 2294b91..0bb35e7 100644
--- a/rwlaunchpad/ra/racfg/multivm_vnf_slb_systest.racfg
+++ b/rwlaunchpad/ra/racfg/multivm_vnf_slb_systest.racfg
@@ -4,7 +4,7 @@
"test_description":"System test for scriptable load balancer with Multi-VMs VNFs",
"run_as_root": false,
"status":"broken",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "keywords":["nightly","MANO","openstack"],
"timelimit": 2200,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/multivm_vnf_trafgen_systest.racfg b/rwlaunchpad/ra/racfg/multivm_vnf_trafgen_systest.racfg
index 3879146..e9aab34 100755
--- a/rwlaunchpad/ra/racfg/multivm_vnf_trafgen_systest.racfg
+++ b/rwlaunchpad/ra/racfg/multivm_vnf_trafgen_systest.racfg
@@ -4,7 +4,7 @@
"test_description":"System test for trafgen application with Multi-VMs VNFs",
"run_as_root": false,
"status":"broken",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "keywords":["nightly","MANO","openstack"],
"timelimit": 2200,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/ns_instantiate_memory_check.racfg b/rwlaunchpad/ra/racfg/ns_instantiate_memory_check.racfg
new file mode 100644
index 0000000..09f8059
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/ns_instantiate_memory_check.racfg
@@ -0,0 +1,17 @@
+{
+ "test_name":"TC_NS_INSTANTIATE_MEMORY_CHECK",
+ "commandline":"./ns_instantiate_memory_check_systest --test-name 'TC_NS_INSTANTIATE_MEMORY_CHECK' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --multiple-ns-instantiate 50,4",
+ "test_description":"instantiates and deletes VNFs while tracking memory utilization",
+ "run_as_root": true,
+ "status":"broken",
+ "keywords":["nightly","smoke","MANO","openstack"],
+ "timelimit": 21000,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
diff --git a/rwlaunchpad/ra/racfg/onboard_delete_vnfs_systest_openstack.racfg b/rwlaunchpad/ra/racfg/onboard_delete_vnfs_systest_openstack.racfg
new file mode 100644
index 0000000..bf3f81d
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/onboard_delete_vnfs_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_ONBOARD_DELETE_VNFS_RANDOMLY",
+ "commandline":"./onboard_delete_vnfs_systest --test-name 'TC_ONBOARD_DELETE_VNFS_RANDOMLY' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --vnf-onboard-delete 60,10",
+ "test_description":"System test to onboard and delete m VNFs randomly for n iterations (params passed as n,m)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"broken",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_accounts_systest.racfg b/rwlaunchpad/ra/racfg/pingpong_accounts_systest.racfg
new file mode 100644
index 0000000..fda21a4
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_accounts_systest.racfg
@@ -0,0 +1,33 @@
+{
+ "test_name":"TC_PINGPONG_ACCOUNTS_OPENSTACK",
+ "license": "Apache 2.0",
+ "commandline":"./pingpong_accounts_systest --test-name 'TC_PINGPONG_ACCOUNTS_OPENSTACK' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --restconf",
+ "test_description":"System test testing vim/ro instantiation (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"broken",
+ "keywords":["ci","nightly","smoke","MANO","openstack","docker"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ },
+ {
+ "name": "openmano-1",
+ "type": "container",
+ "image":"{registry}/ub16:openmano-v2.0",
+ "modes":[]
+ },
+ {
+ "name": "openmano-2",
+ "type": "container",
+ "image":"{registry}/ub16:openmano-v2.0",
+ "modes":[]
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_floating_ip.racfg b/rwlaunchpad/ra/racfg/pingpong_floating_ip.racfg
new file mode 100644
index 0000000..dab95c9
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_floating_ip.racfg
@@ -0,0 +1,18 @@
+{
+ "test_name":"TC_PINGPONG_FLOATING_IP",
+ "commandline":"./pingpong_floating_ip --test-name 'TC_PINGPONG_FLOATING_IP' --cloud-type 'openstack' --cloud-host={cloud_host} --user={user} {tenants}",
+ "test_description":"TC for testing the pingpong floating ip pools",
+ "allow_production_launchpad": true,
+ "status":"broken",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 4000,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_ha_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_ha_systest_openstack.racfg
new file mode 100644
index 0000000..10752a5
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_ha_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_PINGPONG_HA_OPENSTACK",
+ "commandline":"./pingpong_ha_systest --cloud-type 'openstack' --cloud-host={cloud_host} --user={user} {tenants}",
+ "test_description":"HA System Test that kills system components while running ping pong testcases",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": false,
+ "status":"broken",
+ "keywords":["nightly","MANO","openstack"],
+ "timelimit": 4000,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_input_params_systest.racfg b/rwlaunchpad/ra/racfg/pingpong_input_params_systest.racfg
new file mode 100644
index 0000000..2d689c7
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_input_params_systest.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_PINGPONG_INPUT_PARAMS_OPENSTACK",
+ "license": "Apache 2.0",
+ "commandline":"./pingpong_input_params_systest --test-name 'TC_PINGPONG_INPUT_PARAMS_OPENSTACK' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf",
+ "test_description":"System test to test vnf input parameters (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["ci","nightly","smoke","MANO","openstack","docker"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_lp_ha_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_lp_ha_systest_openstack.racfg
index 2887649..66c9d67 100644
--- a/rwlaunchpad/ra/racfg/pingpong_lp_ha_systest_openstack.racfg
+++ b/rwlaunchpad/ra/racfg/pingpong_lp_ha_systest_openstack.racfg
@@ -4,7 +4,7 @@
"test_description":"System test for standalone Launchpad (Openstack) with High availability",
"run_as_root": false,
"status":"broken",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "keywords":["nightly","MANO","openstack"],
"timelimit": 2600,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/pingpong_metadata_vdud_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_metadata_vdud_systest_openstack.racfg
new file mode 100644
index 0000000..ec5d309
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_metadata_vdud_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_METADATA_VDUD_CUSTOM_METADATA",
+ "commandline":"./accounts_creation_onboard_instatiate_systest --test-name 'TC_METADATA_VDUD_CUSTOM_METADATA' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --metadata-vdud",
+ "test_description":"System test to check metadata for vdud feature (Openstack). It doesn't cover config file copy check",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_mro_systest.racfg b/rwlaunchpad/ra/racfg/pingpong_mro_systest.racfg
new file mode 100644
index 0000000..88dd4ba
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_mro_systest.racfg
@@ -0,0 +1,33 @@
+{
+ "test_name":"TC_PINGPONG_MRO_OPENSTACK",
+ "license": "Apache 2.0",
+ "commandline":"./pingpong_mro_systest --test-name 'TC_PINGPONG_MRO_OPENSTACK' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --restconf",
+ "test_description":"System test for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"broken",
+ "keywords":["ci","nightly","smoke","MANO","openstack","docker"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ },
+ {
+ "name": "openmano_0",
+ "type": "container",
+ "image":"{registry}/ub16:openmano-v2.0",
+ "modes":[]
+ },
+ {
+ "name": "openmano_1",
+ "type": "container",
+ "image":"{registry}/ub16:openmano-v2.0",
+ "modes":[]
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_multidisk_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_multidisk_systest_openstack.racfg
new file mode 100644
index 0000000..a2d6b27
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_multidisk_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_PINGPONG_MULTIDISK",
+ "commandline":"./accounts_creation_onboard_instatiate_systest --test-name 'TC_PINGPONG_MULTIDISK' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --multidisk",
+ "test_description":"System test to check multidisk for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_multidisk_systest_openstack_xml.racfg b/rwlaunchpad/ra/racfg/pingpong_multidisk_systest_openstack_xml.racfg
new file mode 100644
index 0000000..017e267
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_multidisk_systest_openstack_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_PINGPONG_MULTIDISK_OPENSTACK_XML",
+ "commandline":"./accounts_creation_onboard_instatiate_systest --test-name 'TC_PINGPONG_MULTIDISK_OPENSTACK_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --multidisk --use-xml-mode",
+ "test_description":"System test to check multidisk for ping and pong vnf (Openstack) using xml-agent",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "xml_mode": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_port_sequencing_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_port_sequencing_systest_openstack.racfg
new file mode 100644
index 0000000..1c3ce85
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_port_sequencing_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_PINGPONG_EXPLICIT_PORT_SEQUENCING",
+ "commandline":"./accounts_creation_onboard_instatiate_systest_repeat_option --test-name 'TC_PINGPONG_EXPLICIT_PORT_SEQUENCING' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --port-sequencing",
+ "test_description":"System test to verify explicit port sequencings feature for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_port_sequencing_systest_openstack_xml.racfg b/rwlaunchpad/ra/racfg/pingpong_port_sequencing_systest_openstack_xml.racfg
new file mode 100644
index 0000000..ef4efe1
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_port_sequencing_systest_openstack_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_PINGPONG_XML_EXPLICIT_PORT_SEQUENCING",
+ "commandline":"./accounts_creation_onboard_instatiate_systest_repeat_option --test-name 'TC_PINGPONG_EXPLICIT_PORT_SEQUENCING' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --port-sequencing --use-xml-mode",
+ "test_description":"System test to verify explicit port sequencings feature for ping and pong vnf (Openstack) using xml-agent",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "xml_mode": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_portsecurity_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_portsecurity_systest_openstack.racfg
new file mode 100644
index 0000000..3843dbc
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_portsecurity_systest_openstack.racfg
@@ -0,0 +1,24 @@
+{
+ "test_name":"TC_PINGPONG_UNFILTERED_VIRTUAL_INTERFACE",
+ "commandline":"./accounts_creation_onboard_instatiate_systest --test-name 'TC_PINGPONG_UNFILTERED_VIRTUAL_INTERFACE' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --port-security",
+ "test_description":"System test to check unfiltered virtual interface for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "vim_host_override": "10.66.4.32",
+ "vim_ssl_enabled": false,
+ "vim_user_domain_override": "default",
+ "vim_project_domain_override": "default",
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_records_systest_cloudsim.racfg b/rwlaunchpad/ra/racfg/pingpong_records_systest_cloudsim.racfg
index 25e969f..ed3218c 100644
--- a/rwlaunchpad/ra/racfg/pingpong_records_systest_cloudsim.racfg
+++ b/rwlaunchpad/ra/racfg/pingpong_records_systest_cloudsim.racfg
@@ -2,9 +2,10 @@
"test_name":"TC_PINGPONG_RECORDS_CLOUDSIM",
"commandline":"./pingpong_records_systest --test-name 'TC_PINGPONG_RECORDS_CLOUDSIM' --sysinfo --netconf --restconf",
"test_description":"System test for ping and pong vnf (Cloudsim)",
+ "allow_rpm_install": true,
"run_as_root": true,
"status":"broken",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "keywords":["nightly","MANO","openstack"],
"timelimit": 2600,
"networks":[],
"target_vm":"rift_auto_launchpad",
diff --git a/rwlaunchpad/ra/racfg/pingpong_records_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_records_systest_openstack.racfg
index 63cee0d..271f270 100644
--- a/rwlaunchpad/ra/racfg/pingpong_records_systest_openstack.racfg
+++ b/rwlaunchpad/ra/racfg/pingpong_records_systest_openstack.racfg
@@ -1,11 +1,13 @@
{
- "license": "Apache 2.0",
"test_name":"TC_PINGPONG_RECORDS_OPENSTACK",
+ "license": "Apache 2.0",
"commandline":"./pingpong_records_systest --test-name 'TC_PINGPONG_RECORDS_OPENSTACK' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --restconf",
"test_description":"System test for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
"run_as_root": true,
"status":"working",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "keywords":["ci","nightly","smoke","MANO","openstack"],
"timelimit": 2600,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/pingpong_records_systest_openstack_xml.racfg b/rwlaunchpad/ra/racfg/pingpong_records_systest_openstack_xml.racfg
index 2c0853a..8826a86 100644
--- a/rwlaunchpad/ra/racfg/pingpong_records_systest_openstack_xml.racfg
+++ b/rwlaunchpad/ra/racfg/pingpong_records_systest_openstack_xml.racfg
@@ -1,11 +1,13 @@
{
- "license": "Apache 2.0",
"test_name":"TC_PINGPONG_RECORDS_OPENSTACK_XML",
+ "license": "Apache 2.0",
"commandline":"./pingpong_records_systest --test-name 'TC_PINGPONG_RECORDS_OPENSTACK_XML' --cloud-type 'openstack' --sysinfo --use-xml-mode --cloud-host={cloud_host} --user={user} {tenants} --restconf",
"test_description":"System test for ping and pong vnf (Openstack)",
"run_as_root": true,
+ "allow_production_launchpad": true,
+ "xml_mode": true,
"status":"working",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "keywords":["ci","nightly","MANO","openstack"],
"timelimit": 2600,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/pingpong_scaling_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_scaling_systest_openstack.racfg
index 7d6b30e..4a80c8a 100644
--- a/rwlaunchpad/ra/racfg/pingpong_scaling_systest_openstack.racfg
+++ b/rwlaunchpad/ra/racfg/pingpong_scaling_systest_openstack.racfg
@@ -2,10 +2,12 @@
"test_name":"TC_PINGPONG_SCALING_OPENSTACK",
"commandline":"./pingpong_scaling_systest --cloud-type 'openstack' --cloud-host={cloud_host} --user={user} {tenants}",
"test_description":"Scaling system test for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
"run_as_root": false,
"status":"broken",
- "keywords":["nightly","smoke","MANO","openstack"],
- "timelimit": 2200,
+ "keywords":["nightly","MANO","openstack"],
+ "timelimit": 4000,
"networks":[],
"vms":[
{
diff --git a/rwlaunchpad/ra/racfg/pingpong_staticip_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_staticip_systest_openstack.racfg
new file mode 100644
index 0000000..49cf741
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_staticip_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_PINGPONG_STATICIP",
+ "commandline":"./accounts_creation_onboard_instatiate_systest --test-name 'TC_PINGPONG_STATICIP' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --static-ip",
+ "test_description":"System test to check static-ip for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_staticip_systest_openstack_ipv6.racfg b/rwlaunchpad/ra/racfg/pingpong_staticip_systest_openstack_ipv6.racfg
new file mode 100644
index 0000000..27ae183
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_staticip_systest_openstack_ipv6.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_PINGPONG_STATICIP_IPV6",
+ "commandline":"./accounts_creation_onboard_instatiate_systest --test-name 'TC_PINGPONG_STATICIP_IPV6' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --static-ip --ipv6",
+ "test_description":"System test to check static-ip(ipv6) for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"broken",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_update_descriptors_instantiate_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_update_descriptors_instantiate_systest_openstack.racfg
new file mode 100644
index 0000000..e8e3deb
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_update_descriptors_instantiate_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_PINGPONG_UPDATE_DESCRIPTORS_INSTANTIATE",
+ "commandline":"./accounts_creation_onboard_instatiate_systest --test-name 'TC_PINGPONG_UPDATE_DESCRIPTORS_INSTANTIATE' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --update-vnfd-instantiate",
+ "test_description":"System test to update VNF descriptors and then instantiate NS for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_vnf_dependencies_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_vnf_dependencies_systest_openstack.racfg
new file mode 100644
index 0000000..ea84606
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_vnf_dependencies_systest_openstack.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_PINGPONG_VNF_DEPENDENCIES",
+ "commandline":"./accounts_creation_onboard_instatiate_systest --test-name 'TC_PINGPONG_VNF_DEPENDENCIES' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --vnf-dependencies",
+ "test_description":"System test to check vnf dependencies for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_vnf_dependencies_systest_openstack_xml.racfg b/rwlaunchpad/ra/racfg/pingpong_vnf_dependencies_systest_openstack_xml.racfg
new file mode 100644
index 0000000..9c112bf
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/pingpong_vnf_dependencies_systest_openstack_xml.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_PINGPONG_VNF_DEPENDENCIES_XML",
+ "commandline":"./accounts_creation_onboard_instatiate_systest --test-name 'TC_PINGPONG_VNF_DEPENDENCIES_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --use-xml-mode --user={user} {tenants} --restconf --vnf-dependencies",
+ "test_description":"System test to check vnf dependencies for ping and pong vnf (Openstack)",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "xml_mode": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/pingpong_vnf_reload_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_vnf_reload_systest_openstack.racfg
index 2f4388d..10d27c6 100644
--- a/rwlaunchpad/ra/racfg/pingpong_vnf_reload_systest_openstack.racfg
+++ b/rwlaunchpad/ra/racfg/pingpong_vnf_reload_systest_openstack.racfg
@@ -2,9 +2,11 @@
"test_name":"TC_PINGPONG_VNF_RELOAD_OPENSTACK",
"commandline":"./pingpong_vnf_reload_systest --test-name 'TC_PINGPONG_VNF_RELOAD_OPENSTACK' --cloud-type 'openstack' --sysinfo --cloud-host={cloud_host} --user={user} {tenants} --restconf",
"test_description":"System test for ping pong vnf reload(Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
"run_as_root": false,
- "status":"broken",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
"timelimit": 2200,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/pingpong_vnf_reload_systest_openstack_xml.racfg b/rwlaunchpad/ra/racfg/pingpong_vnf_reload_systest_openstack_xml.racfg
index 5ef343e..d2356cb 100644
--- a/rwlaunchpad/ra/racfg/pingpong_vnf_reload_systest_openstack_xml.racfg
+++ b/rwlaunchpad/ra/racfg/pingpong_vnf_reload_systest_openstack_xml.racfg
@@ -1,11 +1,13 @@
{
- "license": "Apache 2.0",
"test_name":"TC_PINGPONG_VNF_RELOAD_OPENSTACK_XML",
+ "license": "Apache 2.0",
"commandline":"./pingpong_vnf_reload_systest --test-name 'TC_PINGPONG_VNF_RELOAD_OPENSTACK_XML' --cloud-type 'openstack' --sysinfo --use-xml-mode --cloud-host={cloud_host} --user={user} {tenants} --restconf",
"test_description":"System test for ping pong vnf reload(Openstack)",
"run_as_root": false,
+ "allow_production_launchpad": true,
+ "xml_mode": true,
"status":"working",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "keywords":["ci","nightly","MANO","openstack"],
"timelimit": 2200,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/pingpong_vnf_systest_cloudsim.racfg b/rwlaunchpad/ra/racfg/pingpong_vnf_systest_cloudsim.racfg
index c2f8f0c..e29d2dc 100644
--- a/rwlaunchpad/ra/racfg/pingpong_vnf_systest_cloudsim.racfg
+++ b/rwlaunchpad/ra/racfg/pingpong_vnf_systest_cloudsim.racfg
@@ -3,9 +3,10 @@
"commandline":"./pingpong_vnf_systest --test-name 'TC_PINGPONG_VNF_CLOUDSIM'",
"target_vm":"VM",
"test_description":"System test for ping and pong vnf",
+ "allow_rpm_install": true,
"run_as_root": true,
"status":"broken",
- "keywords":["nightly","smoke","smoke_stable","MANO","cloudsim"],
+ "keywords":["nightly","MANO","cloudsim"],
"timelimit": 1800,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/pingpong_vnf_systest_openstack.racfg b/rwlaunchpad/ra/racfg/pingpong_vnf_systest_openstack.racfg
index 91cd1ad..e812798 100644
--- a/rwlaunchpad/ra/racfg/pingpong_vnf_systest_openstack.racfg
+++ b/rwlaunchpad/ra/racfg/pingpong_vnf_systest_openstack.racfg
@@ -2,9 +2,11 @@
"test_name":"TC_PINGPONG_VNF_OPENSTACK",
"commandline":"./pingpong_vnf_systest --test-name 'TC_PINGPONG_VNF_OPENSTACK' --cloud-type 'openstack' --cloud-host={cloud_host} --user={user} {tenants} --sysinfo",
"test_description":"System test for ping and pong vnf (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
"run_as_root": false,
"status":"broken",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "keywords":["nightly","MANO","openstack"],
"timelimit": 2200,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/primitives_systest.racfg b/rwlaunchpad/ra/racfg/primitives_systest.racfg
new file mode 100644
index 0000000..651aaa6
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/primitives_systest.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_PRIMITIVES",
+ "commandline":"./primitives_systest --test-name 'TC_PRIMITIVES' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --vnf-dependencies --service-primitive",
+ "test_description":"System test to check service primitives & config primitives",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["ci","nightly","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_account_roles_systest.racfg b/rwlaunchpad/ra/racfg/rbac_account_roles_systest.racfg
new file mode 100644
index 0000000..b77655a
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_account_roles_systest.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_ACCOUNT_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_RBAC_ACCOUNT_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --account-test",
+ "test_description":"System test to perform role based authorization check for cloud-account creation/deletion etc",
+ "allow_production_launchpad": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_account_roles_systest_restconf.racfg b/rwlaunchpad/ra/racfg/rbac_account_roles_systest_restconf.racfg
new file mode 100644
index 0000000..d82dc93
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_account_roles_systest_restconf.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_RBAC_ACCOUNT_ROLES_TEST_RESTCONF",
+ "commandline":"./rbac_roles_systest --test-name 'TC_RBAC_ACCOUNT_ROLES_TEST_RESTCONF' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --account-test",
+ "test_description":"RBAC-RESTCONF: System test to perform role based authorization check for cloud-account creation/deletion etc",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_basics_systest.racfg b/rwlaunchpad/ra/racfg/rbac_basics_systest.racfg
new file mode 100644
index 0000000..51300a8
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_basics_systest.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_BASICS_TEST",
+ "commandline":"./rbac_basics_systest --test-name 'TC_RBAC_BASICS_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf",
+ "test_description":"System test to perform rbac basics test",
+ "allow_production_launchpad": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_basics_systest_restconf.racfg b/rwlaunchpad/ra/racfg/rbac_basics_systest_restconf.racfg
new file mode 100644
index 0000000..3ee68ef
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_basics_systest_restconf.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_RBAC_BASICS_TEST_RESTCONF",
+ "commandline":"./rbac_basics_systest --test-name 'TC_RBAC_BASICS_TEST_RESTCONF' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf",
+ "test_description":"RBAC-RESTCONF: System test to perform rbac basics test",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_identity.racfg b/rwlaunchpad/ra/racfg/rbac_identity.racfg
new file mode 100644
index 0000000..259c389
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_identity.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_TEST_IDENTITY",
+ "commandline":"./rbac_identity --test-name 'TC_RBAC_TEST_IDENTITY' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf",
+ "test_description":"System test to perform rbac identity tests",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_mano_xpaths_access.racfg b/rwlaunchpad/ra/racfg/rbac_mano_xpaths_access.racfg
new file mode 100644
index 0000000..f22ca65
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_mano_xpaths_access.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_MANO_XPATHS_ACCESS_TEST",
+ "commandline":"./rbac_mano_xpaths_access --test-name 'TC_RBAC_MANO_XPATHS_ACCESS_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf",
+ "test_description":"System test to check whether Mano roles/Permission mapping works (Verifies only read access for all Xpaths)",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_mano_xpaths_access_restconf.racfg b/rwlaunchpad/ra/racfg/rbac_mano_xpaths_access_restconf.racfg
new file mode 100644
index 0000000..9d85fed
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_mano_xpaths_access_restconf.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_RBAC_MANO_XPATHS_ACCESS_TEST_RESTCONF",
+ "commandline":"./rbac_mano_xpaths_access --test-name 'TC_RBAC_MANO_XPATHS_ACCESS_TEST_RESTCONF' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf",
+ "test_description":"RBAC-RESTCONF: System test to check whether Mano roles/Permission mapping works (Verifies only read access for all Xpaths)",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_nsr_roles_systest.racfg b/rwlaunchpad/ra/racfg/rbac_nsr_roles_systest.racfg
new file mode 100644
index 0000000..2e63c44
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_nsr_roles_systest.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_NSR_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_RBAC_NSR_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --nsr-test",
+ "test_description":"System test to perform role based authorization check for NSR creation/termination etc",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_onboarding_roles_systest.racfg b/rwlaunchpad/ra/racfg/rbac_onboarding_roles_systest.racfg
new file mode 100644
index 0000000..e2d135f
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_onboarding_roles_systest.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_ONBOARDING_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_RBAC_ONBOARDING_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --onboarding-test",
+ "test_description":"System test to perform role based authorization check for onboarding/deleting descriptors etc",
+ "allow_production_launchpad": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_project_roles_systest.racfg b/rwlaunchpad/ra/racfg/rbac_project_roles_systest.racfg
new file mode 100644
index 0000000..7dcb6ae
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_project_roles_systest.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_PROJECT_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_RBAC_PROJECT_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --project-creation-test",
+ "test_description":"System test to perform role based authorization check for project creation/deletion etc",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_redundancy_config_roles_systest.racfg b/rwlaunchpad/ra/racfg/rbac_redundancy_config_roles_systest.racfg
new file mode 100644
index 0000000..cb9bf98
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_redundancy_config_roles_systest.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_REDUNDANCY_CONFIG_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_RBAC_REDUNDANCY_CONFIG_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --redundancy-role-test",
+ "test_description":"System test to perform role based authorization check for redundancy config creation/deletion etc",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_syslog_server_roles_systest.racfg b/rwlaunchpad/ra/racfg/rbac_syslog_server_roles_systest.racfg
new file mode 100644
index 0000000..4275900
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_syslog_server_roles_systest.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_SYSLOG_SERVER_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_RBAC_SYSLOG_SERVER_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --syslog-server-test",
+ "test_description":"System test to perform role based authorization check for setting/reading syslog server address",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_usage_scenarios_systest.racfg b/rwlaunchpad/ra/racfg/rbac_usage_scenarios_systest.racfg
new file mode 100644
index 0000000..2a7ab43
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_usage_scenarios_systest.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_USAGE_SCENARIOS_TEST",
+ "commandline":"./rbac_usage_scenarios_systest --test-name 'TC_RBAC_USAGE_SCENARIOS_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf",
+ "test_description":"System test to perform rbac usage scenarios",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_usage_scenarios_systest_restconf.racfg b/rwlaunchpad/ra/racfg/rbac_usage_scenarios_systest_restconf.racfg
new file mode 100644
index 0000000..3c77d2d
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_usage_scenarios_systest_restconf.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_RBAC_USAGE_SCENARIOS_TEST_RESTCONF",
+ "commandline":"./rbac_usage_scenarios_systest --test-name 'TC_RBAC_USAGE_SCENARIOS_TEST_RESTCONF' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf",
+ "test_description":"RBAC-RESTCONF: System test to perform rbac usage scenarios",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/rbac_user_roles_systest.racfg b/rwlaunchpad/ra/racfg/rbac_user_roles_systest.racfg
new file mode 100644
index 0000000..79c6202
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/rbac_user_roles_systest.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_RBAC_USER_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_RBAC_USER_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf --user-creation-test",
+ "test_description":"System test to perform role based authorization check for user creation/deletion etc",
+ "allow_production_launchpad": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/recovery_systest.racfg b/rwlaunchpad/ra/racfg/recovery_systest.racfg
index 6d0db13..d2d043e 100644
--- a/rwlaunchpad/ra/racfg/recovery_systest.racfg
+++ b/rwlaunchpad/ra/racfg/recovery_systest.racfg
@@ -2,9 +2,11 @@
"test_name":"TC_TASKLET_RECOVERY_OPENSTACK",
"commandline":"./pingpong_recovery_systest --test-name 'TC_TASKLET_RECOVERY_OPENSTACK' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --netconf",
"test_description":"System test for testing the DTS recovery feature of tasklets (Openstack)",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
"run_as_root": false,
- "status":"working",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "status":"broken",
+ "keywords":["nightly","MANO","openstack"],
"timelimit": 2200,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/scaling_systest.racfg b/rwlaunchpad/ra/racfg/scaling_systest.racfg
index 2d8744d..6d514d9 100644
--- a/rwlaunchpad/ra/racfg/scaling_systest.racfg
+++ b/rwlaunchpad/ra/racfg/scaling_systest.racfg
@@ -1,10 +1,11 @@
{
"test_name":"TC_SCALING_OPENSTACK",
- "commandline":"./scaling_systest --test-name 'TC_SCALING_OPENSTACK' --cloud-type 'openstack' --cloud-host={cloud_host} --tenant={tenant} --sysinfo",
+ "commandline":"./scaling_systest --test-name 'TC_SCALING_OPENSTACK' --cloud-type 'openstack' --cloud-host={cloud_host} --user={user} {tenants} --sysinfo",
"test_description":"System test for scaling HAProxy vnf (Openstack)",
+ "allow_rpm_install": true,
"run_as_root": false,
"status":"broken",
- "keywords":["nightly","smoke","MANO","openstack"],
+ "keywords":["nightly","MANO","openstack"],
"timelimit": 2200,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/ra/racfg/tbac_account_roles_systest.racfg b/rwlaunchpad/ra/racfg/tbac_account_roles_systest.racfg
new file mode 100644
index 0000000..5a0e6dc
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_account_roles_systest.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_ACCOUNT_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_ACCOUNT_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --account-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for cloud-account creation/deletion etc",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_account_roles_systest_xml.racfg b/rwlaunchpad/ra/racfg/tbac_account_roles_systest_xml.racfg
new file mode 100644
index 0000000..11bce42
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_account_roles_systest_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_TBAC_ACCOUNT_ROLES_TEST_XML",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_ACCOUNT_ROLES_TEST_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --account-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for cloud-account creation/deletion etc",
+ "allow_production_launchpad": true,
+ "xml_mode": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_basics_systest.racfg b/rwlaunchpad/ra/racfg/tbac_basics_systest.racfg
new file mode 100644
index 0000000..d859e45
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_basics_systest.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_BASICS_TEST",
+ "commandline":"./rbac_basics_systest --test-name 'TC_TBAC_BASICS_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --tbac",
+ "test_description":"TBAC: System test to perform rbac basics test",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_basics_systest_xml.racfg b/rwlaunchpad/ra/racfg/tbac_basics_systest_xml.racfg
new file mode 100644
index 0000000..8d039ac
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_basics_systest_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_TBAC_BASICS_TEST_XML",
+ "commandline":"./rbac_basics_systest --test-name 'TC_TBAC_BASICS_TEST_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --tbac",
+ "test_description":"TBAC: System test to perform rbac basics test",
+ "allow_production_launchpad": true,
+ "xml_mode": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_identity.racfg b/rwlaunchpad/ra/racfg/tbac_identity.racfg
new file mode 100644
index 0000000..612d12c
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_identity.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_TEST_IDENTITY",
+ "commandline":"./rbac_identity --test-name 'TC_TBAC_TEST_IDENTITY' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --tbac",
+ "test_description":"TBAC: System test to perform rbac identity tests",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_identity_xml.racfg b/rwlaunchpad/ra/racfg/tbac_identity_xml.racfg
new file mode 100644
index 0000000..034df0b
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_identity_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_TBAC_TEST_IDENTITY_XML",
+ "commandline":"./rbac_identity --test-name 'TC_TBAC_TEST_IDENTITY_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --tbac",
+ "test_description":"TBAC: System test to perform rbac identity tests",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "xml_mode": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_mano_xpaths_access.racfg b/rwlaunchpad/ra/racfg/tbac_mano_xpaths_access.racfg
new file mode 100644
index 0000000..71821b2
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_mano_xpaths_access.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_MANO_XPATHS_ACCESS_TEST",
+ "commandline":"./rbac_mano_xpaths_access --test-name 'TC_TBAC_MANO_XPATHS_ACCESS_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --tbac",
+ "test_description":"TBAC: System test to check whether Mano roles/Permission mapping works (Verifies only read access for all Xpaths)",
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_mano_xpaths_access_xml.racfg b/rwlaunchpad/ra/racfg/tbac_mano_xpaths_access_xml.racfg
new file mode 100644
index 0000000..cf11a97
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_mano_xpaths_access_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_TBAC_MANO_XPATHS_ACCESS_TEST_XML",
+ "commandline":"./rbac_mano_xpaths_access --test-name 'TC_TBAC_MANO_XPATHS_ACCESS_TEST_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --tbac",
+ "test_description":"TBAC: System test to check whether Mano roles/Permission mapping works (Verifies only read access for all Xpaths)",
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "xml_mode": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_nsr_roles_systest.racfg b/rwlaunchpad/ra/racfg/tbac_nsr_roles_systest.racfg
new file mode 100644
index 0000000..f6ef8e1
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_nsr_roles_systest.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_NSR_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_NSR_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --nsr-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for NSR creation/termination etc",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_nsr_roles_systest_xml.racfg b/rwlaunchpad/ra/racfg/tbac_nsr_roles_systest_xml.racfg
new file mode 100644
index 0000000..c900bf9
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_nsr_roles_systest_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_TBAC_NSR_ROLES_TEST_XML",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_NSR_ROLES_TEST_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --nsr-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for NSR creation/termination etc",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "xml_mode": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_onboarding_roles_systest.racfg b/rwlaunchpad/ra/racfg/tbac_onboarding_roles_systest.racfg
new file mode 100644
index 0000000..d75c6b9
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_onboarding_roles_systest.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_ONBOARDING_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_ONBOARDING_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --onboarding-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for onboarding/deleting descriptors etc",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_onboarding_roles_systest_xml.racfg b/rwlaunchpad/ra/racfg/tbac_onboarding_roles_systest_xml.racfg
new file mode 100644
index 0000000..e5c3e51
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_onboarding_roles_systest_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_TBAC_ONBOARDING_ROLES_TEST_XML",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_ONBOARDING_ROLES_TEST_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --onboarding-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for onboarding/deleting descriptors etc",
+ "allow_production_launchpad": true,
+ "xml_mode": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_project_roles_systest.racfg b/rwlaunchpad/ra/racfg/tbac_project_roles_systest.racfg
new file mode 100644
index 0000000..e9090c8
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_project_roles_systest.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_PROJECT_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_PROJECT_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --project-creation-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for project creation/deletion etc",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_project_roles_systest_xml.racfg b/rwlaunchpad/ra/racfg/tbac_project_roles_systest_xml.racfg
new file mode 100644
index 0000000..8af33c5
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_project_roles_systest_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_TBAC_PROJECT_ROLES_TEST_XML",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_PROJECT_ROLES_TEST_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --project-creation-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for project creation/deletion etc",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "xml_mode": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_syslog_server_roles_systest.racfg b/rwlaunchpad/ra/racfg/tbac_syslog_server_roles_systest.racfg
new file mode 100644
index 0000000..26b1c9b
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_syslog_server_roles_systest.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_SYSLOG_SERVER_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_SYSLOG_SERVER_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --syslog-server-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for setting/reading syslog server address",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_syslog_server_roles_systest_xml.racfg b/rwlaunchpad/ra/racfg/tbac_syslog_server_roles_systest_xml.racfg
new file mode 100644
index 0000000..a8f1e31
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_syslog_server_roles_systest_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_TBAC_SYSLOG_SERVER_ROLES_TEST_XML",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_SYSLOG_SERVER_ROLES_TEST_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --syslog-server-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for setting/reading syslog server address",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "xml_mode": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_token.racfg b/rwlaunchpad/ra/racfg/tbac_token.racfg
new file mode 100644
index 0000000..c9adead
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_token.racfg
@@ -0,0 +1,19 @@
+{
+ "test_name":"TC_TBAC_TOKEN",
+ "commandline":"./tbac_token --test-name 'TC_TBAC_TOKEN' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --tbac",
+ "test_description":"System test to perform tbac token tests",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_token_xml.racfg b/rwlaunchpad/ra/racfg/tbac_token_xml.racfg
new file mode 100644
index 0000000..49969a2
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_token_xml.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_TOKEN_XML",
+ "commandline":"./tbac_token --test-name 'TC_TBAC_TOKEN_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --tbac",
+ "test_description":"System test to perform tbac token tests",
+ "run_as_root": true,
+ "allow_production_launchpad": true,
+ "xml_mode": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_usage_scenarios_systest.racfg b/rwlaunchpad/ra/racfg/tbac_usage_scenarios_systest.racfg
new file mode 100644
index 0000000..1700ad4
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_usage_scenarios_systest.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_USAGE_SCENARIOS_TEST",
+ "commandline":"./rbac_usage_scenarios_systest --test-name 'TC_TBAC_USAGE_SCENARIOS_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --tbac",
+ "test_description":"TBAC: System test to perform rbac usage scenarios",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_usage_scenarios_systest_xml.racfg b/rwlaunchpad/ra/racfg/tbac_usage_scenarios_systest_xml.racfg
new file mode 100644
index 0000000..69dbf73
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_usage_scenarios_systest_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_TBAC_USAGE_SCENARIOS_TEST_XML",
+ "commandline":"./rbac_usage_scenarios_systest --test-name 'TC_TBAC_USAGE_SCENARIOS_TEST_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --tbac",
+ "test_description":"TBAC: System test to perform rbac usage scenarios",
+ "run_as_root": true,
+ "allow_rpm_install":true,
+ "allow_production_launchpad":true,
+ "xml_mode": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_user_roles_systest.racfg b/rwlaunchpad/ra/racfg/tbac_user_roles_systest.racfg
new file mode 100644
index 0000000..632e181
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_user_roles_systest.racfg
@@ -0,0 +1,20 @@
+{
+ "test_name":"TC_TBAC_USER_ROLES_TEST",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_USER_ROLES_TEST' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --user-creation-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for user creation/deletion etc",
+ "allow_production_launchpad": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/racfg/tbac_user_roles_systest_xml.racfg b/rwlaunchpad/ra/racfg/tbac_user_roles_systest_xml.racfg
new file mode 100644
index 0000000..089e330
--- /dev/null
+++ b/rwlaunchpad/ra/racfg/tbac_user_roles_systest_xml.racfg
@@ -0,0 +1,21 @@
+{
+ "test_name":"TC_TBAC_USER_ROLES_TEST_XML",
+ "commandline":"./rbac_roles_systest --test-name 'TC_TBAC_USER_ROLES_TEST_XML' --cloud-type 'openstack' --cloud-host={cloud_host} --sysinfo --user={user} {tenants} --restconf --user-creation-test --tbac",
+ "test_description":"TBAC: System test to perform role based authorization check for user creation/deletion etc",
+ "allow_production_launchpad": true,
+ "xml_mode": true,
+ "allow_rpm_install": true,
+ "run_as_root": true,
+ "status":"working",
+ "keywords":["nightly","ci","MANO","openstack"],
+ "timelimit": 2600,
+ "networks":[],
+ "vms":[
+ {
+ "name": "rift_auto_launchpad",
+ "memory": 4096,
+ "cpus": 2
+ }
+ ]
+}
+
diff --git a/rwlaunchpad/ra/rbac_basics_systest b/rwlaunchpad/ra/rbac_basics_systest
new file mode 100755
index 0000000..9e6a1aa
--- /dev/null
+++ b/rwlaunchpad/ra/rbac_basics_systest
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider -k 'not (test_delete_projects or test_delete_users)' \
+ ${PYTEST_DIR}/system/ns/rbac/test_rbac.py"
+
+REBOOT_SCRIPT_TEST="py.test -x -v -p no:cacheprovider -k 'TestRbacVerification or (Teardown and not test_delete_default_project)' \
+ ${PYTEST_DIR}/system/ns/rbac/test_rbac.py --default-project-deleted"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+echo "############### test_cmd - ", $test_cmd
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/rbac_identity b/rwlaunchpad/ra/rbac_identity
new file mode 100755
index 0000000..42c2159
--- /dev/null
+++ b/rwlaunchpad/ra/rbac_identity
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/ns/rbac/test_rbac_identity.py"
+
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/rbac_mano_xpaths_access b/rwlaunchpad/ra/rbac_mano_xpaths_access
new file mode 100755
index 0000000..91b73cd
--- /dev/null
+++ b/rwlaunchpad/ra/rbac_mano_xpaths_access
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider ${PYTEST_DIR}/system/test_launchpad.py ${PYTEST_DIR}/system/ns/test_onboard.py ${PYTEST_DIR}/system/ns/rbac/test_rbac_mano_xpath_access.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+echo "############### test_cmd - ", $test_cmd
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/rbac_roles_systest b/rwlaunchpad/ra/rbac_roles_systest
new file mode 100755
index 0000000..1e1a014
--- /dev/null
+++ b/rwlaunchpad/ra/rbac_roles_systest
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider ${PYTEST_DIR}/system/ns/rbac/test_rbac_roles.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/rbac_usage_scenarios_systest b/rwlaunchpad/ra/rbac_usage_scenarios_systest
new file mode 100755
index 0000000..730cdc1
--- /dev/null
+++ b/rwlaunchpad/ra/rbac_usage_scenarios_systest
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider ${PYTEST_DIR}/system/ns/rbac/test_rbac_usages.py"
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/ra/tbac_token b/rwlaunchpad/ra/tbac_token
new file mode 100755
index 0000000..f9c8168
--- /dev/null
+++ b/rwlaunchpad/ra/tbac_token
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# Copyright 2017 RIFT.IO Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source $RIFT_INSTALL/usr/rift/systemtest/util/mano/mano_common.sh
+
+# Helper script for invoking the mission control system test using the systest_wrapper
+SCRIPT_TEST="py.test -x -v -p no:cacheprovider \
+ ${PYTEST_DIR}/system/ns/rbac/test_tbac_token.py"
+
+
+test_cmd=""
+
+# Parse commonline argument and set test variables
+parse_args "${@}"
+
+# Construct the test command based on the test variables
+construct_test_command
+
+# Execute from pytest root directory to pick up conftest.py
+cd "${PYTEST_DIR}"
+
+eval ${test_cmd}
diff --git a/rwlaunchpad/test/CMakeLists.txt b/rwlaunchpad/test/CMakeLists.txt
index 1c18e26..c84f056 100644
--- a/rwlaunchpad/test/CMakeLists.txt
+++ b/rwlaunchpad/test/CMakeLists.txt
@@ -23,7 +23,7 @@
PROGRAMS
launchpad.py
DESTINATION demos
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
)
install(
@@ -31,7 +31,7 @@
pytest/lp_test.py
DESTINATION
usr/rift/systemtest/pytest/launchpad
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
)
install(
@@ -39,14 +39,14 @@
launchpad_recovery
DESTINATION
usr/rift/systemtest/launchpad
- COMPONENT ${PKG_LONG_NAME}
+ COMPONENT ${INSTALL_COMPONENT}
)
install(
PROGRAMS
launchpad
DESTINATION usr/bin
- COMPONENT rwcal-1.0
+ COMPONENT ${INSTALL_COMPONENT}
)
rift_py3test(utest_rwmonitor
diff --git a/rwlaunchpad/test/launchpad.py b/rwlaunchpad/test/launchpad.py
index 98680ba..89c00ab 100755
--- a/rwlaunchpad/test/launchpad.py
+++ b/rwlaunchpad/test/launchpad.py
@@ -40,8 +40,23 @@
from rift.vcs.ext import ClassProperty
+
logger = logging.getLogger(__name__)
+IDP_PORT_NUMBER = "8009"
+
+def get_launchpad_address():
+ # Search for externally accessible IP address with netifaces
+ gateways = netifaces.gateways()
+ # Check for default route facing interface and then get its ip address
+ if 'default' in gateways:
+ interface = gateways['default'][netifaces.AF_INET][1]
+ launchpad_ip_address = netifaces.ifaddresses(interface)[netifaces.AF_INET][0]['addr']
+ else:
+ # no default gateway. Revert to 127.0.0.1
+ launchpad_ip_address = "127.0.0.1"
+
+ return launchpad_ip_address
class NsmTasklet(rift.vcs.core.Tasklet):
"""
@@ -52,6 +67,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a NsmTasklet object.
@@ -64,6 +80,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwnsmtasklet')
@@ -79,6 +96,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a VnsTasklet object.
@@ -91,6 +109,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwvnstasklet')
@@ -106,6 +125,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a VnfmTasklet object.
@@ -118,6 +138,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwvnfmtasklet')
@@ -133,6 +154,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a ResMgrTasklet object.
@@ -145,6 +167,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwresmgrtasklet')
@@ -160,6 +183,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a Image Manager Tasklet object.
@@ -173,6 +197,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwimagemgrtasklet')
@@ -188,6 +213,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a MonitorTasklet object.
@@ -201,6 +227,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwmonitor')
@@ -211,6 +238,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ANY_VM.value,
):
super(RedisServer, self).__init__(
name=name,
@@ -218,6 +246,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
@property
@@ -235,6 +264,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a MonitoringParameterTasklet object.
@@ -248,6 +278,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwmonparam')
@@ -264,6 +295,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a MonitoringParameterTasklet object.
@@ -277,6 +309,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwautoscaler')
@@ -291,6 +324,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a StagingMangerTasklet object.
@@ -304,32 +338,20 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwstagingmgr')
plugin_name = ClassProperty('rwstagingmgr')
-def get_ui_ssl_args():
- """Returns the SSL parameter string for launchpad UI processes"""
-
- try:
- use_ssl, certfile_path, keyfile_path = certs.get_bootstrap_cert_and_key()
- except certs.BootstrapSslMissingException:
- logger.error('No bootstrap certificates found. Disabling UI SSL')
- use_ssl = False
-
- # If we're not using SSL, no SSL arguments are necessary
- if not use_ssl:
- return ""
-
- return "--enable-https --keyfile-path=%s --certfile-path=%s" % (keyfile_path, certfile_path)
-
class UIServer(rift.vcs.NativeProcess):
def __init__(self, name="RW.MC.UI",
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
+ external_address=None,
):
super(UIServer, self).__init__(
name=name,
@@ -337,11 +359,40 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
+ self._external_address = external_address
@property
def args(self):
- return get_ui_ssl_args()
+ return self._get_ui_args()
+
+ def _get_ui_args(self):
+ """Returns the SSL parameter string for launchpad UI processes"""
+
+ try:
+ use_ssl, certfile_path, keyfile_path = certs.get_bootstrap_cert_and_key()
+ except certs.BootstrapSslMissingException:
+ logger.error('No bootstrap certificates found. Disabling UI SSL')
+ use_ssl = False
+
+ # If we're not using SSL, no SSL arguments are necessary
+ if not use_ssl:
+ return ""
+
+ # If an external address is set, take that value for launchpad IP
+ # address, else use the internal IP address used for default route
+ launchpad_ip_address = self._external_address
+ if not launchpad_ip_address:
+ launchpad_ip_address = get_launchpad_address()
+
+ return "--enable-https" +\
+ " --keyfile-path={}".format(keyfile_path) +\
+ " --certfile-path={}".format(certfile_path) +\
+ " --launchpad-address={}".format(launchpad_ip_address) +\
+ " --idp-port-number={}".format(IDP_PORT_NUMBER) +\
+ " --callback-address={}".format(launchpad_ip_address)
+
class ConfigManagerTasklet(rift.vcs.core.Tasklet):
"""
@@ -352,6 +403,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a ConfigManagerTasklet object.
@@ -364,11 +416,42 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwconmantasklet')
plugin_name = ClassProperty('rwconmantasklet')
+
+class ProjectMgrManoTasklet(rift.vcs.core.Tasklet):
+ """
+ This class represents a Resource Manager tasklet.
+ """
+
+ def __init__(self, name='Project-Manager-Mano', uid=None,
+ config_ready=True,
+ recovery_action=core.RecoveryType.FAILCRITICAL.value,
+ data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
+ ):
+ """
+ Creates a ProjectMgrManoTasklet object.
+
+ Arguments:
+ name - the name of the tasklet
+ uid - a unique identifier
+ """
+ super(ProjectMgrManoTasklet, self).__init__(name=name, uid=uid,
+ config_ready=config_ready,
+ recovery_action=recovery_action,
+ data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
+ )
+
+ plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwprojectmano')
+ plugin_name = ClassProperty('rwprojectmano')
+
+
class PackageManagerTasklet(rift.vcs.core.Tasklet):
"""
This class represents a Resource Manager tasklet.
@@ -378,6 +461,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
"""
Creates a PackageManager object.
@@ -390,6 +474,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
plugin_directory = ClassProperty('./usr/lib/rift/plugins/rwpkgmgr')
@@ -400,6 +485,7 @@
config_ready=True,
recovery_action=core.RecoveryType.FAILCRITICAL.value,
data_storetype=core.DataStore.NOSTORE.value,
+ ha_startup_mode=core.HaStartup.ONLY_ACTIVE.value,
):
super(GlanceServer, self).__init__(
name=name,
@@ -407,6 +493,7 @@
config_ready=config_ready,
recovery_action=recovery_action,
data_storetype=data_storetype,
+ ha_startup_mode=ha_startup_mode,
)
@property
@@ -415,71 +502,88 @@
class Demo(rift.vcs.demo.Demo):
- def __init__(self, no_ui=False, ha_mode=None, mgmt_ip_list=[], test_name=None):
- procs = [
- ConfigManagerTasklet(),
- GlanceServer(),
- rift.vcs.DtsRouterTasklet(),
- rift.vcs.MsgBrokerTasklet(),
- rift.vcs.RestPortForwardTasklet(),
- rift.vcs.RestconfTasklet(),
- rift.vcs.RiftCli(),
- rift.vcs.uAgentTasklet(),
- rift.vcs.Launchpad(),
- ]
-
- standby_procs = [
- RedisServer(),
- rift.vcs.DtsRouterTasklet(),
- rift.vcs.MsgBrokerTasklet(),
- ]
+ def __init__(self, no_ui=False,
+ data_store=None,
+ mgmt_ip_list=[],
+ test_name=None,
+ start_auth_svc=None,
+ start_pam_svc=None,
+ external_address=None):
datastore = core.DataStore.BDB.value
- if ha_mode:
- procs.append(RedisServer())
+ if data_store == "Redis":
datastore = core.DataStore.REDIS.value
+ elif data_store == "None":
+ datastore = core.DataStore.NOSTORE.value
+
+ restart_db_active = {"recovery_action" : core.RecoveryType.RESTART.value, \
+ "data_storetype" : datastore, \
+ "ha_startup_mode" : core.HaStartup.ONLY_ACTIVE.value}
+
+ failcrit_db_active = {"recovery_action" : core.RecoveryType.FAILCRITICAL.value, \
+ "data_storetype" : datastore, \
+ "ha_startup_mode" : core.HaStartup.ONLY_ACTIVE.value}
+
+ failcrit_db_any = {"recovery_action" : core.RecoveryType.FAILCRITICAL.value, \
+ "data_storetype" : datastore, \
+ "ha_startup_mode" : core.HaStartup.ANY_VM.value}
+
+ procs = [
+ ConfigManagerTasklet(**failcrit_db_active),
+ GlanceServer(**failcrit_db_active),
+ rift.vcs.DtsRouterTasklet(**failcrit_db_any),
+ rift.vcs.MsgBrokerTasklet(**failcrit_db_any),
+ rift.vcs.RestconfTasklet(**failcrit_db_active),
+ rift.vcs.RiftCli(**failcrit_db_active, as_console=True),
+ rift.vcs.uAgentTasklet(**failcrit_db_any),
+ rift.vcs.Launchpad(**failcrit_db_active),
+ rift.vcs.IdentityManagerTasklet(**failcrit_db_active),
+ rift.vcs.ProjectManagerTasklet(**failcrit_db_active),
+ rift.vcs.HAManager(**failcrit_db_any),
+ rift.vcs.OpenIDCProviderTasklet(**failcrit_db_active),
+ rift.vcs.AuthExtUserTasklet(**failcrit_db_active),
+ rift.vcs.OTTAuthTasklet(**failcrit_db_active),
+ NsmTasklet(**failcrit_db_active),
+ VnfmTasklet(**failcrit_db_active),
+ VnsTasklet(**failcrit_db_active),
+ ResMgrTasklet(**failcrit_db_active),
+ ImageMgrTasklet(**failcrit_db_active),
+ AutoscalerTasklet(**failcrit_db_active),
+ StagingManagerTasklet(**failcrit_db_active),
+ PackageManagerTasklet(**failcrit_db_active),
+ MonitoringParameterTasklet(**failcrit_db_active),
+ ProjectMgrManoTasklet(**failcrit_db_active)
+ ]
+
+ if datastore == core.DataStore.REDIS.value:
+ procs.append(RedisServer(**failcrit_db_any))
if not no_ui:
- procs.append(UIServer())
+ procs.append(UIServer(external_address=external_address))
- restart_procs = [
- VnfmTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore),
- VnsTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore),
- # MonitorTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore),
- MonitoringParameterTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore),
- NsmTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore),
- ResMgrTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore),
- ImageMgrTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore),
- AutoscalerTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore),
- PackageManagerTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore),
- StagingManagerTasklet(recovery_action=core.RecoveryType.RESTART.value, data_storetype=datastore),
- ]
+ if start_auth_svc:
+ procs.append(rift.vcs.WebAuthSvcTasklet(**failcrit_db_active))
+
+ if start_pam_svc:
+ procs.append(rift.vcs.PAMAuthTasklet())
+
+ restart_procs = []
if not mgmt_ip_list or len(mgmt_ip_list) == 0:
- mgmt_ip_list.append("127.0.0.1")
+ mgmt_ip_list.append(get_launchpad_address())
colony = rift.vcs.core.Colony(name='top', uid=1)
-
- lead_lp_vm = rift.vcs.VirtualMachine(
- name='vm-launchpad-1',
- ip=mgmt_ip_list[0],
- procs=procs,
- restart_procs=restart_procs,
- )
- lead_lp_vm.leader = True
- colony.append(lead_lp_vm)
-
- if ha_mode:
- stby_lp_vm = rift.vcs.VirtualMachine(
- name='launchpad-vm-2',
- ip=mgmt_ip_list[1],
- procs=standby_procs,
- start=False,
- )
- # WA to Agent mode_active flag reset
- stby_lp_vm.add_tasklet(rift.vcs.uAgentTasklet(), mode_active=False)
- colony.append(stby_lp_vm)
-
+ leader = 0
+ for mgmt_ip in mgmt_ip_list:
+ vm = rift.vcs.VirtualMachine(name='mgmt-vm-lp',
+ ip=mgmt_ip,
+ procs=procs,
+ restart_procs=restart_procs,start=False,)
+ if (leader == 0):
+ vm.leader = True
+ leader = 1
+ colony.append(vm)
+
sysinfo = rift.vcs.SystemInfo(
mode='ethsim',
zookeeper=rift.vcs.manifest.RaZookeeper(master_ip=mgmt_ip_list[0]),
@@ -518,15 +622,38 @@
# Create a parser which includes all generic demo arguments
parser = rift.vcs.demo.DemoArgParser()
parser.add_argument("--no-ui", action='store_true')
+ parser.add_argument("--start-auth-svc",
+ action='store_true',
+ help="Start the Web Based Authentication service simualtor.")
+ parser.add_argument("--start-pam-svc",
+ action='store_true',
+ help="Start the PAM Authentication service.")
+ parser.add_argument("--external-address",
+ type=str,
+ help="External IP address or hostname using which the host can "+
+ "be reached.")
+ if rift.vcs.mgmt.default_agent_mode() == 'CONFD':
+ parser.add_argument("--use-osm-model",
+ action='store_true',
+ help="Load only OSM specific models and hide the Rift Specific Augments")
+
args = parser.parse_args(argv)
# Disable loading any kernel modules for the launchpad VM
# since it doesn't need it and it will fail within containers
os.environ["NO_KERNEL_MODS"] = "1"
+ # Get external_address from env if args not set
+ if args.external_address is None:
+ args.external_address = os.getenv("RIFT_EXTERNAL_ADDRESS")
+
+ os.environ["RIFT_EXTERNAL_ADDRESS"] = \
+ args.external_address if args.external_address else get_launchpad_address()
+
cleanup_dir_name = None
- if os.environ["INSTALLDIR"] in ["/", "/home/rift", "/home/rift/.install",
- "/usr/rift/build/fc20_debug/install/usr/rift", "/usr/rift"]:
+ if os.environ["INSTALLDIR"] in ["/usr/rift",
+ "/usr/rift/build/ub16_debug/install/usr/rift",
+ "/usr/rift/build/fc20_debug/install/usr/rift"]:
cleanup_dir_name = os.environ["INSTALLDIR"] + "/var/rift/"
if args.test_name and not cleanup_dir_name:
@@ -548,8 +675,8 @@
for f in os.listdir(cleanup_dir_name):
if f.endswith(".aof") or f.endswith(".rdb"):
os.remove(os.path.join(cleanup_dir_name, f))
-
- # Remove the persistant DTS recovery files
+
+ # Remove the persistant DTS recovery files
for f in os.listdir(cleanup_dir_name):
if f.endswith(".db"):
os.remove(os.path.join(cleanup_dir_name, f))
@@ -561,35 +688,46 @@
except Exception as e:
print ("Error while cleanup: {}".format(str(e)))
- ha_mode = args.ha_mode
+ datastore = args.datastore
mgmt_ip_list = [] if not args.mgmt_ip_list else args.mgmt_ip_list
#load demo info and create Demo object
- demo = Demo(args.no_ui, ha_mode, mgmt_ip_list, args.test_name)
+ demo = Demo(args.no_ui,
+ datastore,
+ mgmt_ip_list,
+ args.test_name,
+ args.start_auth_svc,
+ args.start_pam_svc,
+ args.external_address)
+
+ if 'use_osm_model' in args and args.use_osm_model:
+ northbound_listing = ["platform_schema_listing.txt",
+ "platform_mgmt_schema_listing.txt",
+ "cli_launchpad_schema_listing.txt"]
+ args.use_xml_mode = True
+
+ else:
+ northbound_listing = ["platform_schema_listing.txt",
+ "platform_mgmt_schema_listing.txt",
+ "cli_launchpad_schema_listing.txt",
+ "cli_launchpad_rift_specific_schema_listing.txt"]
# Create the prepared system from the demo
- system = rift.vcs.demo.prepared_system_from_demo_and_args(demo, args,
- northbound_listing="cli_launchpad_schema_listing.txt",
- netconf_trace_override=True)
+ system = rift.vcs.demo.prepared_system_from_demo_and_args(
+ demo, args,
+ northbound_listing=northbound_listing,
+ netconf_trace_override=True)
- # Search for externally accessible IP address with netifaces
- gateways = netifaces.gateways()
- # Check for default route facing interface and then get its ip address
- if 'default' in gateways:
- interface = gateways['default'][netifaces.AF_INET][1]
- confd_ip = netifaces.ifaddresses(interface)[netifaces.AF_INET][0]['addr']
- else:
- # no default gateway. Revert to 127.0.0.1
- confd_ip = "127.0.0.1"
+ confd_ip = get_launchpad_address()
# TODO: This need to be changed when launchpad starts running on multiple VMs
rift.vcs.logger.configure_sink(config_file=None, confd_ip=confd_ip)
# Start the prepared system
system.start()
-
if __name__ == "__main__":
resource.setrlimit(resource.RLIMIT_CORE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY) )
+ os.system('/usr/rift/bin/UpdateHostsFile')
try:
main()
except rift.vcs.demo.ReservationError:
diff --git a/rwlaunchpad/test/launchpad_recovery b/rwlaunchpad/test/launchpad_recovery
index eea5d4a..362dacc 100755
--- a/rwlaunchpad/test/launchpad_recovery
+++ b/rwlaunchpad/test/launchpad_recovery
@@ -79,7 +79,7 @@
@classmethod
def configure_schema(cls):
schema = RwYang.Model.load_and_merge_schema(rwvcs.get_schema(), 'librwcal_yang_gen.so', 'Rwcal')
- cls.model = RwYang.Model.create_libncx()
+ cls.model = RwYang.Model.create_libyang()
cls.model.load_schema_ypbc(schema)
xml = cls.manifest.to_xml_v2(cls.model, 1)
xml = re.sub('rw-manifest:', '', xml)
@@ -96,7 +96,7 @@
manifest = rwmanifest.Manifest()
manifest.bootstrap_phase = rwmanifest.BootstrapPhase.from_dict({
"rwmgmt": {
- "northbound_listing": [ "cli_launchpad_schema_listing.txt" ]
+ "northbound_listing": [ "platform_schema_listing.txt", "platform_mgmt_schema_listing.txt", "cli_launchpad_schema_listing.txt" ]
},
"rwtasklet": {
"plugin_name": "rwinit-c"
@@ -210,15 +210,7 @@
"recovery_action": "RESTART",
"config_ready": True
}
- },
-# {
-# "name": "Start the RW.CLI",
-# "start": {
-# "component_name": "RW.CLI",
-# "recovery_action": "RESTART",
-# "config_ready": True
-# }
-# },
+ },
{
"name": "Start the RW.Proc_1.Restconf",
"start": {
@@ -227,14 +219,6 @@
"config_ready": True
}
},
-# {
-# "name": "Start the RW.Proc_2.RestPortForward",
-# "start": {
-# "component_name": "RW.Proc_2.RestPortForward",
-# "recovery_action": "RESTART",
-# "config_ready": True
-# }
-# },
{
"name": "Start the RW.Proc_3.CalProxy",
"start": {
@@ -364,26 +348,6 @@
"plugin_name": "restconf"
}
},
-# {
-# "component_name": "RW.Proc_2.RestPortForward",
-# "component_type": "RWPROC",
-# "rwproc": {
-# "tasklet": [{
-# "name": "Start RW.RestPortForward for RW.Proc_2.RestPortForward",
-# "component_name": "RW.RestPortForward",
-# "recovery_action": "RESTART",
-# "config_ready": True
-# }]
-# }
-# },
-# {
-# "component_name": "RW.RestPortForward",
-# "component_type": "RWTASKLET",
-# "rwtasklet": {
-# "plugin_directory": "./usr/lib/rift/plugins/restportforward",
-# "plugin_name": "restportforward"
-# }
-# },
{
"component_name": "RW.Proc_3.CalProxy",
"component_type": "RWPROC",
diff --git a/rwlaunchpad/test/mano_error_ut.py b/rwlaunchpad/test/mano_error_ut.py
index e593cee..09b028d 100755
--- a/rwlaunchpad/test/mano_error_ut.py
+++ b/rwlaunchpad/test/mano_error_ut.py
@@ -107,7 +107,7 @@
)
resource_info.update(self._vdu_info)
- response = RwResourceMgrYang.VDUEventData.from_dict(dict(
+ response = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData.from_dict(dict(
event_id=self._event_id,
request_info=self._request_info.as_dict(),
resource_info=resource_info,
@@ -164,7 +164,7 @@
)
resource_info.update(self._link_info)
- response = RwResourceMgrYang.VirtualLinkEventData.from_dict(dict(
+ response = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData.from_dict(dict(
event_id=self._event_id,
request_info=self._request_info.as_dict(),
resource_info=resource_info,
@@ -174,8 +174,8 @@
class ResourceMgrMock(object):
- VDU_REQUEST_XPATH = "D,/rw-resource-mgr:resource-mgmt/vdu-event/vdu-event-data"
- VLINK_REQUEST_XPATH = "D,/rw-resource-mgr:resource-mgmt/vlink-event/vlink-event-data"
+ VDU_REQUEST_XPATH = "D,/rw-project:project/rw-resource-mgr:resource-mgmt/vdu-event/vdu-event-data"
+ VLINK_REQUEST_XPATH = "D,/rw-project:project/rw-resource-mgr:resource-mgmt/vlink-event/vlink-event-data"
def __init__(self, dts, log, loop):
self._log = log
@@ -247,7 +247,7 @@
response_info = None
response_xpath = ks_path.to_xpath(RwResourceMgrYang.get_schema()) + "/resource-info"
- schema = RwResourceMgrYang.VirtualLinkEventData().schema()
+ schema = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VlinkEvent_VlinkEventData().schema()
pathentry = schema.keyspec_to_entry(ks_path)
if action == rwdts.QueryAction.CREATE:
@@ -279,16 +279,14 @@
return
@asyncio.coroutine
- def monitor_vdu_state(response_xpath, pathentry):
+ def monitor_vdu_state(response_xpath, event_id):
self._log.info("Initiating VDU state monitoring for xpath: %s ", response_xpath)
loop_cnt = 120
while loop_cnt > 0:
self._log.debug("VDU state monitoring: Sleeping for 1 second ")
yield from asyncio.sleep(1, loop = self._loop)
try:
- response_info = self._read_virtual_compute(
- pathentry.key00.event_id
- )
+ response_info = self._read_virtual_compute(event_id)
except Exception as e:
self._log.error(
"VDU state monitoring: Received exception %s "
@@ -313,7 +311,7 @@
### End of while loop. This is only possible if VDU did not reach active state
self._log.info("VDU state monitoring: VDU at xpath :%s did not reached active state in 120 seconds. Aborting monitoring",
response_xpath)
- response_info = RwResourceMgrYang.VDUEventData_ResourceInfo()
+ response_info = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData_ResourceInfo()
response_info.resource_state = 'failed'
yield from self._dts.query_update(response_xpath,
rwdts.XactFlag.ADVISE,
@@ -326,7 +324,7 @@
response_info = None
response_xpath = ks_path.to_xpath(RwResourceMgrYang.get_schema()) + "/resource-info"
- schema = RwResourceMgrYang.VDUEventData().schema()
+ schema = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgmt_VduEvent_VduEventData().schema()
pathentry = schema.keyspec_to_entry(ks_path)
if action == rwdts.QueryAction.CREATE:
@@ -335,7 +333,7 @@
request_msg.request_info,
)
if response_info.resource_state == 'pending':
- asyncio.ensure_future(monitor_vdu_state(response_xpath, pathentry),
+ asyncio.ensure_future(monitor_vdu_state(response_xpath, pathentry.key00.event_id),
loop = self._loop)
elif action == rwdts.QueryAction.DELETE:
diff --git a/rwlaunchpad/test/mano_ut.py b/rwlaunchpad/test/mano_ut.py
index 69a0d40..20e67a4 100755
--- a/rwlaunchpad/test/mano_ut.py
+++ b/rwlaunchpad/test/mano_ut.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,19 +16,18 @@
# limitations under the License.
#
-
+import argparse
import asyncio
+import gi
+import logging
import os
import sys
+import time
+import types
import unittest
import uuid
import xmlrunner
-import argparse
-import logging
-import time
-import types
-import gi
gi.require_version('RwCloudYang', '1.0')
gi.require_version('RwDts', '1.0')
gi.require_version('RwNsmYang', '1.0')
@@ -51,14 +50,22 @@
RwConfigAgentYang as rwcfg_agent,
RwlogMgmtYang
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
from gi.repository.RwTypes import RwStatus
import rift.mano.examples.ping_pong_nsd as ping_pong_nsd
import rift.tasklets
import rift.test.dts
import rw_peas
+from rift.mano.utils.project import (
+ ManoProject,
+ DEFAULT_PROJECT,
+)
+PROJECT = 'default'
+
openstack_info = {
'username': 'pluto',
'password': 'mypasswd',
@@ -75,93 +82,103 @@
class XPaths(object):
@staticmethod
def nsd(k=None):
- return ("C,/nsd:nsd-catalog/nsd:nsd" +
- ("[nsd:id='{}']".format(k) if k is not None else ""))
+ return ("C,/project-nsd:nsd-catalog/project-nsd:nsd" +
+ ("[project-nsd:id={}]".format(quoted_key(k)) if k is not None else ""))
@staticmethod
def vld(k=None):
return ("C,/vld:vld-catalog/vld:vld" +
- ("[vld:id='{}']".format(k) if k is not None else ""))
+ ("[vld:id={}]".format(quoted_key(k)) if k is not None else ""))
@staticmethod
def vnfd(k=None):
- return ("C,/vnfd:vnfd-catalog/vnfd:vnfd" +
- ("[vnfd:id='{}']".format(k) if k is not None else ""))
+ return ("C,/project-vnfd:vnfd-catalog/project-vnfd:vnfd" +
+ ("[project-vnfd:id={}]".format(quoted_key(k)) if k is not None else ""))
@staticmethod
def vnfr(k=None):
return ("D,/vnfr:vnfr-catalog/vnfr:vnfr" +
- ("[vnfr:id='{}']".format(k) if k is not None else ""))
+ ("[vnfr:id={}]".format(quoted_key(k)) if k is not None else ""))
@staticmethod
def vlr(k=None):
return ("D,/vlr:vlr-catalog/vlr:vlr" +
- ("[vlr:id='{}']".format(k) if k is not None else ""))
-
- @staticmethod
- def nsd_ref_count(k=None):
- return ("D,/nsr:ns-instance-opdata/rw-nsr:nsd-ref-count" +
- ("[rw-nsr:nsd-id-ref='{}']".format(k) if k is not None else ""))
+ ("[vlr:id={}]".format(quoted_key(k)) if k is not None else ""))
@staticmethod
def vnfd_ref_count(k=None):
return ("D,/vnfr:vnfr-catalog/rw-vnfr:vnfd-ref-count" +
- ("[rw-nsr:nsd-id-ref='{}']".format(k) if k is not None else ""))
+ ("[rw-nsr:nsd-id-ref={}]".format(quoted_key(k)) if k is not None else ""))
@staticmethod
def nsr_config(k=None):
return ("C,/nsr:ns-instance-config/nsr:nsr" +
- ("[nsr:id='{}']".format(k) if k is not None else ""))
+ ("[nsr:id={}]".format(quoted_key(k)) if k is not None else ""))
@staticmethod
def nsr_opdata(k=None):
return ("D,/nsr:ns-instance-opdata/nsr:nsr" +
- ("[nsr:ns-instance-config-ref='{}']".format(k) if k is not None else ""))
+ ("[nsr:ns-instance-config-ref={}]".format(quoted_key(k)) if k is not None else ""))
@staticmethod
def nsr_config_status(k=None):
return ("D,/nsr:ns-instance-opdata/nsr:nsr" +
- ("[nsr:ns-instance-config-ref='{}']/config_status".format(k) if k is not None else ""))
+ ("[nsr:ns-instance-config-ref={}]/config_status".format(quoted_key(k)) if k is not None else ""))
@staticmethod
def cm_state(k=None):
- if k is None:
- return ("D,/rw-conman:cm-state/rw-conman:cm-nsr")
- else:
- return ("D,/rw-conman:cm-state/rw-conman:cm-nsr" +
- ("[rw-conman:id='{}']".format(k) if k is not None else ""))
+ return ("D,/rw-conman:cm-state/rw-conman:cm-nsr" +
+ ("[rw-conman:id={}]".format(quoted_key(k)) if k is not None else ""))
@staticmethod
def nsr_scale_group_instance(nsr_id=None, group_name=None, index=None):
return (("D,/nsr:ns-instance-opdata/nsr:nsr") +
- ("[nsr:ns-instance-config-ref='{}']".format(nsr_id) if nsr_id is not None else "") +
+ ("[nsr:ns-instance-config-ref={}]".format(quoted_key(nsr_id)) if nsr_id is not None else "") +
("/nsr:scaling-group-record") +
- ("[nsr:scaling-group-name-ref='{}']".format(group_name) if group_name is not None else "") +
+ ("[nsr:scaling-group-name-ref={}]".format(quoted_key(group_name)) if group_name is not None else "") +
("/nsr:instance") +
- ("[nsr:scaling-group-index-ref='{}']".format(index) if index is not None else ""))
+ ("[nsr:scaling-group-index-ref={}]".format(quoted_key(index)) if index is not None else ""))
@staticmethod
def nsr_scale_group_instance_config(nsr_id=None, group_name=None, index=None):
return (("C,/nsr:ns-instance-config/nsr:nsr") +
- ("[nsr:id='{}']".format(nsr_id) if nsr_id is not None else "") +
+ ("[nsr:id={}]".format(nsr_id) if nsr_id is not None else "") +
("/nsr:scaling-group") +
- ("[nsr:scaling-group-name-ref='{}']".format(group_name) if group_name is not None else "") +
+ ("[nsr:scaling-group-name-ref={}]".format(quoted_key(group_name)) if group_name is not None else "") +
("/nsr:instance") +
- ("[nsr:index='{}']".format(index) if index is not None else ""))
+ ("[nsr:index={}]".format(quoted_key(index)) if index is not None else ""))
+
+ @staticmethod
+ def cloud_account(k=None):
+ return ("C,/rw-cloud:cloud/rw-cloud:account" +
+ ("[rw-cloud:name={}]".format(quoted_key(k)) if k is not None else ""))
+
+ @staticmethod
+ def project(k=None):
+ return ("C,/rw-project:project" +
+ ("[rw-project:name={}]".format(quoted_key(k)) if k is not None else ""))
class ManoQuerier(object):
- def __init__(self, log, dts):
+ def __init__(self, log, dts, project):
self.log = log
self.dts = dts
+ self.project = project
+
+ def add_project(self, xpath):
+ return self.project.add_project(xpath)
@asyncio.coroutine
- def _read_query(self, xpath, do_trace=False):
- self.log.debug("Running XPATH read query: %s (trace: %s)", xpath, do_trace)
+ def _read_query(self, xpath, do_trace=False, project=True):
+ if project:
+ xp = self.add_project(xpath)
+ else:
+ xp = xpath
+ self.log.debug("Running XPATH read query: %s (trace: %s)", xp, do_trace)
flags = rwdts.XactFlag.MERGE
flags += rwdts.XactFlag.TRACE if do_trace else 0
res_iter = yield from self.dts.query_read(
- xpath, flags=flags
+ xp, flags=flags
)
results = []
@@ -173,6 +190,27 @@
return results
@asyncio.coroutine
+ def _delete_query(self, xpath, flags=0):
+ xp = self.add_project(xpath)
+ self.log.debug("Running XPATH delete query: %s (flags: %d)", xp, flags)
+ with self.dts.transaction() as xact:
+ yield from self.dts.query_delete(
+ xp,
+ flags
+ )
+
+ @asyncio.coroutine
+ def _update_query(self, xpath, msg, flags=0):
+ xp = self.add_project(xpath)
+ self.log.debug("Running XPATH update query: %s (flags: %d)", xp, flags)
+ with self.dts.transaction() as xact:
+ yield from self.dts.query_update(
+ xp,
+ flags,
+ msg
+ )
+
+ @asyncio.coroutine
def get_cm_state(self, nsr_id=None):
return (yield from self._read_query(XPaths.cm_state(nsr_id), False))
@@ -183,7 +221,6 @@
@asyncio.coroutine
def get_nsr_scale_group_instance_opdata(self, nsr_id=None, group_name=None, index=None):
return (yield from self._read_query(XPaths.nsr_scale_group_instance(nsr_id, group_name, index), False))
- #return (yield from self._read_query(XPaths.nsr_scale_group_instance(nsr_id, group_name), True))
@asyncio.coroutine
def get_nsr_configs(self, nsr_id=None):
@@ -202,75 +239,39 @@
return (yield from self._read_query(XPaths.vlr(vlr_id)))
@asyncio.coroutine
- def get_nsd_ref_counts(self, nsd_id=None):
- return (yield from self._read_query(XPaths.nsd_ref_count(nsd_id)))
-
- @asyncio.coroutine
def get_vnfd_ref_counts(self, vnfd_id=None):
return (yield from self._read_query(XPaths.vnfd_ref_count(vnfd_id)))
@asyncio.coroutine
def delete_nsr(self, nsr_id):
- with self.dts.transaction() as xact:
- yield from self.dts.query_delete(
- XPaths.nsr_config(nsr_id),
- 0
- #rwdts.XactFlag.TRACE,
- #rwdts.Flag.ADVISE,
- )
+ return (yield from self._delete_query(XPaths.nsr_config(nsr_id)))
@asyncio.coroutine
def delete_nsd(self, nsd_id):
- nsd_xpath = XPaths.nsd(nsd_id)
- self.log.debug("Attempting to delete NSD with path = %s", nsd_xpath)
- with self.dts.transaction() as xact:
- yield from self.dts.query_delete(
- nsd_xpath,
- rwdts.XactFlag.ADVISE,
- )
+ return (yield from self._delete_query(XPaths.nsd(nsd_id),
+ rwdts.XactFlag.ADVISE))
@asyncio.coroutine
def delete_vnfd(self, vnfd_id):
- vnfd_xpath = XPaths.vnfd(vnfd_id)
- self.log.debug("Attempting to delete VNFD with path = %s", vnfd_xpath)
- with self.dts.transaction() as xact:
- yield from self.dts.query_delete(
- vnfd_xpath,
- rwdts.XactFlag.ADVISE,
- )
+ return (yield from self._delete_query(XPaths.vnfd(vnfd_id),
+ rwdts.XactFlag.ADVISE))
@asyncio.coroutine
def update_nsd(self, nsd_id, nsd_msg):
- nsd_xpath = XPaths.nsd(nsd_id)
- self.log.debug("Attempting to update NSD with path = %s", nsd_xpath)
- with self.dts.transaction() as xact:
- yield from self.dts.query_update(
- nsd_xpath,
- rwdts.XactFlag.ADVISE,
- nsd_msg,
- )
+ return (yield from self._update_query(XPaths.nsd(nsd_id), nsd_msg,
+ rwdts.XactFlag.ADVISE))
@asyncio.coroutine
def update_vnfd(self, vnfd_id, vnfd_msg):
- vnfd_xpath = XPaths.vnfd(vnfd_id)
- self.log.debug("Attempting to delete VNFD with path = %s", vnfd_xpath)
- with self.dts.transaction() as xact:
- yield from self.dts.query_update(
- vnfd_xpath,
- rwdts.XactFlag.ADVISE,
- vnfd_msg,
- )
+ return (yield from self._update_query(XPaths.vnfd(vnfd_id), vnfd_msg,
+ rwdts.XactFlag.ADVISE))
@asyncio.coroutine
def update_nsr_config(self, nsr_id, nsr_msg):
- nsr_xpath = XPaths.nsr_config(nsr_id)
- self.log.debug("Attempting to update NSR with path = %s", nsr_xpath)
- with self.dts.transaction() as xact:
- yield from self.dts.query_update(
- nsr_xpath,
- rwdts.XactFlag.ADVISE|rwdts.XactFlag.REPLACE,
- nsr_msg,
- )
+ return (yield from self._update_query(
+ XPaths.nsr_config(nsr_id),
+ nsr_msg,
+ rwdts.XactFlag.ADVISE|rwdts.XactFlag.REPLACE))
class ManoTestCase(rift.test.dts.AbstractDTSTest):
@@ -365,44 +366,48 @@
vnfrs = yield from self.querier.get_vnfrs()
self.assertEqual(num_vnfrs, len(vnfrs))
- @asyncio.coroutine
- def verify_nsd_ref_count(self, nsd_id, num_ref):
- nsd_ref_counts = yield from self.querier.get_nsd_ref_counts(nsd_id)
- self.assertEqual(num_ref, nsd_ref_counts[0].instance_ref_count)
+
class DescriptorPublisher(object):
- def __init__(self, log, loop, dts):
+ def __init__(self, log, loop, dts, project):
self.log = log
self.loop = loop
self.dts = dts
+ self.project = project
self._registrations = []
@asyncio.coroutine
def publish(self, w_path, path, desc):
ready_event = asyncio.Event(loop=self.loop)
+ if 'rw-project' in path:
+ w_xp = w_path
+ xp = path
+ else:
+ w_xp = self.project.add_project(w_path)
+ xp = self.project.add_project(path)
@asyncio.coroutine
def on_ready(regh, status):
self.log.debug("Create element: %s, obj-type:%s obj:%s",
- path, type(desc), desc)
+ xp, type(desc), desc)
with self.dts.transaction() as xact:
- regh.create_element(path, desc, xact.xact)
- self.log.debug("Created element: %s, obj:%s", path, desc)
+ regh.create_element(xp, desc, xact.xact)
+ self.log.debug("Created element: %s, obj:%s", xp, desc)
ready_event.set()
handler = rift.tasklets.DTS.RegistrationHandler(
on_ready=on_ready
)
- self.log.debug("Registering path: %s, obj:%s", w_path, desc)
+ self.log.debug("Registering path: %s, obj:%s", w_xp, desc)
reg = yield from self.dts.register(
- w_path,
+ w_xp,
handler,
flags=rwdts.Flag.PUBLISHER | rwdts.Flag.NO_PREP_READ
)
self._registrations.append(reg)
- self.log.debug("Registered path : %s", w_path)
+ self.log.debug("Registered path : %s", w_xp)
yield from ready_event.wait()
return reg
@@ -413,23 +418,114 @@
reg.deregister()
-class PingPongNsrConfigPublisher(object):
- XPATH = "C,/nsr:ns-instance-config"
+class ProjectPublisher(object):
+ XPATH = "C,/rw-project:project"
- def __init__(self, log, loop, dts, ping_pong, cloud_account_name):
+ def __init__(self, log, loop, dts, project):
self.dts = dts
self.log = log
self.loop = loop
+ self.project = project
self.ref = None
- self.querier = ManoQuerier(log, dts)
+ self.querier = ManoQuerier(log, dts, project)
+ self.publisher = DescriptorPublisher(log, loop,
+ dts, project)
- self.nsr_config = rwnsryang.YangData_Nsr_NsInstanceConfig()
+ self._ready_event = asyncio.Event(loop=self.loop)
+ asyncio.ensure_future(self.register(), loop=loop)
- nsr = rwnsryang.YangData_Nsr_NsInstanceConfig_Nsr()
+ @asyncio.coroutine
+ def register(self):
+ @asyncio.coroutine
+ def on_ready(regh, status):
+ self._ready_event.set()
+
+ self.log.debug("Registering path: %s", ProjectPublisher.XPATH)
+ self.reg = yield from self.dts.register(
+ ProjectPublisher.XPATH,
+ flags=rwdts.Flag.PUBLISHER,
+ handler=rift.tasklets.DTS.RegistrationHandler(
+ on_ready=on_ready,
+ ),
+ )
+
+ def deregister(self):
+ if self.reg is not None:
+ self.reg.deregister()
+
+ @asyncio.coroutine
+ def publish_project(self, config, xpath, xpath_wild):
+ # Publish project
+ self.log.debug("Publishing cloud_account path: %s - %s, type:%s, obj:%s",
+ xpath, xpath_wild, type(config), config)
+ yield from self.publisher.publish(xpath_wild, xpath, config)
+
+
+class CloudAccountPublisher(object):
+ XPATH = "C,/rw-cloud:cloud"
+
+ def __init__(self, log, loop, dts, project):
+ self.dts = dts
+ self.log = log
+ self.loop = loop
+ self.project = project
+ self.ref = None
+
+ self.querier = ManoQuerier(log, dts, project)
+ self.publisher = DescriptorPublisher(log, loop,
+ dts, project)
+
+ self.xpath = self.project.add_project(CloudAccountPublisher.XPATH)
+
+ self._ready_event = asyncio.Event(loop=self.loop)
+ asyncio.ensure_future(self.register(), loop=loop)
+
+ @asyncio.coroutine
+ def register(self):
+ @asyncio.coroutine
+ def on_ready(regh, status):
+ self._ready_event.set()
+
+ self.log.debug("Registering path: %s", self.xpath)
+ self.reg = yield from self.dts.register(
+ self.xpath,
+ flags=rwdts.Flag.PUBLISHER,
+ handler=rift.tasklets.DTS.RegistrationHandler(
+ on_ready=on_ready,
+ ),
+ )
+
+ def deregister(self):
+ if self.reg is not None:
+ self.reg.deregister()
+
+ @asyncio.coroutine
+ def publish_account(self, account, xpath, xpath_wild):
+ # Publish cloud account
+ self.log.debug("Publishing cloud_account path: %s - %s, type:%s, obj:%s",
+ xpath, xpath_wild, type(account), account)
+ yield from self.publisher.publish(xpath_wild, xpath, account)
+
+
+class PingPongNsrConfigPublisher(object):
+ XPATH = "C,/nsr:ns-instance-config"
+
+ def __init__(self, log, loop, dts, ping_pong, cloud_account_name, project):
+ self.dts = dts
+ self.log = log
+ self.loop = loop
+ self.project = project
+ self.ref = None
+
+ self.querier = ManoQuerier(log, dts, project)
+ self.xpath = self.project.add_project(PingPongNsrConfigPublisher.XPATH)
+ self.nsr_config = rwnsryang.YangData_RwProject_Project_NsInstanceConfig()
+
+ nsr = rwnsryang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = "ns1.{}".format(nsr.id)
- nsr.nsd = nsryang.YangData_Nsr_NsInstanceConfig_Nsr_Nsd()
+ nsr.nsd = nsryang.YangData_RwProject_Project_NsInstanceConfig_Nsr_Nsd()
nsr.nsd.from_dict(ping_pong.ping_pong_nsd.nsd.as_dict())
nsr.cloud_account = cloud_account_name
@@ -439,8 +535,9 @@
#'cloud_account':'mock_account1'
})
- inputs = nsryang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter()
- inputs.xpath = "/nsd:nsd-catalog/nsd:nsd[nsd:id={}]/nsd:name".format(ping_pong.nsd_id)
+ inputs = nsryang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter()
+ inputs.xpath = self.project.add_project(
+ "/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id={}]/project-nsd:name".format(quoted_key(ping_pong.nsd_id)))
inputs.value = "inigo montoya"
fast_cpu = {'metadata_key': 'FASTCPU', 'metadata_value': 'True'}
@@ -488,9 +585,9 @@
def on_ready(regh, status):
self._ready_event.set()
- self.log.debug("Registering path: %s", PingPongNsrConfigPublisher.XPATH)
+ self.log.debug("Registering path: %s", self.xpath)
self.reg = yield from self.dts.register(
- PingPongNsrConfigPublisher.XPATH,
+ self.xpath,
flags=rwdts.Flag.PUBLISHER,
handler=rift.tasklets.DTS.RegistrationHandler(
on_ready=on_ready,
@@ -503,7 +600,7 @@
yield from self._ready_event.wait()
with self.dts.transaction() as xact:
self.reg.create_element(
- PingPongNsrConfigPublisher.XPATH,
+ self.xpath,
self.nsr_config,
xact=xact.xact,
)
@@ -520,7 +617,7 @@
})
with self.dts.transaction() as xact:
self.reg.update_element(
- PingPongNsrConfigPublisher.XPATH,
+ self.xpath,
self.nsr_config,
xact=xact.xact,
)
@@ -539,7 +636,7 @@
"cloud_type" : cloud_type,
construct_type : construct_value,
})
-
+
def create_vnfd_placement_group_map(self,
nsr,
@@ -555,21 +652,16 @@
"cloud_type" : cloud_type,
construct_type : construct_value,
})
-
-
+
+
@asyncio.coroutine
def delete_scale_group_instance(self, group_name, index):
self.log.debug("Deleting scale group %s instance %s", group_name, index)
#del self.nsr_config.nsr[0].scaling_group[0].instance[0]
- xpath = XPaths.nsr_scale_group_instance_config(self.nsr_config.nsr[0].id, group_name, index)
+ xpath = self.project.add_project(
+ XPaths.nsr_scale_group_instance_config(self.nsr_config.nsr[0].id,
+ group_name, index))
yield from self.dts.query_delete(xpath, flags=rwdts.XactFlag.ADVISE)
- #with self.dts.transaction() as xact:
- # self.reg.update_element(
- # PingPongNsrConfigPublisher.XPATH,
- # self.nsr_config,
- # flags=rwdts.XactFlag.REPLACE,
- # xact=xact.xact,
- # )
def deregister(self):
if self.reg is not None:
@@ -617,10 +709,12 @@
def update_vnf_cloud_map(self,vnf_cloud_map):
self.log.debug("Modifying NSR to add VNF cloud account map: {}".format(vnf_cloud_map))
for vnf_index,cloud_acct in vnf_cloud_map.items():
- vnf_maps = [vnf_map for vnf_map in self.nsr_config.nsr[0].vnf_cloud_account_map if vnf_index == vnf_map.member_vnf_index_ref]
+ vnf_maps = [vnf_map for vnf_map in \
+ self.nsr_config.nsr[0].vnf_cloud_account_map \
+ if vnf_index == vnf_map.member_vnf_index_ref]
if vnf_maps:
vnf_maps[0].cloud_account = cloud_acct
- else:
+ else:
self.nsr_config.nsr[0].vnf_cloud_account_map.add().from_dict({
'member_vnf_index_ref':vnf_index,
'cloud_account':cloud_acct
@@ -628,13 +722,16 @@
class PingPongDescriptorPublisher(object):
- def __init__(self, log, loop, dts, num_external_vlrs=1, num_internal_vlrs=1, num_ping_vms=1):
+ def __init__(self, log, loop, dts, project,
+ num_external_vlrs=1, num_internal_vlrs=1, num_ping_vms=1):
self.log = log
self.loop = loop
self.dts = dts
+ self.project = project
- self.querier = ManoQuerier(self.log, self.dts)
- self.publisher = DescriptorPublisher(self.log, self.loop, self.dts)
+ self.querier = ManoQuerier(self.log, self.dts, self.project)
+ self.publisher = DescriptorPublisher(self.log, self.loop,
+ self.dts, self.project)
self.ping_vnfd, self.pong_vnfd, self.ping_pong_nsd = \
ping_pong_nsd.generate_ping_pong_descriptors(
pingcount=1,
@@ -642,15 +739,9 @@
internal_vlr_count=num_internal_vlrs,
num_vnf_vms=2,
mano_ut=True,
- use_scale_group=True,
+ use_scale_group=False,
use_mon_params=False,
)
-
- self.config_dir = os.path.join(os.getenv('RIFT_ARTIFACTS'),
- "launchpad/libs",
- self.ping_pong_nsd.id,
- "config")
-
@property
def nsd_id(self):
return self.ping_pong_nsd.id
@@ -717,8 +808,6 @@
)
-
-
class ManoTestCase(rift.test.dts.AbstractDTSTest):
"""
DTS GI interface unittests
@@ -755,9 +844,9 @@
@staticmethod
def get_cal_account(account_type, account_name):
"""
- Creates an object for class RwcalYang.Clo
+ Creates an object for class RwcalYang.Cloud
"""
- account = rwcloudyang.CloudAccount()
+ account = rwcloudyang.YangData_RwProject_Project_Cloud_Account()
if account_type == 'mock':
account.name = account_name
account.account_type = "mock"
@@ -773,13 +862,33 @@
return account
@asyncio.coroutine
- def configure_cloud_account(self, dts, cloud_type, cloud_name="cloud1"):
+ def configure_project(self, project=None):
+ if project is None:
+ project = self.project
+
+ proj_xpath = "C,{}/project-config".format(project.prefix)
+ self.log.info("Creating project: {} with {}".
+ format(proj_xpath, project.config.as_dict()))
+ xpath_wild = "C,/rw-project:project/project-config"
+ yield from self.project_publisher.publish_project(project.config,
+ proj_xpath,
+ xpath_wild)
+
+ @asyncio.coroutine
+ def configure_cloud_account(self, dts, cloud_type, cloud_name="cloud1", project=None):
account = self.get_cal_account(cloud_type, cloud_name)
- account_xpath = "C,/rw-cloud:cloud/rw-cloud:account[rw-cloud:name='{}']".format(cloud_name)
self.log.info("Configuring cloud-account: %s", account)
- yield from dts.query_create(account_xpath,
- rwdts.XactFlag.ADVISE,
- account)
+ if project is None:
+ project = self.project
+ xpath = project.add_project(XPaths.cloud_account(account.name))
+ xpath_wild = project.add_project(XPaths.cloud_account())
+
+ # account_xpath = project.add_project(
+ # "C,/rw-cloud:cloud/rw-cloud:account[rw-cloud:name={}]".format(quoted_key(cloud_name)))
+ # yield from dts.query_create(account_xpath,
+ # rwdts.XactFlag.ADVISE,
+ # account)
+ yield from self.cloud_publisher.publish_account(account, xpath, xpath_wild)
@asyncio.coroutine
def wait_tasklets(self):
@@ -789,22 +898,74 @@
self.log.debug("STARTING - %s", self.id())
self.tinfo = self.new_tinfo(self.id())
self.dts = rift.tasklets.DTS(self.tinfo, self.schema, self.loop)
- self.ping_pong = PingPongDescriptorPublisher(self.log, self.loop, self.dts)
- self.querier = ManoQuerier(self.log, self.dts)
+ self.project = ManoProject(self.log,
+ name=DEFAULT_PROJECT)
+ self.project1 = ManoProject(self.log,
+ name='test-1')
+ self.ping_pong = PingPongDescriptorPublisher(self.log, self.loop,
+ self.dts, self.project)
+ self.querier = ManoQuerier(self.log, self.dts, self.project)
+ self.project_publisher = ProjectPublisher(
+ self.log,
+ loop,
+ self.dts,
+ self.project
+ )
+ self.cloud_publisher = CloudAccountPublisher(
+ self.log,
+ loop,
+ self.dts,
+ self.project
+ )
self.nsr_publisher = PingPongNsrConfigPublisher(
self.log,
loop,
self.dts,
self.ping_pong,
"mock_account",
+ self.project,
)
def test_create_nsr_record(self):
@asyncio.coroutine
+ def verify_projects(termination=False):
+ self.log.debug("Verifying projects = %s", XPaths.project())
+
+ accts = yield from self.querier._read_query(XPaths.project(),
+ project=False)
+ projs = []
+ for acc in accts:
+ self.log.debug("Project: {}".format(acc.as_dict()))
+ if acc.name not in projs:
+ projs.append(acc.name)
+ self.log.debug("Merged: {}".format(projs))
+ self.assertEqual(2, len(projs))
+
+ @asyncio.coroutine
+ def verify_cloud_accounts(termination=False):
+ self.log.debug("Verifying cloud accounts = %s", XPaths.cloud_account())
+
+ accts = yield from self.querier._read_query(XPaths.cloud_account())
+ self.assertEqual(2, len(accts))
+
+ accts = yield from self.querier._read_query(
+ self.project1.add_project(XPaths.cloud_account()), project=False)
+ self.assertEqual(1, len(accts))
+
+ accts = yield from self.querier._read_query(
+ "C,/rw-project:project/rw-cloud:cloud/rw-cloud:account",
+ project=False)
+ self.assertEqual(3, len(accts))
+
+ accts = yield from self.querier._read_query(
+ "C,/rw-project:project/rw-cloud:cloud/rw-cloud:account[rw-cloud:name='mock_account']",
+ project=False)
+ self.assertEqual(2, len(accts))
+
+ @asyncio.coroutine
def verify_cm_state(termination=False, nsrid=None):
self.log.debug("Verifying cm_state path = %s", XPaths.cm_state(nsrid))
- #print("###>>> Verifying cm_state path:", XPaths.cm_state(nsrid))
loop_count = 10
loop_sleep = 10
@@ -878,7 +1039,7 @@
nsr_config = nsr_configs[0]
self.assertEqual(
- "/nsd:nsd-catalog/nsd:nsd[nsd:id={}]/nsd:name".format(self.ping_pong.nsd_id),
+ "/rw-project:project/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id={}]/project-nsd:name".format(quoted_key(self.ping_pong.nsd_id)),
nsr_config.input_parameter[0].xpath,
)
@@ -895,6 +1056,7 @@
nsr_opdata_l = yield from self.querier.get_nsr_opdatas(nsrid)
self.assertEqual(1, len(nsr_opdata_l))
nsr_opdata = nsr_opdata_l[0].as_dict()
+ self.log.debug("NSR opdata: {}".format(nsr_opdata))
if ("configured" == nsr_opdata['config_status']):
print("\n###>>> NSR Config Status 'configured' OK <<<###\n")
return
@@ -974,14 +1136,6 @@
self.log.debug("Sleeping for 10 seconds")
yield from asyncio.sleep(10, loop=self.loop)
- @asyncio.coroutine
- def verify_nsd_ref_count(termination):
- self.log.debug("Verifying nsd ref count= %s", XPaths.nsd_ref_count())
- res_iter = yield from self.dts.query_read(XPaths.nsd_ref_count())
-
- for i in res_iter:
- result = yield from i
- self.log.debug("Got nsd ref count record %s", result)
@asyncio.coroutine
def verify_vnfd_ref_count(termination):
@@ -1024,13 +1178,15 @@
#yield from verify_vlr_record(termination)
yield from verify_nsr_opdata(termination)
yield from verify_nsr_config(termination)
- yield from verify_nsd_ref_count(termination)
yield from verify_vnfd_ref_count(termination)
# Config Manager
yield from verify_cm_state(termination, nsrid)
yield from verify_nsr_config_status(termination, nsrid)
+ yield from verify_cloud_account(termination)
+ yield from verify_project_record(termination)
+
@asyncio.coroutine
def verify_scale_instance(index):
self.log.debug("Verifying scale record path = %s, Termination=%d",
@@ -1074,12 +1230,20 @@
def run_test():
yield from self.wait_tasklets()
+ yield from self.configure_project()
+ yield from self.configure_project(project=self.project1)
cloud_type = "mock"
yield from self.configure_cloud_account(self.dts, cloud_type, "mock_account")
yield from self.configure_cloud_account(self.dts, cloud_type, "mock_account1")
+ yield from self.configure_cloud_account(self.dts, cloud_type, "mock_account",
+ project=self.project1)
+
+ yield from verify_cloud_accounts()
+ yield from verify_projects()
yield from self.ping_pong.publish_desciptors()
+ return
# Attempt deleting VNFD not in use
yield from self.ping_pong.update_ping_vnfd()
diff --git a/rwlaunchpad/test/mgmt_recovery.py b/rwlaunchpad/test/mgmt_recovery.py
index 29f0ab0..c2392c2 100755
--- a/rwlaunchpad/test/mgmt_recovery.py
+++ b/rwlaunchpad/test/mgmt_recovery.py
@@ -266,7 +266,6 @@
ConfigManagerTasklet(),
UIServer(),
RedisServer(),
- rift.vcs.RestPortForwardTasklet(),
rift.vcs.RestconfTasklet(),
rift.vcs.RiftCli(),
rift.vcs.uAgentTasklet(),
@@ -275,7 +274,7 @@
standby_procs = [
RedisServer(),
- rift.vcs.uAgentTasklet(mode_active=False),
+ rift.vcs.uAgentTasklet()
]
restart_procs = [
@@ -358,7 +357,7 @@
# Create the prepared system from the demo
system = rift.vcs.demo.prepared_system_from_demo_and_args(demo, args,
- northbound_listing="cli_launchpad_schema_listing.txt",
+ northbound_listing=["platform_schema_listing.txt", "platform_mgmt_schema_listing.txt", "cli_launchpad_schema_listing.txt"],
netconf_trace_override=True)
confd_ip = socket.gethostbyname(socket.gethostname())
diff --git a/rwlaunchpad/test/pytest/lp_kt_utm_test.py b/rwlaunchpad/test/pytest/lp_kt_utm_test.py
index 0a8d6ba..584d9b9 100644
--- a/rwlaunchpad/test/pytest/lp_kt_utm_test.py
+++ b/rwlaunchpad/test/pytest/lp_kt_utm_test.py
@@ -41,10 +41,10 @@
gi.require_version('RwNsrYang', '1.0')
gi.require_version('RwResourceMgrYang', '1.0')
gi.require_version('RwConmanYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
from gi.repository import (
- NsdYang,
+ ProjectNsdYang as NsdYang,
NsrYang,
RwBaseYang,
RwCloudYang,
@@ -54,7 +54,7 @@
RwNsrYang,
RwResourceMgrYang,
RwConmanYang,
- RwVnfdYang,
+ RwProjectVnfdYang as RwVnfdYang,
VldYang,
)
@@ -180,14 +180,14 @@
pass
-def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1"):
+def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1", project="default"):
logger.info("Waiting for onboard trans_id %s to complete",
transaction_id)
start_time = time.time()
while (time.time() - start_time) < timeout_secs:
r = requests.get(
- 'http://{host}:4567/api/upload/{t_id}/state'.format(
- host=host, t_id=transaction_id
+ 'http://{host}:8008/api/operational/project/{proj}/create-jobs/job/{t_id}'.format(
+ host=host, proj=project, t_id=transaction_id
)
)
state = r.json()
@@ -206,7 +206,7 @@
raise DescriptorOnboardError(state)
def create_nsr_from_nsd_id(nsd_id):
- nsr = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsr = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = "UTM-only"
nsr.short_name = "UTM-only"
@@ -247,7 +247,7 @@
cloud_proxy.merge_config("/rw-cloud:cloud-account", cloud_account)
def test_configure_pools(self, resource_mgr_proxy):
- pools = RwResourceMgrYang.ResourcePools.from_dict({
+ pools = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgrConfig_ResourcePools.from_dict({
"pools": [{ "name": "vm_pool_a",
"resource_type": "compute",
"pool_type" : "dynamic"},
@@ -255,29 +255,14 @@
"resource_type": "network",
"pool_type" : "dynamic",}]})
- resource_mgr_proxy.merge_config('/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
+ resource_mgr_proxy.merge_config('/rw-project:project/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
- def test_configure_resource_orchestrator(self, so_proxy):
- cfg = RwConmanYang.RoEndpoint.from_dict({'ro_ip_address': '127.0.0.1',
- 'ro_port' : 2022,
- 'ro_username' : 'admin',
- 'ro_password' : 'admin'})
- so_proxy.merge_config('/rw-conman:cm-config', cfg)
-
- def test_configure_service_orchestrator(self, nsm_proxy):
- cfg = RwNsmYang.SoEndpoint.from_dict({'cm_ip_address': '127.0.0.1',
- 'cm_port' : 2022,
- 'cm_username' : 'admin',
- 'cm_password' : 'admin'})
- nsm_proxy.merge_config('/rw-nsm:ro-config/rw-nsm:cm-endpoint', cfg)
-
-
def test_onboard_ktutm_vnfd(self, logger, vnfd_proxy, kt_utm_vnfd_package_file):
logger.info("Onboarding kt_utm_vnfd package: %s", kt_utm_vnfd_package_file)
trans_id = upload_descriptor(logger, kt_utm_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 1, "There should only be a single vnfd"
vnfd = vnfds[0]
@@ -288,19 +273,19 @@
trans_id = upload_descriptor(logger, utm_only_nsd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsds = catalog.nsd
assert len(nsds) == 1, "There should only be a single nsd"
nsd = nsds[0]
def test_instantiate_utm_only_nsr(self, logger, nsd_proxy, nsr_proxy, rwnsr_proxy, base_proxy):
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
nsr = create_nsr_from_nsd_id(nsd.id)
- nsr_proxy.merge_config('/ns-instance-config', nsr)
+ nsr_proxy.merge_config('/rw-project:project[rw-project:name="default"]/ns-instance-config', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
assert len(nsrs) == 1
assert nsrs[0].ns_instance_config_ref == nsr.id
diff --git a/rwlaunchpad/test/pytest/lp_kt_utm_wims_test.py b/rwlaunchpad/test/pytest/lp_kt_utm_wims_test.py
index 705565b..19b637d 100644
--- a/rwlaunchpad/test/pytest/lp_kt_utm_wims_test.py
+++ b/rwlaunchpad/test/pytest/lp_kt_utm_wims_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -39,13 +39,13 @@
gi.require_version('RwIwpYang', '1.0')
gi.require_version('RwNsmYang', '1.0')
gi.require_version('RwNsrYang', '1.0')
-gi.require_version('RwNsrYang', '1.0')
+gi.require_version('ProjectNsdYang', '1.0')
gi.require_version('RwResourceMgrYang', '1.0')
gi.require_version('RwConmanYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
from gi.repository import (
- NsdYang,
+ ProjectNsdYang as NsdYang,
NsrYang,
RwBaseYang,
RwCloudYang,
@@ -55,7 +55,7 @@
RwNsrYang,
RwResourceMgrYang,
RwConmanYang,
- RwVnfdYang,
+ RwProjectVnfdYang as RwVnfdYang,
VldYang,
)
@@ -197,14 +197,14 @@
pass
-def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1"):
+def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1", project="default"):
logger.info("Waiting for onboard trans_id %s to complete",
transaction_id)
start_time = time.time()
while (time.time() - start_time) < timeout_secs:
r = requests.get(
- 'http://{host}:4567/api/upload/{t_id}/state'.format(
- host=host, t_id=transaction_id
+ 'http://{host}:8008/api/operational/project/{proj}/create-jobs/job/{t_id}/'.format(
+ host=host, proj=project, t_id=transaction_id
)
)
state = r.json()
@@ -223,7 +223,7 @@
raise DescriptorOnboardError(state)
def create_nsr_from_nsd_id(nsd_id):
- nsr = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsr = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = "UTM-WIMS"
nsr.short_name = "UTM-WIMS"
@@ -261,10 +261,10 @@
cloud_account.openstack.tenant = 'demo'
cloud_account.openstack.mgmt_network = 'private'
- cloud_proxy.merge_config("/rw-cloud:cloud-account", cloud_account)
+ cloud_proxy.merge_config("/rw-project:project/rw-cloud:cloud-account", cloud_account)
def test_configure_pools(self, resource_mgr_proxy):
- pools = RwResourceMgrYang.ResourcePools.from_dict({
+ pools = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgrConfig_ResourcePools.from_dict({
"pools": [{ "name": "vm_pool_a",
"resource_type": "compute",
"pool_type" : "dynamic"},
@@ -272,29 +272,14 @@
"resource_type": "network",
"pool_type" : "dynamic",}]})
- resource_mgr_proxy.merge_config('/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
+ resource_mgr_proxy.merge_config('/rw-project:project/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
- def test_configure_resource_orchestrator(self, so_proxy):
- cfg = RwConmanYang.RoEndpoint.from_dict({'ro_ip_address': '127.0.0.1',
- 'ro_port' : 2022,
- 'ro_username' : 'admin',
- 'ro_password' : 'admin'})
- so_proxy.merge_config('/rw-conman:cm-config', cfg)
-
- def test_configure_service_orchestrator(self, nsm_proxy):
- cfg = RwNsmYang.SoEndpoint.from_dict({'cm_ip_address': '127.0.0.1',
- 'cm_port' : 2022,
- 'cm_username' : 'admin',
- 'cm_password' : 'admin'})
- nsm_proxy.merge_config('/rw-nsm:ro-config/rw-nsm:cm-endpoint', cfg)
-
-
def test_onboard_ktutm_vnfd(self, logger, vnfd_proxy, kt_utm_vnfd_package_file):
logger.info("Onboarding kt_utm_vnfd package: %s", kt_utm_vnfd_package_file)
trans_id = upload_descriptor(logger, kt_utm_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 1, "There should only be a single vnfd"
vnfd = vnfds[0]
@@ -305,7 +290,7 @@
trans_id = upload_descriptor(logger, kt_wims_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 2, "There should only be two vnfd"
assert "kt_wims_vnfd" in [vnfds[0].name, vnfds[1].name]
@@ -315,19 +300,19 @@
trans_id = upload_descriptor(logger, utm_wims_nsd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsds = catalog.nsd
assert len(nsds) == 1, "There should only be a single nsd"
nsd = nsds[0]
def test_instantiate_utm_wims_nsr(self, logger, nsd_proxy, nsr_proxy, rwnsr_proxy, base_proxy):
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
nsr = create_nsr_from_nsd_id(nsd.id)
- nsr_proxy.merge_config('/ns-instance-config', nsr)
+ nsr_proxy.merge_config('/rw-project:project[rw-project:name="default"]/ns-instance-config', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
assert len(nsrs) == 1
assert nsrs[0].ns_instance_config_ref == nsr.id
diff --git a/rwlaunchpad/test/pytest/lp_test.py b/rwlaunchpad/test/pytest/lp_test.py
index b987b35..8600d5d 100644
--- a/rwlaunchpad/test/pytest/lp_test.py
+++ b/rwlaunchpad/test/pytest/lp_test.py
@@ -22,42 +22,42 @@
@brief Launchpad Module Test
"""
+import datetime
+import gi
import json
import logging
import os
import pytest
-import shlex
import requests
+import shlex
import subprocess
import time
import uuid
-import datetime
-import gi
gi.require_version('RwBaseYang', '1.0')
gi.require_version('RwCloudYang', '1.0')
-gi.require_version('RwIwpYang', '1.0')
gi.require_version('RwlogMgmtYang', '1.0')
gi.require_version('RwNsmYang', '1.0')
-gi.require_version('RwNsmYang', '1.0')
+gi.require_version('ProjectNsdYang', '1.0')
gi.require_version('RwResourceMgrYang', '1.0')
gi.require_version('RwConmanYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
from gi.repository import (
- NsdYang,
+ ProjectNsdYang as NsdYang,
NsrYang,
RwBaseYang,
RwCloudYang,
- RwIwpYang,
RwlogMgmtYang,
RwNsmYang,
RwNsrYang,
RwResourceMgrYang,
RwConmanYang,
- RwVnfdYang,
+ RwProjectVnfdYang as RwVnfdYang,
VldYang,
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
logging.basicConfig(level=logging.DEBUG)
@@ -76,11 +76,6 @@
@pytest.fixture(scope='module')
-def iwp_proxy(request, mgmt_session):
- return mgmt_session.proxy(RwIwpYang)
-
-
-@pytest.fixture(scope='module')
def rwlog_mgmt_proxy(request, mgmt_session):
return mgmt_session.proxy(RwlogMgmtYang)
@@ -172,7 +167,7 @@
def create_nsr_from_nsd_id(nsd_id):
- nsr = RwNsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsr = RwNsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = "pingpong_{}".format(datetime.datetime.now().strftime("%Y%m%d_%H%M%S"))
nsr.short_name = "nsr_short_name"
@@ -181,8 +176,8 @@
nsr.admin_status = "ENABLED"
nsr.cloud_account = "openstack"
- param = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter()
- param.xpath = '/nsd:nsd-catalog/nsd:nsd/nsd:vendor'
+ param = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter()
+ param.xpath = '/rw-project:project/project-nsd:nsd-catalog/project-nsd:nsd/project-nsd:vendor'
param.value = "rift-o-matic"
nsr.input_parameter.append(param)
@@ -208,14 +203,14 @@
pass
-def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1"):
+def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1", project="default"):
logger.info("Waiting for onboard trans_id %s to complete",
transaction_id)
start_time = time.time()
while (time.time() - start_time) < timeout_secs:
r = requests.get(
- 'http://{host}:4567/api/upload/{t_id}/state'.format(
- host=host, t_id=transaction_id
+ 'http://{host}:8008/api/operational/project/{proj}/create-jobs/job/{t_id}'.format(
+ host=host, proj=project, t_id=transaction_id
)
)
state = r.json()
@@ -251,7 +246,7 @@
rwlog_mgmt_proxy.merge_config("/rwlog-mgmt:logging", logging)
def test_configure_cloud_account(self, cloud_proxy, logger):
- cloud_account = RwCloudYang.CloudAccount()
+ cloud_account = RwCloudYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList()
# cloud_account.name = "cloudsim_proxy"
# cloud_account.account_type = "cloudsim_proxy"
cloud_account.name = "openstack"
@@ -269,7 +264,7 @@
trans_id = upload_descriptor(logger, ping_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 1, "There should only be a single vnfd"
vnfd = vnfds[0]
@@ -280,7 +275,7 @@
trans_id = upload_descriptor(logger, pong_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 2, "There should be two vnfds"
assert "pong_vnfd" in [vnfds[0].name, vnfds[1].name]
@@ -290,20 +285,20 @@
trans_id = upload_descriptor(logger, ping_pong_nsd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsds = catalog.nsd
assert len(nsds) == 1, "There should only be a single nsd"
nsd = nsds[0]
assert nsd.name == "ping_pong_nsd"
def test_instantiate_ping_pong_nsr(self, logger, nsd_proxy, nsr_proxy, rwnsr_proxy, base_proxy):
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
nsr = create_nsr_from_nsd_id(nsd.id)
- rwnsr_proxy.merge_config('/ns-instance-config', nsr)
+ rwnsr_proxy.merge_config('/rw-project:project[rw-project:name="default"]/ns-instance-config', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
assert len(nsrs) == 1
assert nsrs[0].ns_instance_config_ref == nsr.id
@@ -383,8 +378,8 @@
# assert False, "Did not find all ping and pong component in time"
#def test_terminate_ping_pong_ns(self, logger, nsd_proxy, nsr_proxy, rwnsr_proxy, base_proxy):
- # nsr_configs = nsr_proxy.get_config('/ns-instance-config')
+ # nsr_configs = nsr_proxy.get_config('/rw-project:project[rw-project:name="default"]/ns-instance-config')
# nsr = nsr_configs.nsr[0]
# nsr_id = nsr.id
- # nsr_configs = nsr_proxy.delete_config("/ns-instance-config/nsr[id='{}']".format(nsr_id))
+ # nsr_configs = nsr_proxy.delete_config("/ns-instance-config/nsr[id={}]".format(quoted_key(nsr_id)))
diff --git a/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_epa_test.py b/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_epa_test.py
index 16a8990..4583a4a 100644
--- a/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_epa_test.py
+++ b/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_epa_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
import gi
gi.require_version('RwIwpYang', '1.0')
gi.require_version('RwNsrYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
gi.require_version('RwCloudYang', '1.0')
gi.require_version('RwBaseYang', '1.0')
gi.require_version('RwResourceMgrYang', '1.0')
@@ -44,7 +44,19 @@
-from gi.repository import RwIwpYang, NsdYang, NsrYang, RwNsrYang, VldYang, RwVnfdYang, RwCloudYang, RwBaseYang, RwResourceMgrYang, RwConmanYang, RwNsmYang
+from gi.repository import (
+ RwIwpYang,
+ ProjectNsdYang as NsdYang,
+ NsrYang,
+ RwNsrYang,
+ VldYang,
+ RwProjectVnfdYang as RwVnfdYang,
+ RwCloudYang,
+ RwBaseYang,
+ RwResourceMgrYang,
+ RwConmanYang,
+ RwNsmYang
+)
logging.basicConfig(level=logging.DEBUG)
@@ -172,7 +184,7 @@
def create_nsr_from_nsd_id(nsd_id):
- nsr = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsr = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = "TG-2Vrouter-TS EPA"
nsr.short_name = "TG-2Vrouter-TS EPA"
@@ -201,14 +213,14 @@
pass
-def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1"):
+def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1", project='default'):
logger.info("Waiting for onboard trans_id %s to complete",
transaction_id)
start_time = time.time()
while (time.time() - start_time) < timeout_secs:
r = requests.get(
- 'http://{host}:4567/api/upload/{t_id}/state'.format(
- host=host, t_id=transaction_id
+ 'http://{host}:8008/api/operational/project/{proj}/create-jobs/job/{t_id}'.format(
+ host=host, proj=project, t_id=transaction_id
)
)
state = r.json()
@@ -240,10 +252,10 @@
cloud_account.openstack.tenant = 'demo'
cloud_account.openstack.mgmt_network = 'private'
- cloud_proxy.merge_config("/rw-cloud:cloud-account", cloud_account)
+ cloud_proxy.merge_config("/rw-project:project/rw-cloud:cloud-account", cloud_account)
def test_configure_pools(self, resource_mgr_proxy):
- pools = RwResourceMgrYang.ResourcePools.from_dict({
+ pools = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgrConfig_ResourcePools.from_dict({
"pools": [{ "name": "vm_pool_a",
"resource_type": "compute",
"pool_type" : "dynamic"},
@@ -251,29 +263,14 @@
"resource_type": "network",
"pool_type" : "dynamic",}]})
- resource_mgr_proxy.merge_config('/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
+ resource_mgr_proxy.merge_config('/rw-project:project/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
- def test_configure_resource_orchestrator(self, so_proxy):
- cfg = RwConmanYang.RoEndpoint.from_dict({'ro_ip_address': '127.0.0.1',
- 'ro_port' : 2022,
- 'ro_username' : 'admin',
- 'ro_password' : 'admin'})
- so_proxy.merge_config('/rw-conman:cm-config', cfg)
-
- def test_configure_service_orchestrator(self, nsm_proxy):
- cfg = RwNsmYang.SoEndpoint.from_dict({'cm_ip_address': '127.0.0.1',
- 'cm_port' : 2022,
- 'cm_username' : 'admin',
- 'cm_password' : 'admin'})
- nsm_proxy.merge_config('/rw-nsm:ro-config/rw-nsm:cm-endpoint', cfg)
-
-
def test_onboard_tg_vnfd(self, logger, vnfd_proxy, tg_vnfd_package_file):
logger.info("Onboarding trafgen_vnfd package: %s", tg_vnfd_package_file)
trans_id = upload_descriptor(logger, tg_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 1, "There should be one vnfds"
assert "trafgen_vnfd" in [vnfds[0].name]
@@ -283,7 +280,7 @@
trans_id = upload_descriptor(logger, vrouter_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 2, "There should be two vnfds"
assert "vrouter_vnfd" in [vnfds[0].name, vnfds[1].name]
@@ -293,7 +290,7 @@
trans_id = upload_descriptor(logger, ts_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 3, "There should be three vnfds"
assert "trafsink_vnfd" in [vnfds[0].name, vnfds[1].name, vnfds[2].name]
@@ -303,7 +300,7 @@
trans_id = upload_descriptor(logger, tg_2vrouter_ts_nsd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsds = catalog.nsd
assert len(nsds) == 1, "There should only be a single nsd"
nsd = nsds[0]
@@ -311,13 +308,13 @@
assert nsd.short_name == "tg_2vrouter_ts_nsd"
def test_instantiate_tg_2vrouter_ts_nsr(self, logger, nsd_proxy, nsr_proxy, rwnsr_proxy, base_proxy):
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
nsr = create_nsr_from_nsd_id(nsd.id)
- nsr_proxy.merge_config('/ns-instance-config', nsr)
+ nsr_proxy.merge_config('/rw-project:project[rw-project:name="default"]/ns-instance-config', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
assert len(nsrs) == 1
assert nsrs[0].ns_instance_config_ref == nsr.id
diff --git a/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_test.py b/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_test.py
index ed00a25..f22c88f 100644
--- a/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_test.py
+++ b/rwlaunchpad/test/pytest/lp_tg_2vrouter_ts_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -35,16 +35,26 @@
import gi
gi.require_version('RwIwpYang', '1.0')
gi.require_version('RwNsrYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
gi.require_version('RwCloudYang', '1.0')
gi.require_version('RwBaseYang', '1.0')
gi.require_version('RwResourceMgrYang', '1.0')
gi.require_version('RwConmanYang', '1.0')
gi.require_version('RwNsmYang', '1.0')
-
-
-from gi.repository import RwIwpYang, NsdYang, NsrYang, RwNsrYang, VldYang, RwVnfdYang, RwCloudYang, RwBaseYang, RwResourceMgrYang, RwConmanYang, RwNsmYang
+from gi.repository import (
+ RwIwpYang,
+ ProjectNsdYang as NsdYang,
+ NsrYang,
+ RwNsrYang,
+ VldYang,
+ RwProjectVnfdYang as RwVnfdYang,
+ RwCloudYang,
+ RwBaseYang,
+ RwResourceMgrYang,
+ RwConmanYang,
+ RwNsmYang
+ )
logging.basicConfig(level=logging.DEBUG)
@@ -172,7 +182,7 @@
def create_nsr_from_nsd_id(nsd_id):
- nsr = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsr = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = "TG-2Vrouter-TS EPA"
nsr.short_name = "TG-2Vrouter-TS EPA"
@@ -201,14 +211,14 @@
pass
-def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1"):
+def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1", project="default"):
logger.info("Waiting for onboard trans_id %s to complete",
transaction_id)
start_time = time.time()
while (time.time() - start_time) < timeout_secs:
r = requests.get(
- 'http://{host}:4567/api/upload/{t_id}/state'.format(
- host=host, t_id=transaction_id
+ 'http://{host}:8008/api/operational/project/{proj}/create-jobs/job/{t_id}'.format(
+ host=host, proj=project, t_id=transaction_id
)
)
state = r.json()
@@ -240,10 +250,10 @@
cloud_account.openstack.tenant = 'demo'
cloud_account.openstack.mgmt_network = 'private'
- cloud_proxy.merge_config("/rw-cloud:cloud-account", cloud_account)
+ cloud_proxy.merge_config("/rw-project:project/rw-cloud:cloud-account", cloud_account)
def test_configure_pools(self, resource_mgr_proxy):
- pools = RwResourceMgrYang.ResourcePools.from_dict({
+ pools = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgrConfig_ResourcePools.from_dict({
"pools": [{ "name": "vm_pool_a",
"resource_type": "compute",
"pool_type" : "dynamic"},
@@ -251,29 +261,14 @@
"resource_type": "network",
"pool_type" : "dynamic",}]})
- resource_mgr_proxy.merge_config('/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
+ resource_mgr_proxy.merge_config('/rw-project:project/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
- def test_configure_resource_orchestrator(self, so_proxy):
- cfg = RwConmanYang.RoEndpoint.from_dict({'ro_ip_address': '127.0.0.1',
- 'ro_port' : 2022,
- 'ro_username' : 'admin',
- 'ro_password' : 'admin'})
- so_proxy.merge_config('/rw-conman:cm-config', cfg)
-
- def test_configure_service_orchestrator(self, nsm_proxy):
- cfg = RwNsmYang.SoEndpoint.from_dict({'cm_ip_address': '127.0.0.1',
- 'cm_port' : 2022,
- 'cm_username' : 'admin',
- 'cm_password' : 'admin'})
- nsm_proxy.merge_config('/rw-nsm:ro-config/rw-nsm:cm-endpoint', cfg)
-
-
def test_onboard_tg_vnfd(self, logger, vnfd_proxy, tg_vnfd_package_file):
logger.info("Onboarding trafgen_vnfd package: %s", tg_vnfd_package_file)
trans_id = upload_descriptor(logger, tg_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 1, "There should be one vnfds"
assert "trafgen_vnfd" in [vnfds[0].name]
@@ -283,7 +278,7 @@
trans_id = upload_descriptor(logger, vrouter_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 2, "There should be two vnfds"
assert "vrouter_vnfd" in [vnfds[0].name, vnfds[1].name]
@@ -293,7 +288,7 @@
trans_id = upload_descriptor(logger, ts_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 3, "There should be three vnfds"
assert "trafsink_vnfd" in [vnfds[0].name, vnfds[1].name, vnfds[2].name]
@@ -303,7 +298,7 @@
trans_id = upload_descriptor(logger, tg_2vrouter_ts_nsd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsds = catalog.nsd
assert len(nsds) == 1, "There should only be a single nsd"
nsd = nsds[0]
@@ -311,13 +306,13 @@
assert nsd.short_name == "tg_2vrouter_ts_nsd"
def test_instantiate_tg_2vrouter_ts_nsr(self, logger, nsd_proxy, nsr_proxy, rwnsr_proxy, base_proxy):
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
nsr = create_nsr_from_nsd_id(nsd.id)
- nsr_proxy.merge_config('/ns-instance-config', nsr)
+ nsr_proxy.merge_config('/rw-project:project[rw-project:name="default"]/ns-instance-config', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
assert len(nsrs) == 1
assert nsrs[0].ns_instance_config_ref == nsr.id
diff --git a/rwlaunchpad/test/pytest/lp_tg_vrouter_ts_epa_sriov_test.py b/rwlaunchpad/test/pytest/lp_tg_vrouter_ts_epa_sriov_test.py
index 4d6e345..60c20a3 100644
--- a/rwlaunchpad/test/pytest/lp_tg_vrouter_ts_epa_sriov_test.py
+++ b/rwlaunchpad/test/pytest/lp_tg_vrouter_ts_epa_sriov_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
"""
#
-# Copyright 2016 RIFT.IO Inc
+# Copyright 2016-2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@
import gi
gi.require_version('RwIwpYang', '1.0')
gi.require_version('RwNsrYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
gi.require_version('RwCloudYang', '1.0')
gi.require_version('RwBaseYang', '1.0')
gi.require_version('RwResourceMgrYang', '1.0')
@@ -43,7 +43,19 @@
gi.require_version('RwNsmYang', '1.0')
-from gi.repository import RwIwpYang, NsdYang, NsrYang, RwNsrYang, VldYang, RwVnfdYang, RwCloudYang, RwBaseYang, RwResourceMgrYang, RwConmanYang, RwNsmYang
+from gi.repository import (
+ RwIwpYang,
+ ProjectNsdYang,
+ NsrYang,
+ RwNsrYang,
+ VldYang,
+ RwProjectVnfdYang as RwVnfdYang,
+ RwCloudYang,
+ RwBaseYang,
+ RwResourceMgrYang,
+ RwConmanYang,
+ RwNsmYang
+ )
logging.basicConfig(level=logging.DEBUG)
@@ -171,7 +183,7 @@
def create_nsr_from_nsd_id(nsd_id):
- nsr = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsr = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr.id = str(uuid.uuid4())
nsr.name = "TG-Vrouter-TS-EPA-SRIOV"
nsr.short_name = "TG-Vrouter-TS-EPA-SRIOV"
@@ -200,14 +212,14 @@
pass
-def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1"):
+def wait_unboard_transaction_finished(logger, transaction_id, timeout_secs=600, host="127.0.0.1", project="default"):
logger.info("Waiting for onboard trans_id %s to complete",
transaction_id)
start_time = time.time()
while (time.time() - start_time) < timeout_secs:
r = requests.get(
- 'http://{host}:4567/api/upload/{t_id}/state'.format(
- host=host, t_id=transaction_id
+ 'http://{host}:8008/api/operational/project/{proj}/create-jobs/job/{t_id}'.format(
+ host=host, proj=project, t_id=transaction_id
)
)
state = r.json()
@@ -239,10 +251,10 @@
cloud_account.openstack.tenant = 'demo'
cloud_account.openstack.mgmt_network = 'private'
- cloud_proxy.merge_config("/rw-cloud:cloud-account", cloud_account)
+ cloud_proxy.merge_config("/rw-project:project/rw-cloud:cloud-account", cloud_account)
def test_configure_pools(self, resource_mgr_proxy):
- pools = RwResourceMgrYang.ResourcePools.from_dict({
+ pools = RwResourceMgrYang.YangData_RwProject_Project_ResourceMgrConfig_ResourcePools.from_dict({
"pools": [{ "name": "vm_pool_a",
"resource_type": "compute",
"pool_type" : "dynamic"},
@@ -250,29 +262,14 @@
"resource_type": "network",
"pool_type" : "dynamic",}]})
- resource_mgr_proxy.merge_config('/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
+ resource_mgr_proxy.merge_config('/rw-project:project/rw-resource-mgr:resource-mgr-config/rw-resource-mgr:resource-pools', pools)
- def test_configure_resource_orchestrator(self, so_proxy):
- cfg = RwConmanYang.RoEndpoint.from_dict({'ro_ip_address': '127.0.0.1',
- 'ro_port' : 2022,
- 'ro_username' : 'admin',
- 'ro_password' : 'admin'})
- so_proxy.merge_config('/rw-conman:cm-config', cfg)
-
- def test_configure_service_orchestrator(self, nsm_proxy):
- cfg = RwNsmYang.SoEndpoint.from_dict({'cm_ip_address': '127.0.0.1',
- 'cm_port' : 2022,
- 'cm_username' : 'admin',
- 'cm_password' : 'admin'})
- nsm_proxy.merge_config('/rw-nsm:ro-config/rw-nsm:cm-endpoint', cfg)
-
-
def test_onboard_tg_vnfd(self, logger, vnfd_proxy, tg_vnfd_package_file):
logger.info("Onboarding trafgen_vnfd package: %s", tg_vnfd_package_file)
trans_id = upload_descriptor(logger, tg_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 1, "There should be one vnfds"
assert "trafgen_vnfd" in [vnfds[0].name]
@@ -282,7 +279,7 @@
trans_id = upload_descriptor(logger, vrouter_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 2, "There should be two vnfds"
assert "vrouter_vnfd" in [vnfds[0].name, vnfds[1].name]
@@ -292,7 +289,7 @@
trans_id = upload_descriptor(logger, ts_vnfd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = vnfd_proxy.get_config('/vnfd-catalog')
+ catalog = vnfd_proxy.get_config('/rw-project:project[rw-project:name="default"]/vnfd-catalog')
vnfds = catalog.vnfd
assert len(vnfds) == 3, "There should be three vnfds"
assert "trafsink_vnfd" in [vnfds[0].name, vnfds[1].name, vnfds[2].name]
@@ -302,20 +299,20 @@
trans_id = upload_descriptor(logger, tg_vrouter_ts_nsd_package_file)
wait_unboard_transaction_finished(logger, trans_id)
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsds = catalog.nsd
assert len(nsds) == 1, "There should only be a single nsd"
nsd = nsds[0]
assert nsd.name == "tg_vrouter_ts_nsd"
def test_instantiate_tg_vrouter_ts_nsr(self, logger, nsd_proxy, nsr_proxy, rwnsr_proxy, base_proxy):
- catalog = nsd_proxy.get_config('/nsd-catalog')
+ catalog = nsd_proxy.get_config('/rw-project:project[rw-project:name="default"]/nsd-catalog')
nsd = catalog.nsd[0]
nsr = create_nsr_from_nsd_id(nsd.id)
- nsr_proxy.merge_config('/ns-instance-config', nsr)
+ nsr_proxy.merge_config('/rw-project:project[rw-project:name="default"]/ns-instance-config', nsr)
- nsr_opdata = rwnsr_proxy.get('/ns-instance-opdata')
+ nsr_opdata = rwnsr_proxy.get('/rw-project:project[rw-project:name="default"]/ns-instance-opdata')
nsrs = nsr_opdata.nsr
assert len(nsrs) == 1
assert nsrs[0].ns_instance_config_ref == nsr.id
diff --git a/rwlaunchpad/test/racfg/lprecovery_test.racfg b/rwlaunchpad/test/racfg/lprecovery_test.racfg
index 43e07aa..7ce907d 100644
--- a/rwlaunchpad/test/racfg/lprecovery_test.racfg
+++ b/rwlaunchpad/test/racfg/lprecovery_test.racfg
@@ -5,7 +5,7 @@
"test_description":"Test targeting launchpad recovery feature",
"run_as_root": true,
"status":"broken",
- "keywords":["nightly","smoke"],
+ "keywords":["nightly"],
"timelimit": 4800,
"networks":[],
"vms":[
diff --git a/rwlaunchpad/test/tosca_ut.py b/rwlaunchpad/test/tosca_ut.py
index 40efe41..31a9276 100755
--- a/rwlaunchpad/test/tosca_ut.py
+++ b/rwlaunchpad/test/tosca_ut.py
@@ -26,6 +26,10 @@
import unittest
import xmlrunner
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
import rift.mano.examples.ping_pong_nsd as ping_pong_nsd
from rift.mano.utils.compare_desc import CompareDescShell
diff --git a/rwlaunchpad/test/utest_nsr_handler.py b/rwlaunchpad/test/utest_nsr_handler.py
index ffab929..40049b3 100755
--- a/rwlaunchpad/test/utest_nsr_handler.py
+++ b/rwlaunchpad/test/utest_nsr_handler.py
@@ -18,13 +18,13 @@
import argparse
import asyncio
+import gi
import logging
import os
import sys
import time
import unittest
import uuid
-
import xmlrunner
import gi.repository.RwDts as rwdts
@@ -38,6 +38,9 @@
import rift.tasklets
import rift.test.dts
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
+
import mano_ut
@@ -47,8 +50,8 @@
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"
+ NSR_XPATH = "C,/rw-project:project/nsr:ns-instance-config/nsr:nsr"
+ SCALE_INSTANCE_XPATH = "C,/rw-project:project/nsr:ns-instance-config/nsr:nsr/nsr:scaling-group/nsr:instance"
def __init__(self, dts, log, loop, nsm):
self._dts = dts
@@ -66,12 +69,12 @@
def get_scale_group_instances(self, nsr_id, group_name):
def nsr_id_from_keyspec(ks):
- nsr_path_entry = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr.schema().keyspec_to_entry(ks)
+ nsr_path_entry = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr.schema().keyspec_to_entry(ks)
nsr_id = nsr_path_entry.key00.id
return nsr_id
def group_name_from_keyspec(ks):
- group_path_entry = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_ScalingGroup.schema().keyspec_to_entry(ks)
+ group_path_entry = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_ScalingGroup.schema().keyspec_to_entry(ks)
group_name = group_path_entry.key00.scaling_group_name_ref
return group_name
@@ -95,12 +98,12 @@
""" Register for Nsr create/update/delete/read requests from dts """
def nsr_id_from_keyspec(ks):
- nsr_path_entry = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr.schema().keyspec_to_entry(ks)
+ nsr_path_entry = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr.schema().keyspec_to_entry(ks)
nsr_id = nsr_path_entry.key00.id
return nsr_id
def group_name_from_keyspec(ks):
- group_path_entry = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_ScalingGroup.schema().keyspec_to_entry(ks)
+ group_path_entry = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_ScalingGroup.schema().keyspec_to_entry(ks)
group_name = group_path_entry.key00.scaling_group_name_ref
return group_name
@@ -327,16 +330,16 @@
class XPaths(object):
@staticmethod
def nsr_config(nsr_id=None):
- return ("C,/nsr:ns-instance-config/nsr:nsr" +
- ("[nsr:id='{}']".format(nsr_id) if nsr_id is not None else ""))
+ return ("C,/rw-project:project/nsr:ns-instance-config/nsr:nsr" +
+ ("[nsr:id={}]".format(quoted_key(nsr_id)) if nsr_id is not None else ""))
def scaling_group_instance(nsr_id, group_name, instance_id):
- return ("C,/nsr:ns-instance-config/nsr:nsr" +
- "[nsr:id='{}']".format(nsr_id) +
+ return ("C,/rw-project:project/nsr:ns-instance-config/nsr:nsr" +
+ "[nsr:id={}]".format(quoted_key(nsr_id)) +
"/nsr:scaling-group" +
- "[nsr:scaling-group-name-ref='{}']".format(group_name) +
+ "[nsr:scaling-group-name-ref={}]".format(quoted_key(group_name)) +
"/nsr:instance" +
- "[nsr:id='{}']".format(instance_id)
+ "[nsr:id={}]".format(quoted_key(instance_id))
)
@@ -377,7 +380,7 @@
block = xact.block_create()
block.add_query_update(
XPaths.nsr_config(nsr1_uuid),
- NsrYang.YangData_Nsr_NsInstanceConfig_Nsr(id=nsr1_uuid, name="fu"),
+ NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr(id=nsr1_uuid, name="fu"),
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
@@ -388,7 +391,7 @@
block = xact.block_create()
block.add_query_update(
XPaths.scaling_group_instance(nsr1_uuid, "group", 1234),
- NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_ScalingGroup_Instance(id=1234),
+ NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_ScalingGroup_Instance(id=1234),
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
@@ -409,7 +412,7 @@
block = xact.block_create()
block.add_query_create(
XPaths.scaling_group_instance(nsr1_uuid, "group", 12345),
- NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_ScalingGroup_Instance(id=12345),
+ NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_ScalingGroup_Instance(id=12345),
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
@@ -427,7 +430,7 @@
block = xact.block_create()
block.add_query_update(
XPaths.nsr_config(nsr2_uuid),
- NsrYang.YangData_Nsr_NsInstanceConfig_Nsr(id=nsr2_uuid, name="fu2"),
+ NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr(id=nsr2_uuid, name="fu2"),
flags=rwdts.XactFlag.ADVISE | rwdts.XactFlag.TRACE,
)
yield from block.execute(now=True)
diff --git a/rwlaunchpad/test/utest_ro_account.py b/rwlaunchpad/test/utest_ro_account.py
index aa485ef..6c08fe8 100755
--- a/rwlaunchpad/test/utest_ro_account.py
+++ b/rwlaunchpad/test/utest_ro_account.py
@@ -20,22 +20,30 @@
import types
import unittest
import uuid
+import os
+import xmlrunner
+
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
import rift.test.dts
import rift.tasklets.rwnsmtasklet.cloud as cloud
+import rift.tasklets.rwnsmtasklet.rwnsmplugin as rwnsmplugin
import rift.tasklets.rwnsmtasklet.openmano_nsm as openmano_nsm
+from rift.mano.utils.project import ManoProject
import rw_peas
import gi
-gi.require_version('RwDtsYang', '1.0')
+gi.require_version('RwDts', '1.0')
from gi.repository import (
- RwLaunchpadYang as launchpadyang,
+ RwRoAccountYang as roaccountyang,
RwDts as rwdts,
- RwVnfdYang,
+ RwProjectVnfdYang as RwVnfdYang,
RwVnfrYang,
RwNsrYang,
- RwNsdYang,
- VnfrYang
+ RwProjectNsdYang as RwNsdYang,
+ VnfrYang,
)
@@ -44,10 +52,17 @@
self.log = log
self.loop = loop
self.dts = dts
-
self._registrations = []
@asyncio.coroutine
+ def update(self, xpath, desc):
+ self._registrations[-1].update_element(xpath, desc)
+
+ @asyncio.coroutine
+ def delete(self, xpath):
+ self._registrations[-1].delete_element(xpath)
+
+ @asyncio.coroutine
def publish(self, w_path, path, desc):
ready_event = asyncio.Event(loop=self.loop)
@@ -65,11 +80,13 @@
)
self.log.debug("Registering path: %s, obj:%s", w_path, desc)
+
reg = yield from self.dts.register(
w_path,
handler,
flags=rwdts.Flag.PUBLISHER | rwdts.Flag.NO_PREP_READ
)
+
self._registrations.append(reg)
self.log.debug("Registered path : %s", w_path)
yield from ready_event.wait()
@@ -84,7 +101,7 @@
class RoAccountDtsTestCase(rift.test.dts.AbstractDTSTest):
@classmethod
def configure_schema(cls):
- return launchpadyang.get_schema()
+ return roaccountyang.get_schema()
@classmethod
def configure_timeout(cls):
@@ -94,6 +111,7 @@
self.log.debug("STARTING - %s", test_id)
self.tinfo = self.new_tinfo(str(test_id))
self.dts = rift.tasklets.DTS(self.tinfo, self.schema, self.loop)
+ self.project = ManoProject(self.log)
self.tinfo_sub = self.new_tinfo(str(test_id) + "_sub")
self.dts_sub = rift.tasklets.DTS(self.tinfo_sub, self.schema, self.loop)
@@ -105,59 +123,44 @@
@rift.test.dts.async_test
def test_orch_account_create(self):
- orch = cloud.ROAccountPluginSelector(self.dts, self.log, self.loop, None)
-
- yield from orch.register()
-
+ ro_cfg_sub = cloud.ROAccountConfigSubscriber(self.dts, self.log, self.loop, self.project, None)
+ yield from ro_cfg_sub.register()
+
+ ro_plugin = ro_cfg_sub.get_ro_plugin(account_name=None)
# Test if we have a default plugin in case no RO is specified.
- assert type(orch.ro_plugin) is cloud.RwNsPlugin
- mock_orch_acc = launchpadyang.ResourceOrchestrator.from_dict(
- {'name': 'rift-ro', 'account_type': 'rift_ro', 'rift_ro': {'rift_ro': True}})
+ assert type(ro_plugin) is rwnsmplugin.RwNsPlugin
# Test rift-ro plugin CREATE
- w_xpath = "C,/rw-launchpad:resource-orchestrator"
- xpath = w_xpath
- yield from self.publisher.publish(w_xpath, xpath, mock_orch_acc)
- yield from asyncio.sleep(5, loop=self.loop)
-
- assert type(orch.ro_plugin) is cloud.RwNsPlugin
+ w_xpath = self.project.add_project("C,/rw-ro-account:ro-account/rw-ro-account:account")
+ xpath = w_xpath + "[rw-ro-account:name='openmano']"
# Test Openmano plugin CREATE
- mock_orch_acc = launchpadyang.ResourceOrchestrator.from_dict(
+ mock_orch_acc = roaccountyang.YangData_RwProject_Project_RoAccount_Account.from_dict(
{'name': 'openmano',
- 'account_type': 'openmano',
+ 'ro_account_type': 'openmano',
'openmano': {'tenant_id': "abc",
"port": 9999,
"host": "10.64.11.77"}})
+
yield from self.publisher.publish(w_xpath, xpath, mock_orch_acc)
yield from asyncio.sleep(5, loop=self.loop)
-
- assert type(orch.ro_plugin) is openmano_nsm.OpenmanoNsPlugin
- assert orch.ro_plugin._cli_api._port == mock_orch_acc.openmano.port
- assert orch.ro_plugin._cli_api._host == mock_orch_acc.openmano.host
+
+ ro_plugin = ro_cfg_sub.get_ro_plugin(account_name='openmano')
+ assert type(ro_plugin) is openmano_nsm.OpenmanoNsPlugin
# Test update
mock_orch_acc.openmano.port = 9789
mock_orch_acc.openmano.host = "10.64.11.78"
- yield from self.dts.query_update("C,/rw-launchpad:resource-orchestrator",
- rwdts.XactFlag.ADVISE, mock_orch_acc)
- assert orch.ro_plugin._cli_api._port == mock_orch_acc.openmano.port
- assert orch.ro_plugin._cli_api._host == mock_orch_acc.openmano.host
+ yield from self.publisher.update(xpath, mock_orch_acc)
+ yield from asyncio.sleep(5, loop=self.loop)
- # Test update when a live instance exists
- # Exception should be thrown
- orch.handle_nsr(None, rwdts.QueryAction.CREATE)
- mock_orch_acc.openmano.port = 9788
+ #Since update means delete followed by a insert get the new ro_plugin.
+ ro_plugin = ro_cfg_sub.get_ro_plugin(account_name='openmano')
+ assert ro_plugin._cli_api._port == mock_orch_acc.openmano.port
+ assert ro_plugin._cli_api._host == mock_orch_acc.openmano.host
- with self.assertRaises(Exception):
- yield from self.dts.query_update("C,/rw-launchpad:resource-orchestrator",
- rwdts.XactFlag.ADVISE, mock_orch_acc)
-
- # Test delete
- yield from self.dts.query_delete("C,/rw-launchpad:resource-orchestrator",
- flags=rwdts.XactFlag.ADVISE)
- assert orch.ro_plugin == None
-
+ # Test delete to be implemented. right now facing some dts issues.
+ # Use DescriptorPublisher delete for deletion
def main(argv=sys.argv[1:]):
@@ -166,8 +169,8 @@
# when this is called from the interpreter).
unittest.main(
argv=[__file__] + argv,
- testRunner=None#xmlrunner.XMLTestRunner(output=os.environ["RIFT_MODULE_TEST"])
+ testRunner=xmlrunner.XMLTestRunner(output=os.environ["RIFT_MODULE_TEST"])
)
if __name__ == '__main__':
- main()
\ No newline at end of file
+ main()
diff --git a/rwlaunchpad/test/utest_rwmonitor.py b/rwlaunchpad/test/utest_rwmonitor.py
index 46c33b3..b69815f 100755
--- a/rwlaunchpad/test/utest_rwmonitor.py
+++ b/rwlaunchpad/test/utest_rwmonitor.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-#
+#
# Copyright 2016 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -60,6 +60,7 @@
UnknownAccountError,
)
import rw_peas
+from rift.mano.utils.project import ManoProject, DEFAULT_PROJECT
class wait_for_pending_tasks(object):
@@ -108,17 +109,17 @@
def make_nsr(ns_instance_config_ref=str(uuid.uuid4())):
- nsr = NsrYang.YangData_Nsr_NsInstanceOpdata_Nsr()
+ nsr = NsrYang.YangData_RwProject_Project_NsInstanceOpdata_Nsr()
nsr.ns_instance_config_ref = ns_instance_config_ref
return nsr
def make_vnfr(id=str(uuid.uuid4())):
- vnfr = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr()
+ vnfr = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr()
vnfr.id = id
return vnfr
def make_vdur(id=str(uuid.uuid4()), vim_id=str(uuid.uuid4())):
- vdur = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur()
+ vdur = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur()
vdur.id = id
vdur.vim_id = vim_id
return vdur
@@ -130,7 +131,7 @@
return True
def nfvi_metrics(self, account, vim_id):
- metrics = RwmonYang.NfviMetrics()
+ metrics = RwmonYang.YangData_RwProject_Project_NfviMetrics()
metrics.vcpu.utilization = 0.5
return metrics
@@ -138,7 +139,7 @@
self.loop = asyncio.new_event_loop()
self.logger = logging.getLogger('test-logger')
- self.account = RwcalYang.CloudAccount(
+ self.account = RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList(
name='test-cloud-account',
account_type="mock",
)
@@ -149,7 +150,7 @@
mock = self.plugin_manager.plugin(self.account.name)
mock.set_impl(TestNfviMetricsCache.Plugin())
- self.vdur = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur()
+ self.vdur = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur()
self.vdur.id = "test-vdur-id"
self.vdur.vim_id = "test-vim-id"
self.vdur.vm_flavor.vcpu_count = 4
@@ -207,13 +208,13 @@
return True
def nfvi_metrics(self, account, vim_id):
- metrics = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
+ metrics = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur_NfviMetrics()
metrics.vcpu.utilization = 0.5
return None, metrics
def setUp(self):
self.loop = asyncio.new_event_loop()
- self.account = RwcalYang.CloudAccount(
+ self.account = RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList(
name='test-cloud-account',
account_type="mock",
)
@@ -287,7 +288,7 @@
self._alarms = set()
def nfvi_metrics(self, account, vm_id):
- return rwmon.NfviMetrics()
+ return rwmon.YangData_RwProject_Project_NfviMetrics()
def nfvi_metrics_available(self, account):
return True
@@ -305,7 +306,7 @@
self.loop = asyncio.new_event_loop()
self.logger = logging.getLogger('test-logger')
- self.account = RwcalYang.CloudAccount(
+ self.account = RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList(
name='test-cloud-account',
account_type="mock",
)
@@ -339,8 +340,9 @@
def test_retrieve(self):
pass
+ @unittest.skip("Alarms are being disabled in monitor")
def test_alarm_create_and_destroy(self):
- alarm = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur_Alarms()
+ alarm = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur_Alarms()
alarm.name = "test-alarm"
alarm.description = "test-description"
alarm.vdur_id = "test-vdur-id"
@@ -401,7 +403,7 @@
# return a VCPU utilization of 0.5.
class MockPlugin(object):
def __init__(self):
- self.metrics = RwmonYang.NfviMetrics()
+ self.metrics = RwmonYang.YangData_RwProject_Project_NfviMetrics()
def nfvi_metrics(self, account, vim_id):
self.metrics.vcpu.utilization = 0.5
@@ -410,7 +412,7 @@
self.loop = asyncio.get_event_loop()
self.logger = logging.getLogger('test-logger')
- self.account = RwcalYang.CloudAccount(
+ self.account = RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList(
name='test-cloud-account',
account_type="mock",
)
@@ -485,7 +487,7 @@
def setUp(self):
self.logger = logging.getLogger('test-logger')
self.plugins = NfviMetricsPluginManager(self.logger)
- self.account = RwcalYang.CloudAccount(
+ self.account = RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList(
name='test-cloud-account',
account_type="mock",
)
@@ -553,10 +555,11 @@
self.loop = asyncio.get_event_loop()
self.logger = logging.getLogger('test-logger')
+ self.project = ManoProject(self.logger, name=DEFAULT_PROJECT)
self.config = InstanceConfiguration()
- self.monitor = Monitor(self.loop, self.logger, self.config)
+ self.monitor = Monitor(self.loop, self.logger, self.config, self.project)
- self.account = RwcalYang.CloudAccount(
+ self.account = RwcalYang.YangData_RwProject_Project_CloudAccounts_CloudAccountList(
name='test-cloud-account',
account_type="mock",
)
@@ -606,8 +609,8 @@
self.monitor.add_cloud_account(self.account)
# Create a VNFR associated with the cloud account
- vnfr = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr()
- vnfr.cloud_account = self.account.name
+ vnfr = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr()
+ vnfr.datacenter = self.account.name
vnfr.id = 'test-vnfr-id'
# Add a VDUR to the VNFR
@@ -644,7 +647,7 @@
to retrieve the NFVI metrics associated with the VDU.
"""
# Define the VDUR to be registered
- vdur = VnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur()
+ vdur = VnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur()
vdur.vm_flavor.vcpu_count = 4
vdur.vm_flavor.memory_mb = 100
vdur.vm_flavor.storage_gb = 2
@@ -680,12 +683,12 @@
the VDURs contained in the VNFR are unregistered.
"""
# Define the VDUR to be registered
- vdur = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur()
+ vdur = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur()
vdur.vim_id = 'test-vim-id-1'
vdur.id = 'test-vdur-id-1'
- vnfr = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr()
- vnfr.cloud_account = self.account.name
+ vnfr = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr()
+ vnfr.datacenter = self.account.name
vnfr.id = 'test-vnfr-id'
vnfr.vdur.append(vdur)
@@ -699,7 +702,7 @@
# Add another VDUR to the VNFR and update the monitor. Both VDURs
# should now be registered
- vdur = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr_Vdur()
+ vdur = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr_Vdur()
vdur.vim_id = 'test-vim-id-2'
vdur.id = 'test-vdur-id-2'
@@ -730,8 +733,8 @@
Monitor.
"""
# Create the VNFR
- vnfr = RwVnfrYang.YangData_Vnfr_VnfrCatalog_Vnfr()
- vnfr.cloud_account = self.account.name
+ vnfr = RwVnfrYang.YangData_RwProject_Project_VnfrCatalog_Vnfr()
+ vnfr.datacenter = self.account.name
vnfr.id = 'test-vnfr-id'
# Create 2 VDURs
@@ -752,8 +755,8 @@
class MockPlugin(object):
def __init__(self):
self._metrics = dict()
- self._metrics['test-vim-id-1'] = RwmonYang.NfviMetrics()
- self._metrics['test-vim-id-2'] = RwmonYang.NfviMetrics()
+ self._metrics['test-vim-id-1'] = RwmonYang.YangData_RwProject_Project_NfviMetrics()
+ self._metrics['test-vim-id-2'] = RwmonYang.YangData_RwProject_Project_NfviMetrics()
def nfvi_metrics(self, account, vim_id):
metrics = self._metrics[vim_id]
diff --git a/rwlaunchpad/test/utest_rwnsm.py b/rwlaunchpad/test/utest_rwnsm.py
index e125739..48b4ff2 100755
--- a/rwlaunchpad/test/utest_rwnsm.py
+++ b/rwlaunchpad/test/utest_rwnsm.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
-#
-# Copyright 2016 RIFT.IO Inc
+#
+# Copyright 2016-17 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -25,15 +25,29 @@
import uuid
import xmlrunner
+import gi
+gi.require_version('ProjectNsdYang', '1.0')
+gi.require_version('NsrYang', '1.0')
+
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
from gi.repository import (
- NsdYang,
- NsrYang,
- )
+ ProjectNsdYang,
+ NsrYang,
+)
+
logger = logging.getLogger('test-rwnsmtasklet')
import rift.tasklets.rwnsmtasklet.rwnsmtasklet as rwnsmtasklet
import rift.tasklets.rwnsmtasklet.xpath as rwxpath
+from rift.mano.utils.project import ManoProject
+
+
+def prefix_project(xpath):
+ return "/rw-project:project" + xpath
class TestGiXpath(unittest.TestCase):
def setUp(self):
@@ -46,26 +60,27 @@
"""
# Create the initial NSD catalog
- nsd_catalog = NsdYang.YangData_Nsd_NsdCatalog()
+ nsd_catalog = ProjectNsdYang.YangData_RwProject_Project_NsdCatalog()
# Create an NSD, set its 'id', and add it to the catalog
nsd_id = str(uuid.uuid4())
nsd_catalog.nsd.append(
- NsdYang.YangData_Nsd_NsdCatalog_Nsd(
+ ProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd(
id=nsd_id,
)
)
# Retrieve the NSD using and xpath expression
- xpath = '/nsd:nsd-catalog/nsd:nsd[nsd:id={}]'.format(nsd_id)
+ xpath = prefix_project('/project-nsd:nsd-catalog/project-nsd:nsd[project-nsd:id={}]'.
+ format(nsd_id))
nsd = rwxpath.getxattr(nsd_catalog, xpath)
self.assertEqual(nsd_id, nsd.id)
# Modified the name of the NSD using an xpath expression
- rwxpath.setxattr(nsd_catalog, xpath + "/nsd:name", "test-name")
+ rwxpath.setxattr(nsd_catalog, xpath + "/project-nsd:name", "test-name")
- name = rwxpath.getxattr(nsd_catalog, xpath + "/nsd:name")
+ name = rwxpath.getxattr(nsd_catalog, xpath + "/project-nsd:name")
self.assertEqual("test-name", name)
def test_nsd_scalar_fields(self):
@@ -74,24 +89,27 @@
"""
# Define a simple NSD
- nsd = NsdYang.YangData_Nsd_NsdCatalog_Nsd()
+ nsd = ProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd()
+
+ xpath = prefix_project('/project-nsd:nsd-catalog/project-nsd:nsd')
# Check that the unset fields are in fact set to None
- self.assertEqual(None, rwxpath.getxattr(nsd, "/nsd:nsd-catalog/nsd:nsd/nsd:name"))
- self.assertEqual(None, rwxpath.getxattr(nsd, "/nsd:nsd-catalog/nsd:nsd/nsd:short-name"))
+ self.assertEqual(None, rwxpath.getxattr(nsd, xpath + "/project-nsd:name"))
+ self.assertEqual(None, rwxpath.getxattr(nsd, xpath + "/project-nsd:short-name"))
# Set the values of the 'name' and 'short-name' fields
- rwxpath.setxattr(nsd, "/nsd:nsd-catalog/nsd:nsd/nsd:name", "test-name")
- rwxpath.setxattr(nsd, "/nsd:nsd-catalog/nsd:nsd/nsd:short-name", "test-short-name")
+ rwxpath.setxattr(nsd, xpath + "/project-nsd:name", "test-name")
+ rwxpath.setxattr(nsd, xpath + "/project-nsd:short-name", "test-short-name")
# Check that the 'name' and 'short-name' fields are correctly set
- self.assertEqual(nsd.name, rwxpath.getxattr(nsd, "/nsd:nsd-catalog/nsd:nsd/nsd:name"))
- self.assertEqual(nsd.short_name, rwxpath.getxattr(nsd, "/nsd:nsd-catalog/nsd:nsd/nsd:short-name"))
+ self.assertEqual(nsd.name, rwxpath.getxattr(nsd, xpath + "/project-nsd:name"))
+ self.assertEqual(nsd.short_name, rwxpath.getxattr(nsd, xpath + "/project-nsd:short-name"))
class TestInputParameterSubstitution(unittest.TestCase):
def setUp(self):
- self.substitute_input_parameters = rwnsmtasklet.InputParameterSubstitution(logger)
+ project = ManoProject(logger)
+ self.substitute_input_parameters = rwnsmtasklet.InputParameterSubstitution(logger, project)
def test_null_arguments(self):
"""
@@ -99,8 +117,8 @@
config, no exception should be raised.
"""
- nsd = NsdYang.YangData_Nsd_NsdCatalog_Nsd()
- nsr_config = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsd = ProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd()
+ nsr_config = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
self.substitute_input_parameters(None, None)
self.substitute_input_parameters(nsd, None)
@@ -115,26 +133,26 @@
"""
# Define the original NSD
- nsd = NsdYang.YangData_Nsd_NsdCatalog_Nsd()
+ nsd = ProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd()
nsd.name = "robert"
nsd.short_name = "bob"
# Define which parameters may be modified
nsd.input_parameter_xpath.append(
- NsdYang.YangData_Nsd_NsdCatalog_Nsd_InputParameterXpath(
+ ProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd_InputParameterXpath(
xpath="/nsd:nsd-catalog/nsd:nsd/nsd:name",
label="NSD Name",
)
)
# Define the input parameters that are intended to be modified
- nsr_config = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsr_config = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr_config.input_parameter.extend([
- NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter(
+ NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter(
xpath="/nsd:nsd-catalog/nsd:nsd/nsd:name",
value="alice",
),
- NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter(
+ NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter(
xpath="/nsd:nsd-catalog/nsd:nsd/nsd:short-name",
value="alice",
),
@@ -153,30 +171,30 @@
"""
# Define the original NSD
- nsd = NsdYang.YangData_Nsd_NsdCatalog_Nsd()
- nsd.name = "robert"
- nsd.short_name = "bob"
+ nsd = ProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd()
+ # nsd.name = "robert"
+ # nsd.short_name = "bob"
# Define which parameters may be modified
nsd.input_parameter_xpath.extend([
- NsdYang.YangData_Nsd_NsdCatalog_Nsd_InputParameterXpath(
+ ProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd_InputParameterXpath(
xpath="/nsd:nsd-catalog/nsd:nsd/nsd:name",
label="NSD Name",
),
- NsdYang.YangData_Nsd_NsdCatalog_Nsd_InputParameterXpath(
+ ProjectNsdYang.YangData_RwProject_Project_NsdCatalog_Nsd_InputParameterXpath(
xpath="/nsd:nsd-catalog/nsd:nsd/nsd:short-name",
label="NSD Short Name",
),
])
# Define the input parameters that are intended to be modified
- nsr_config = NsrYang.YangData_Nsr_NsInstanceConfig_Nsr()
+ nsr_config = NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr()
nsr_config.input_parameter.extend([
- NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter(
+ NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter(
xpath="/nsd:nsd-catalog/nsd:nsd/nsd:name",
value="robert",
),
- NsrYang.YangData_Nsr_NsInstanceConfig_Nsr_InputParameter(
+ NsrYang.YangData_RwProject_Project_NsInstanceConfig_Nsr_InputParameter(
xpath="/nsd:nsd-catalog/nsd:nsd/nsd:short-name",
value="bob",
),
diff --git a/rwlaunchpad/test/utest_scaling_rpc.py b/rwlaunchpad/test/utest_scaling_rpc.py
index b2290af..ac25676 100644
--- a/rwlaunchpad/test/utest_scaling_rpc.py
+++ b/rwlaunchpad/test/utest_scaling_rpc.py
@@ -16,19 +16,18 @@
# limitations under the License.
#
-
+import argparse
import asyncio
+import gi
+import logging
import os
import sys
+import time
+import types
import unittest
import uuid
import xmlrunner
-import argparse
-import logging
-import time
-import types
-import gi
gi.require_version('RwCloudYang', '1.0')
gi.require_version('RwDts', '1.0')
gi.require_version('RwNsmYang', '1.0')
@@ -51,6 +50,8 @@
RwConfigAgentYang as rwcfg_agent,
RwlogMgmtYang
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
from gi.repository.RwTypes import RwStatus
import rift.mano.examples.ping_pong_nsd as ping_pong_nsd
@@ -92,7 +93,7 @@
"""
Creates an object for class RwcalYang.Clo
"""
- account = rwcloudyang.CloudAccount()
+ account = rwcloudyang.YangData_RwProject_Project_CloudAccounts_CloudAccountList()
if account_type == 'mock':
account.name = account_name
account.account_type = "mock"
@@ -110,7 +111,7 @@
@asyncio.coroutine
def configure_cloud_account(self, dts, cloud_type, cloud_name="cloud1"):
account = self.get_cal_account(cloud_type, cloud_name)
- account_xpath = "C,/rw-cloud:cloud/rw-cloud:account[rw-cloud:name='{}']".format(cloud_name)
+ account_xpath = "C,/rw-cloud:cloud/rw-cloud:account[rw-cloud:name={}]".format(quoted_key(cloud_name))
self.log.info("Configuring cloud-account: %s", account)
yield from dts.query_create(account_xpath,
rwdts.XactFlag.ADVISE,