diff options
3 files changed, 15 insertions, 20 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json index 5af64caa7..637b589f6 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json @@ -190,8 +190,7 @@ }, "inputs": { "instance-dependencies": [ - "json-parser-service", - "netconf-rpc-service" + "json-parser-service" ] }, "outputs": { @@ -220,8 +219,7 @@ }, "inputs": { "instance-dependencies": [ - "json-parser-service", - "netconf-rpc-service" + "json-parser-service" ] }, "outputs": { diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/DefaultGetNetConfig.py b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/DefaultGetNetConfig.py index e2f5655a2..c966b1a4b 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/DefaultGetNetConfig.py +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/DefaultGetNetConfig.py @@ -1,28 +1,21 @@ import netconf_constant from netconfclient import NetconfClient from java.lang import Exception -from abstract_blueprint_function import AbstractPythonComponentFunction -from org.onap.ccsdk.apps.blueprintsprocessor.functions.netconf.executor import NetconfRpcService +from org.onap.ccsdk.apps.blueprintsprocessor.functions.netconf.executor import NetconfComponentFunction +class DefaultGetNetConfig(NetconfComponentFunction): - -class DefaultGetNetConfig(AbstractPythonComponentFunction): def process(self, execution_request): try: log = globals()[netconf_constant.SERVICE_LOG] print(globals()) #requestId = globals()[netconf_constant.PARAM_REQUEST_ID] requestId = '1234' + nc = NetconfClient(log, self) - bluePrintRuntimeService = globals()['bluePrintRuntimeService'] - - capabilityProperty = bluePrintRuntimeService.resolveNodeTemplateCapabilityProperties("sample-netconf-device","netconf") - - log.info("capabilityProperty {}",capabilityProperty) - netconfService = NetconfRpcService() - nc = NetconfClient(log, netconfService) + # Create RPC Serivice + nc.createRPCServiceFromRequirement("netconf-connection") - nc.connect(netconfService.getNetconfDeviceInfo(capabilityProperty)) runningConfigTemplate = "runningconfig-template" runningConfigMessageId = "get-config-" + requestId @@ -38,7 +31,7 @@ class DefaultGetNetConfig(AbstractPythonComponentFunction): errorMessage = "Get Running Config Failure ::"+ deviceResponse.errorMessage except Exception, err: - log.info("Exception in the script {}",err.getMessage()) + log.error("Exception in the script {}",err.getMessage()) status = netconf_constant.STATUS_FAILURE errorMessage = "Get Running Config Failure ::"+err.getMessage() diff --git a/components/scripts/python/ccsdk_netconf/netconfclient.py b/components/scripts/python/ccsdk_netconf/netconfclient.py index 448e03dc1..421e50098 100644 --- a/components/scripts/python/ccsdk_netconf/netconfclient.py +++ b/components/scripts/python/ccsdk_netconf/netconfclient.py @@ -4,15 +4,19 @@ from netconf_constant import CONFIG_TARGET_RUNNING, CONFIG_DEFAULT_OPERATION_REP class NetconfClient: - def __init__(self, log, nc): + def __init__(self, log, componentFunction): self.log = log - self.nc = nc + self.componentFunction = componentFunction + self.nc = None + + def createRPCServiceFromRequirement(self, requirementName): + self.nc = self.componentFunction.netconfRpcClientService(requirementName) def disconnect(self): self.nc.disconnect() return - def connect(self,deviceInfo): + def connect(self, deviceInfo): self.nc.connect(deviceInfo) return |