The commit consists of:
1) Support metadata (e.g. get-depth) for rpc request.
2) Support parameters in rpc requests
3) Generate the code for netconf rpc to Voltha grpc mapping
4) Initial Support custom rpc requests (those defined in the voltha YANG schemas).
Change-Id: I24dc7fd75b5f71d0d8591637579672b25fda57ec
diff --git a/netconf/nc_rpc/base/close_session.py b/netconf/nc_rpc/base/close_session.py
index 45a6cc2..05b56b4 100644
--- a/netconf/nc_rpc/base/close_session.py
+++ b/netconf/nc_rpc/base/close_session.py
@@ -27,7 +27,7 @@
def __init__(self, request, request_xml, grpc_client, session,
capabilities):
super(CloseSession, self).__init__(request, request_xml, grpc_client,
- session)
+ session, capabilities)
self._validate_parameters()
def execute(self):
diff --git a/netconf/nc_rpc/base/commit.py b/netconf/nc_rpc/base/commit.py
index 22a0e6a..35ea6e6 100644
--- a/netconf/nc_rpc/base/commit.py
+++ b/netconf/nc_rpc/base/commit.py
@@ -25,7 +25,8 @@
class Commit(Rpc):
def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(Commit, self).__init__(request, request_xml, grpc_client, session)
+ super(Commit, self).__init__(request, request_xml, grpc_client,
+ session, capabilities)
self._validate_parameters()
def execute(self):
diff --git a/netconf/nc_rpc/base/copy_config.py b/netconf/nc_rpc/base/copy_config.py
index 1d96b76..74519d3 100644
--- a/netconf/nc_rpc/base/copy_config.py
+++ b/netconf/nc_rpc/base/copy_config.py
@@ -24,7 +24,8 @@
class CopyConfig(Rpc):
def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(CopyConfig, self).__init__(request, request_xml, grpc_client, session)
+ super(CopyConfig, self).__init__(request, request_xml, grpc_client,
+ session, capabilities)
self._validate_parameters()
def execute(self):
diff --git a/netconf/nc_rpc/base/delete_config.py b/netconf/nc_rpc/base/delete_config.py
index e21d2d4..d0135fe 100644
--- a/netconf/nc_rpc/base/delete_config.py
+++ b/netconf/nc_rpc/base/delete_config.py
@@ -23,8 +23,10 @@
class DeleteConfig(Rpc):
- def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(DeleteConfig, self).__init__(request, request_xml, grpc_client, session)
+ def __init__(self, request, request_xml, grpc_client, session,
+ capabilities):
+ super(DeleteConfig, self).__init__(request, request_xml,
+ grpc_client, session, capabilities)
self._validate_parameters()
def execute(self):
diff --git a/netconf/nc_rpc/base/discard_changes.py b/netconf/nc_rpc/base/discard_changes.py
index 4b4b219..2855a6d 100644
--- a/netconf/nc_rpc/base/discard_changes.py
+++ b/netconf/nc_rpc/base/discard_changes.py
@@ -23,8 +23,10 @@
class DiscardChanges(Rpc):
- def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(DiscardChanges, self).__init__(request, request_xml, grpc_client, session)
+ def __init__(self, request, request_xml, grpc_client, session,
+ capabilities):
+ super(DiscardChanges, self).__init__(request, request_xml,
+ grpc_client, session, capabilities)
self._validate_parameters()
def execute(self):
diff --git a/netconf/nc_rpc/base/edit_config.py b/netconf/nc_rpc/base/edit_config.py
index 0991c67..0fa6e5d 100644
--- a/netconf/nc_rpc/base/edit_config.py
+++ b/netconf/nc_rpc/base/edit_config.py
@@ -24,7 +24,8 @@
class EditConfig(Rpc):
def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(EditConfig, self).__init__(request, request_xml, grpc_client, session)
+ super(EditConfig, self).__init__(request, request_xml, grpc_client,
+ session, capabilities)
self._validate_parameters()
def execute(self):
diff --git a/netconf/nc_rpc/base/get.py b/netconf/nc_rpc/base/get.py
index b2bb9fe..6337b5f 100644
--- a/netconf/nc_rpc/base/get.py
+++ b/netconf/nc_rpc/base/get.py
@@ -24,8 +24,13 @@
class Get(Rpc):
- def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(Get, self).__init__(request, request_xml, grpc_client, session)
+ def __init__(self, request, request_xml, grpc_client, session,
+ capabilities):
+ super(Get, self).__init__(request, request_xml, grpc_client, session,
+ capabilities)
+ self.service = None
+ self.method = None
+ self.metadata = None
self._validate_parameters()
@inlineCallbacks
@@ -43,8 +48,26 @@
self.rpc_response.node = ncerror.NotImpl(self.request_xml)
returnValue(self.rpc_response)
- # Invoke voltha via the grpc client
- res_dict = yield self.grpc_client.invoke_voltha_api(rpc)
+ # Extract the service and method name from the rpc
+ command = rpc.split('-')
+ if len(command) != 2:
+ log.debug('unsupported-rpc', rpc=rpc)
+ self.rpc_response.is_error = True
+ self.rpc_response.node = ncerror.NotImpl(self.request_xml)
+ returnValue(self.rpc_response)
+
+ self.service = command[0]
+ self.method = command[1]
+ self.params = {}
+ if self.request.has_key('metadata'):
+ self.metadata = self.request['metadata']
+
+ # Execute the request
+ res_dict = yield self.grpc_client.invoke_voltha_rpc(
+ service=self.service,
+ method=self.method,
+ params=self.params,
+ metadata=self.metadata)
# convert dict to xml
xml = dicttoxml.dicttoxml(res_dict, attr_type=True)
@@ -72,12 +95,14 @@
if self.request.has_key('filter'):
if not self.request.has_key('class'):
self.rpc_response.is_error = True
- self.rpc_response.node = ncerror.NotImpl(self.request_xml)
+ self.rpc_response.node = ncerror.NotImpl(
+ self.request_xml)
return
except Exception as e:
self.rpc_response.is_error = True
- self.rpc_response.node = ncerror.ServerException(self.request_xml)
+ self.rpc_response.node = ncerror.ServerException(
+ self.request_xml)
return
def get_voltha_rpc(self, request):
diff --git a/netconf/nc_rpc/base/get_config.py b/netconf/nc_rpc/base/get_config.py
index e7ade72..ae8ca02 100644
--- a/netconf/nc_rpc/base/get_config.py
+++ b/netconf/nc_rpc/base/get_config.py
@@ -24,7 +24,8 @@
class GetConfig(Rpc):
def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(GetConfig, self).__init__(request, request_xml, grpc_client, session)
+ super(GetConfig, self).__init__(request, request_xml, grpc_client,
+ session, capabilities)
self._validate_parameters()
def execute(self):
diff --git a/netconf/nc_rpc/base/kill_session.py b/netconf/nc_rpc/base/kill_session.py
index e10f3a5..b04b444 100644
--- a/netconf/nc_rpc/base/kill_session.py
+++ b/netconf/nc_rpc/base/kill_session.py
@@ -26,7 +26,8 @@
class KillSession(Rpc):
def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(KillSession, self).__init__(request, request_xml, grpc_client, session)
+ super(KillSession, self).__init__(request, request_xml, grpc_client,
+ session, capabilities)
self._validate_parameters()
def execute(self):
diff --git a/netconf/nc_rpc/base/lock.py b/netconf/nc_rpc/base/lock.py
index 5a59376..39de197 100644
--- a/netconf/nc_rpc/base/lock.py
+++ b/netconf/nc_rpc/base/lock.py
@@ -24,7 +24,8 @@
class Lock(Rpc):
def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(Lock, self).__init__(request, request_xml, grpc_client, session)
+ super(Lock, self).__init__(request, request_xml, grpc_client,
+ session, capabilities)
self._validate_parameters()
def execute(self):
diff --git a/netconf/nc_rpc/base/unlock.py b/netconf/nc_rpc/base/unlock.py
index b5db7c1..e2bc8e8 100644
--- a/netconf/nc_rpc/base/unlock.py
+++ b/netconf/nc_rpc/base/unlock.py
@@ -24,7 +24,8 @@
class UnLock(Rpc):
def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(UnLock, self).__init__(request, request_xml, grpc_client, session)
+ super(UnLock, self).__init__(request, request_xml, grpc_client,
+ session, capabilities)
self._validate_parameters()
def execute(self):
diff --git a/netconf/nc_rpc/base/validate.py b/netconf/nc_rpc/base/validate.py
index 61e2f80..309c00e 100644
--- a/netconf/nc_rpc/base/validate.py
+++ b/netconf/nc_rpc/base/validate.py
@@ -24,7 +24,7 @@
class Validate(Rpc):
def __init__(self, request, request_xml, grpc_client, session, capabilities):
- super(Validate, self).__init__(request, grpc_client, session)
+ super(Validate, self).__init__(request, grpc_client, session, capabilities)
self._validate_parameters()
def execute(self):