diff options
Diffstat (limited to 'components/model-catalog/blueprint-model/test-blueprint/capability_restconf')
3 files changed, 9 insertions, 18 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json index b3f5272b8..d185128d5 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json @@ -143,9 +143,9 @@ } }, "config-deploy" : { - "type" : "component-restconf-executor", + "type" : "component-script-executor", "interfaces" : { - "ComponentRestconfExecutor" : { + "ComponentScriptExecutor" : { "operations" : { "process" : { "implementation" : { @@ -154,7 +154,6 @@ "inputs" : { "script-type" : "jython", "script-class-reference" : "Scripts/python/RestconfConfigDeploy.py", - "instance-dependencies" : [ ], "dynamic-properties" : "*config-deploy-properties" }, "outputs" : { diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json index d6f702a9f..8c2c0abea 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json @@ -79,7 +79,7 @@ }, "derived_from" : "tosca.nodes.Component" }, - "component-restconf-executor" : { + "component-script-executor" : { "description" : "This is Restconf Transaction Configuration Component API", "version" : "1.0.0", "capabilities" : { @@ -88,7 +88,7 @@ } }, "interfaces" : { - "ComponentRestconfExecutor" : { + "ComponentScriptExecutor" : { "operations" : { "process" : { "inputs" : { @@ -106,14 +106,6 @@ "required" : true, "type" : "string" }, - "instance-dependencies" : { - "description" : "Instance names to inject to Jython or Kotlin Script.", - "required" : true, - "type" : "list", - "entry_schema" : { - "type" : "string" - } - }, "dynamic-properties" : { "description" : "Dynamic Json Content or DSL Json reference.", "required" : false, diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py index d65aefabb..17dd56104 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py @@ -19,10 +19,10 @@ from org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor import \ from java.lang import Exception as JavaException from restconf_client import RestconfClient +from org.onap.ccsdk.cds.blueprintsprocessor.services.execution import AbstractScriptComponentFunction -class RestconfConfigDeploy(RestconfComponentFunction): - +class RestconfConfigDeploy(AbstractScriptComponentFunction): log = globals()["log"] configlet_template_name = "config-assign" configlet_resource_path = "/yang-ext:mount/mynetconf:netconflist" @@ -34,11 +34,11 @@ class RestconfConfigDeploy(RestconfComponentFunction): try: restconf_client = RestconfClient(self.log, self) pnf_id, resolution_key = self.retrieve_parameters(execution_request) - web_client_service = self.restClientService(self.restconf_server_identifier) + web_client_service = restconf_client.web_client_service(self.restconf_server_identifier) try: # mount the device - mount_payload = self.resolveAndGenerateMessage("config-deploy-mapping", "config-deploy-template") + mount_payload = restconf_client.resolve_and_generate_message_from_template_prefix("config-deploy") restconf_client.mount_device(web_client_service, pnf_id, mount_payload) # log the current configuration subtree @@ -47,7 +47,7 @@ class RestconfConfigDeploy(RestconfComponentFunction): self.log.info("Current configuration subtree: {}", current_configuration) # apply configuration - configlet = self.resolveFromDatabase(resolution_key, self.configlet_template_name) + configlet = restconf_client.retrieve_resolved_template_from_database(resolution_key, self.configlet_template_name) restconf_client.configure_device_json_patch( web_client_service, pnf_id, self.configlet_resource_path, configlet) except Exception, err: |