update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try
Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
diff --git a/common/python/rift/mano/sdn/accounts.py b/common/python/rift/mano/sdn/accounts.py
index d539ead..fdd20f5 100644
--- a/common/python/rift/mano/sdn/accounts.py
+++ b/common/python/rift/mano/sdn/accounts.py
@@ -1,5 +1,5 @@
-#
+#
# Copyright 2017 RIFT.IO Inc
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,7 +52,7 @@
self._sdn = self.plugin.get_interface("Topology")
self._sdn.init(rwlog_hdl)
- self._status = RwsdnalYang.SDNAccount_ConnectionStatus(
+ self._status = RwSdnYang.YangData_RwProject_Project_Sdn_Account_ConnectionStatus(
status="unknown",
details="Connection status lookup not started"
)
@@ -102,13 +102,13 @@
@property
def sdnal_account_msg(self):
- return RwsdnalYang.SDNAccount.from_dict(
+ return RwsdnalYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList.from_dict(
self.account_msg.as_dict(),
ignore_missing_keys=True,
)
def sdn_account_msg(self, account_dict):
- self._account_msg = RwSdnYang.SDNAccount.from_dict(account_dict)
+ self._account_msg = RwSdnYang.YangData_RwProject_Project_SdnAccounts_SdnAccountList.from_dict(account_dict)
@property
def account_type(self):
@@ -126,8 +126,9 @@
@asyncio.coroutine
def validate_sdn_account_credentials(self, loop):
- self._log.debug("Validating SDN Account credentials %s", self._account_msg)
- self._status = RwSdnYang.SDNAccount_ConnectionStatus(
+ self._log.debug("Validating SDN Account credentials %s",
+ self.name)
+ self._status = RwSdnYang.YangData_RwProject_Project_Sdn_Account_ConnectionStatus(
status="validating",
details="SDN account connection validation in progress"
)
@@ -137,14 +138,16 @@
self.sdnal_account_msg,
)
if rwstatus == RwTypes.RwStatus.SUCCESS:
- self._status = RwSdnYang.SDNAccount_ConnectionStatus.from_dict(status.as_dict())
+ self._status = RwSdnYang.YangData_RwProject_Project_Sdn_Account_ConnectionStatus.from_dict(status.as_dict())
else:
- self._status = RwSdnYang.SDNAccount_ConnectionStatus(
+ self._status = RwSdnYang.YangData_RwProject_Project_Sdn_Account_ConnectionStatus(
status="failure",
details="Error when calling SDNAL validate SDN creds"
)
- self._log.info("Got SDN account validation response: %s", self._status)
+ if self._status.status == 'failure':
+ self._log.error("SDN account validation failed; Acct: %s status: %s",
+ self.name, self._status)
def start_validate_credentials(self, loop):
if self._validate_task is not None:
diff --git a/common/python/rift/mano/sdn/config.py b/common/python/rift/mano/sdn/config.py
index a9de01b..1ae65a5 100644
--- a/common/python/rift/mano/sdn/config.py
+++ b/common/python/rift/mano/sdn/config.py
@@ -26,6 +26,8 @@
ProtobufC,
)
+from rift.mano.utils.project import get_add_delete_update_cfgs
+
from . import accounts
@@ -37,32 +39,6 @@
pass
-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)
-
- 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 SDNAccountConfigCallbacks(object):
def __init__(self,
on_add_apply=None, on_add_prepare=None,
@@ -102,9 +78,10 @@
class SDNAccountConfigSubscriber(object):
XPATH = "C,/rw-sdn:sdn/rw-sdn:account"
- def __init__(self, dts, log, rwlog_hdl, sdn_callbacks, acctstore):
+ def __init__(self, dts, log, project, rwlog_hdl, sdn_callbacks, acctstore):
self._dts = dts
self._log = log
+ self._project = project
self._rwlog_hdl = rwlog_hdl
self._reg = None
@@ -143,6 +120,11 @@
self.delete_account(account_msg.name)
self.add_account(account_msg)
+ def deregister(self):
+ if self._reg:
+ self._reg.deregister()
+ self._reg = None
+
def register(self):
@asyncio.coroutine
def apply_config(dts, acg, xact, action, _):
@@ -224,8 +206,9 @@
xact_info.respond_xpath(rwdts.XactRspCode.ACK)
+ xpath = self._project.add_project(SDNAccountConfigSubscriber.XPATH)
self._log.debug("Registering for SDN Account config using xpath: %s",
- SDNAccountConfigSubscriber.XPATH,
+ xpath,
)
acg_handler = rift.tasklets.AppConfGroup.Handler(
@@ -234,7 +217,7 @@
with self._dts.appconf_group_create(acg_handler) as acg:
self._reg = acg.register(
- xpath=SDNAccountConfigSubscriber.XPATH,
+ xpath=xpath,
flags=rwdts.Flag.SUBSCRIBER | rwdts.Flag.DELTA_READY | rwdts.Flag.CACHE,
on_prepare=on_prepare,
)
diff --git a/common/python/rift/mano/sdn/operdata.py b/common/python/rift/mano/sdn/operdata.py
index b29f100..3478bcf 100644
--- a/common/python/rift/mano/sdn/operdata.py
+++ b/common/python/rift/mano/sdn/operdata.py
@@ -16,12 +16,18 @@
#
import asyncio
+import gi
+
import rift.tasklets
from gi.repository import(
RwSdnYang,
+ RwsdnalYang,
RwDts as rwdts,
+ RwTypes,
)
+gi.require_version('RwKeyspec', '1.0')
+from gi.repository.RwKeyspec import quoted_key
class SDNAccountNotFound(Exception):
@@ -29,12 +35,15 @@
class SDNAccountDtsOperdataHandler(object):
- 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.sdn_accounts = {}
+ self._oper = None
+ self._rpc = None
def add_sdn_account(self, account):
self.sdn_accounts[account.name] = account
@@ -59,23 +68,39 @@
return saved_sdn_accounts
+ @asyncio.coroutine
+ def create_notification(self, account):
+ xpath = "N,/rw-sdn:sdn-notif"
+ ac_status = RwSdnYang.YangNotif_RwSdn_SdnNotif()
+ ac_status.name = account.name
+ ac_status.message = account.connection_status.details
+
+ yield from self._dts.query_create(xpath, rwdts.XactFlag.ADVISE, ac_status)
+ self._log.info("Notification called by creating dts query: %s", ac_status)
+
+
+ @asyncio.coroutine
def _register_show_status(self):
+ self._log.debug("Registering for show for project {}".format(self._project))
def get_xpath(sdn_name=None):
- return "D,/rw-sdn:sdn/account{}/connection-status".format(
- "[name='%s']" % sdn_name if sdn_name is not None else ''
- )
+ return self._project.add_project("D,/rw-sdn:sdn/rw-sdn:account{}/rw-sdn:connection-status".
+ format(
+ "[rw-sdn:name=%s]" % quoted_key(sdn_name)
+ if sdn_name is not None else ''))
@asyncio.coroutine
def on_prepare(xact_info, action, ks_path, msg):
- self._log.debug("Got show SDN connection status request: %s", ks_path.create_string())
- path_entry = RwSdnYang.SDNAccount.schema().keyspec_to_entry(ks_path)
+ xpath = ks_path.to_xpath(RwSdnYang.get_schema())
+ self._log.debug("Got show SDN connection status request: %s", xpath)
+ path_entry = RwSdnYang.YangData_RwProject_Project_Sdn_Account.schema().keyspec_to_entry(ks_path)
sdn_account_name = path_entry.key00.name
try:
saved_accounts = self.get_saved_sdn_accounts(sdn_account_name)
for account in saved_accounts:
connection_status = account.connection_status
- self._log.debug("Responding to SDN connection status request: %s", connection_status)
+ self._log.debug("Responding to SDN connection status request: %s",
+ connection_status)
xact_info.respond_xpath(
rwdts.XactRspCode.MORE,
xpath=get_xpath(account.name),
@@ -88,19 +113,26 @@
xact_info.respond_xpath(rwdts.XactRspCode.ACK)
- yield from self._dts.register(
+ self._oper = yield from self._dts.register(
xpath=get_xpath(),
handler=rift.tasklets.DTS.RegistrationHandler(
on_prepare=on_prepare),
flags=rwdts.Flag.PUBLISHER,
)
+ @asyncio.coroutine
def _register_validate_rpc(self):
+ self._log.debug("Registering for rpc for project {}".format(self._project))
def get_xpath():
return "/rw-sdn:update-sdn-status"
@asyncio.coroutine
def on_prepare(xact_info, action, ks_path, msg):
+ if self._project and not self._project.rpc_check(msg, xact_info=xact_info):
+ return
+
+ self._log.debug("Got update SDN connection status request: %s", msg)
+
if not msg.has_field("sdn_account"):
raise SDNAccountNotFound("SDN account name not provided")
@@ -108,21 +140,39 @@
try:
account = self.sdn_accounts[sdn_account_name]
except KeyError:
- raise SDNAccountNotFound("SDN account name %s not found" % sdn_account_name)
+ errmsg = "SDN account name %s not found" % sdn_account_name
+ self._log.error(errmsg)
+ xpath = ks_path.to_xpath(RwSdnYang.get_schema())
+ xact_info.send_error_xpath(RwTypes.RwStatus.FAILURE,
+ xpath,
+ errmsg)
+ xact_info.respond_xpath(rwdts.XactRspCode.NACK)
+ return
account.start_validate_credentials(self._loop)
+ yield from self.create_notification(account)
+
xact_info.respond_xpath(rwdts.XactRspCode.ACK)
- yield from self._dts.register(
- xpath=get_xpath(),
- handler=rift.tasklets.DTS.RegistrationHandler(
- on_prepare=on_prepare
- ),
- flags=rwdts.Flag.PUBLISHER,
- )
+ self._rpc = yield from self._dts.register(
+ xpath=get_xpath(),
+ handler=rift.tasklets.DTS.RegistrationHandler(
+ on_prepare=on_prepare
+ ),
+ flags=rwdts.Flag.PUBLISHER,
+ )
@asyncio.coroutine
def register(self):
yield from self._register_show_status()
yield from self._register_validate_rpc()
+
+ def deregister(self):
+ if self._oper:
+ self._oper.deregister()
+ self._oper = None
+
+ if self._rpc:
+ self._rpc.deregister()
+ self._rpc = None