summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json13
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json14
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json17
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json13
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json25
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py123
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-assign-restconf-configlet-template.vtl24
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl6
-rwxr-xr-xcomponents/model-catalog/resource-dictionary/starter-dictionary/entity.json15
9 files changed, 133 insertions, 117 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 628a7d04d..b3f5272b8 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
@@ -20,17 +20,11 @@
"file" : "Definitions/policy_types.json"
} ],
"dsl_definitions" : {
- "config-assign-properties" : {
- "resolution-key" : {
- "get_input" : "resolution-key"
- }
- },
"config-deploy-properties" : {
"resolution-key" : {
"get_input" : "resolution-key"
}
}
-
},
"topology_template" : {
"workflows" : {
@@ -49,13 +43,6 @@
"required" : true,
"type" : "string"
},
- "artifact-name" : {
- "required" : true,
- "type" : "list",
- "entry_schema" : {
- "type" : "string"
- }
- },
"store-result" : {
"required" : true,
"type" : "boolean"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json
index fc8e1bf64..fe51488c7 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json
@@ -1,13 +1 @@
-[
- {
- "name": "entity",
- "input-param": true,
- "property": {
- "type": "json"
- },
- "dictionary-name": "entity",
- "dictionary-source": "input",
- "dependencies": [
- ]
- }
-]
+[]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json
index fc8e1bf64..2a866c9b5 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json
@@ -1,11 +1,22 @@
[
{
- "name": "entity",
+ "name": "pnf-id",
"input-param": true,
"property": {
- "type": "json"
+ "type": "string"
},
- "dictionary-name": "entity",
+ "dictionary-name": "pnf-id",
+ "dictionary-source": "input",
+ "dependencies": [
+ ]
+ },
+ {
+ "name": "pnf-name",
+ "input-param": true,
+ "property": {
+ "type": "string"
+ },
+ "dictionary-name": "pnf-name",
"dictionary-source": "input",
"dependencies": [
]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json
index e5aa763ba..9e9350c81 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json
@@ -3,19 +3,18 @@
"dt-config-assign-properties" : {
"description" : "Dynamic DataType definition for workflow(config-assign).",
"version" : "1.0.0",
- "properties" : {
- "entity" : {
- "type" : "json"
- }
- },
+ "properties" : { },
"derived_from" : "tosca.datatypes.Dynamic"
},
"dt-config-deploy-properties" : {
"description" : "Dynamic DataType definition for workflow(config-deploy).",
"version" : "1.0.0",
"properties" : {
- "entity" : {
- "type" : "json"
+ "pnf-id" : {
+ "type" : "string"
+ },
+ "pnf-name" : {
+ "type" : "string"
}
},
"derived_from" : "tosca.datatypes.Dynamic"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json
index 98a73b101..189cbf86f 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json
@@ -1,10 +1,25 @@
{
- "entity" : {
- "tags" : "entity",
- "name" : "entity",
+ "pnf-id" : {
+ "tags" : "pnf-id",
+ "name" : "pnf-id",
"property" : {
- "description" : "entity",
- "type" : "json"
+ "description" : "pnf-id",
+ "type" : "string"
+ },
+ "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
+ "sources" : {
+ "input" : {
+ "type" : "source-input",
+ "properties" : { }
+ }
+ }
+ },
+ "pnf-name" : {
+ "tags" : "pnf-name",
+ "name" : "pnf-name",
+ "property" : {
+ "description" : "pnf-name",
+ "type" : "string"
},
"updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
"sources" : {
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 518666a76..01e2ec477 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
@@ -12,9 +12,8 @@
# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
+
from time import sleep
from org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor import \
@@ -25,88 +24,104 @@ from java.lang import Exception as JavaException
class RestconfConfigDeploy(RestconfComponentFunction):
log = globals()["log"]
- seconds_to_sleep = 5
- base_mount_url = "restconf/config/network-topology:network-topology/topology/topology-netconf/node/"
+ odl_status_check_limit = 10
+ odl_status_check_pause = 1
+ odl_status_check_url = "restconf/operational/network-topology:network-topology/topology/topology-netconf/node/"
+ base_odl_url = "restconf/config/network-topology:network-topology/topology/topology-netconf/node/"
server_identifier = "sdncodl"
configlet_template_name = "config-assign"
+ configlet_odl_resource = "/yang-ext:mount/mynetconf:netconflist"
def process(self, execution_request):
self.log.info("Started execution of process method")
try:
- self.log.info("getting resolution-key")
- resolution_key = self.getDynamicProperties("resolution-key").asText()
- self.log.info("resolution_key: {}", resolution_key)
-
- self.log.info("getting pnf-id")
- pnf_id = execution_request.payload.get("config-deploy-request").get("config-deploy-properties").get("entity").get("pnf-id")
- pnf_id = str(pnf_id).strip('\"')
- self.log.info("pnf-id: {}", pnf_id)
-
- self.log.info("mounting device {}", pnf_id)
- self.mount(pnf_id)
-
- self.log.info("sleeping for {} seconds", self.seconds_to_sleep)
- sleep(self.seconds_to_sleep)
-
- try:
- self.log.info("configuring device {}", pnf_id)
- self.apply_configuration(pnf_id, resolution_key, self.configlet_template_name)
- except Exception, err:
- self.log.error("an error occurred while configuring device {}", err)
- raise err
- finally:
- self.log.info("unmounting device {}", pnf_id)
- self.unmount(pnf_id)
-
- self.log.info("Ended execution of process method")
-
+ pnf_id, resolution_key = self.retrieve_parameters(execution_request)
+ self.interact_with_odl(pnf_id, resolution_key)
except JavaException, err:
self.log.error("Java Exception in the script", err)
raise err
except Exception, err:
- self.log.error("Python Exception in the script", err)
+ self.log.error("Python Exception in the script:" + str(err), err)
+ raise err
+ self.log.info("Ended execution of process method")
+
+ def retrieve_parameters(self, execution_request):
+ resolution_key = self.getDynamicProperties("resolution-key").asText()
+ self.log.info("resolution_key: {}", resolution_key)
+ pnf_id = execution_request.payload.get("config-deploy-request").get("config-deploy-properties").get("pnf-id")
+ pnf_id = str(pnf_id).strip('\"')
+ self.log.info("pnf-id: {}", pnf_id)
+ return pnf_id, resolution_key
+
+ def interact_with_odl(self, pnf_id, resolution_key):
+ try:
+ self.mount(pnf_id)
+ self.log_current_configlet(pnf_id)
+ self.apply_configuration(pnf_id, resolution_key, self.configlet_template_name)
+ except Exception, err:
+ self.log.error("an error occurred while configuring device {}", err)
raise err
+ finally:
+ self.log.info("unmounting device {}", pnf_id)
+ self.unmount(pnf_id)
def mount(self, pnf_id):
- self.log.info("meshing mount payload")
+ self.log.info("mounting device {}", pnf_id)
mount_payload = self.resolveAndGenerateMessage("config-deploy-mapping", "config-deploy-template")
self.log.info("mount payload: \n {}", mount_payload)
-
- # defining custom header
- headers = {
- "Content-Type": "application/xml"
- }
-
- url = self.base_mount_url + str(pnf_id)
+ headers = {"Content-Type": "application/xml"} # defining custom header
+ url = self.base_odl_url + str(pnf_id)
self.log.info("sending mount request, url: {}", url)
web_client_service = self.restClientService(self.server_identifier)
web_client_service.exchangeResource("PUT", url, mount_payload, headers)
+ self.wait_for_odl_to_mount(pnf_id)
- def unmount(self, pnf_id):
- url = self.base_mount_url + str(pnf_id)
- self.log.info("sending unmount request, url: {}", url)
+ def wait_for_odl_to_mount(self, pnf_id):
+ counter = 0
+ url = self.odl_status_check_url + pnf_id
+ self.log.info("url for ODL status check: {}", url)
web_client_service = self.restClientService(self.server_identifier)
- web_client_service.exchangeResource("DELETE", url, "")
+ expected_result = '"netconf-node-topology:connection-status":"connected"'
+ while counter < self.odl_status_check_limit:
+ result = web_client_service.exchangeResource("GET", url, "")
+ self.log.info("ODL status check result: {}", result)
+ if expected_result in result:
+ self.log.info("PNF was mounted successfully on ODL")
+ return None
+ sleep(1)
+ counter += 1
+ raise JavaException("PNF was not mounted on ODL, aborting configuration procedure")
+
+ def log_current_configlet(self, pnf_id):
+ self.log.info("retrieving configuration for device {}", pnf_id)
+ url = self.base_odl_url + pnf_id + self.configlet_odl_resource
+ self.log.info("sending GET request, url: {}", url)
+ web_client_service = self.restClientService(self.server_identifier)
+ result = web_client_service.exchangeResource("GET", url, "")
+ self.log.info("Current configuration: {}", result)
def apply_configuration(self, pnf_id, resolution_key, template_name):
+ self.log.info("configuring device {}", pnf_id)
self.log.info("Retrieving configlet from database (resolution-key: {}, template_name: {}",
resolution_key, template_name)
configlet = self.resolveFromDatabase(resolution_key, template_name)
self.log.info("Configlet: {}", configlet)
-
- # defining custom header
- headers = {
- "Content-Type": "application/yang.patch+json"
- }
-
- url = "restconf/config/network-topology:network-topology/topology/topology-netconf/node/" + pnf_id \
- + "/yang-ext:mount/mynetconf:netconflist"
+ headers = { "Content-Type": "application/yang.patch+json" } # defining custom header
+ url = self.base_odl_url + pnf_id + self.configlet_odl_resource
self.log.info("sending patch request, url: {}", url)
web_client_service = self.restClientService(self.server_identifier)
result = web_client_service.exchangeResource("PATCH", url, configlet, headers)
self.log.info("Configuration application result: {}", result)
+ def unmount(self, pnf_id):
+ url = self.base_odl_url + str(pnf_id)
+ self.log.info("sending unmount request, url: {}", url)
+ web_client_service = self.restClientService(self.server_identifier)
+ web_client_service.exchangeResource("DELETE", url, "")
+
def recover(self, runtime_exception, execution_request):
- self.log.info("Recover method, no code to execute")
- return None
+ self.log.info("Recover function called!")
+ self.log.error(runtime_exception.getMessage())
+ print self.bluePrintRuntimeService.getBluePrintError().addError(runtime_exception.getMessage())
+ return None \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-assign-restconf-configlet-template.vtl b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-assign-restconf-configlet-template.vtl
index 3812380ea..af91ba00d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-assign-restconf-configlet-template.vtl
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-assign-restconf-configlet-template.vtl
@@ -10,8 +10,8 @@
"netconflist":{
"netconf":[
{
- "netconf-id":"40",
- "netconf-param":"4040"
+ "netconf-id":"10",
+ "netconf-param":"1000"
}
]
}
@@ -25,13 +25,29 @@
"netconflist":{
"netconf":[
{
- "netconf-id":"50",
- "netconf-param":"98765"
+ "netconf-id":"20",
+ "netconf-param":"2000"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "edit-id":"edit3",
+ "operation":"merge",
+ "target":"/",
+ "value":{
+ "netconflist":{
+ "netconf":[
+ {
+ "netconf-id":"30",
+ "netconf-param":"3000"
}
]
}
}
}
+
]
}
} \ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl
index 935177658..1f3f94d4e 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl
@@ -1,13 +1,13 @@
<node xmlns="urn:TBD:params:xml:ns:yang:network-topology">
- <node-id>$entity.pnf-id</node-id>
+ <node-id>$pnf-id</node-id>
<key-based xmlns="urn:opendaylight:netconf-node-topology">
<key-id xmlns="urn:opendaylight:netconf-node-topology">ODL-private-key</key-id>
<username xmlns="urn:opendaylight:netconf-node-topology">netconf</username>
</key-based>
- <host xmlns="urn:opendaylight:netconf-node-topology">$entity.pnf-name</host>
+ <host xmlns="urn:opendaylight:netconf-node-topology">$pnf-name</host>
<port xmlns="urn:opendaylight:netconf-node-topology">6513</port>
<tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
- <protocol xmlns="urn:opendaylight:netconf-node-topology">
+ <protocol xmlns="urn:opendaylight:netconf-node-topology">
<name xmlns="urn:opendaylight:netconf-node-topology">TLS</name>
</protocol>
<max-connection-attempts xmlns="urn:opendaylight:netconf-node-topology">5</max-connection-attempts>
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/entity.json b/components/model-catalog/resource-dictionary/starter-dictionary/entity.json
deleted file mode 100755
index 83a32a922..000000000
--- a/components/model-catalog/resource-dictionary/starter-dictionary/entity.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "name" : "entity",
- "tags" : "entity",
- "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
- "property" : {
- "description" : "entity",
- "type" : "json"
- },
- "sources" : {
- "input" : {
- "type" : "source-input",
- "properties" : { }
- }
- }
-} \ No newline at end of file