summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-03-31 12:36:13 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-31 12:36:13 +0000
commitbbef4b8dc8114bcc3a9f2c34087d3ababec3bc30 (patch)
tree2a79762e36bc479036add9f06633af26265ffba8
parent1551f2e00cc7a0cf6baf1f96a80a727faee34e5d (diff)
parent4ed95b21e9f961039f362108e79ce8c7059d2809 (diff)
Merge "Addressing last review comments"
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py10
-rw-r--r--components/scripts/python/ccsdk_restconf/restconf_client.py44
2 files changed, 35 insertions, 19 deletions
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 78a38a225..d65aefabb 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
@@ -37,11 +37,19 @@ class RestconfConfigDeploy(RestconfComponentFunction):
web_client_service = self.restClientService(self.restconf_server_identifier)
try:
+ # mount the device
mount_payload = self.resolveAndGenerateMessage("config-deploy-mapping", "config-deploy-template")
restconf_client.mount_device(web_client_service, pnf_id, mount_payload)
+ # log the current configuration subtree
+ current_configuration = restconf_client.retrieve_device_configuration_subtree(
+ web_client_service, pnf_id, self.configlet_resource_path)
+ self.log.info("Current configuration subtree: {}", current_configuration)
+
+ # apply configuration
configlet = self.resolveFromDatabase(resolution_key, self.configlet_template_name)
- restconf_client.configure_device(web_client_service, pnf_id, self.configlet_resource_path, configlet)
+ restconf_client.configure_device_json_patch(
+ web_client_service, pnf_id, self.configlet_resource_path, configlet)
except Exception, err:
self.log.error("an error occurred while configuring device {}", err)
raise err
diff --git a/components/scripts/python/ccsdk_restconf/restconf_client.py b/components/scripts/python/ccsdk_restconf/restconf_client.py
index 43e885a5b..92069c571 100644
--- a/components/scripts/python/ccsdk_restconf/restconf_client.py
+++ b/components/scripts/python/ccsdk_restconf/restconf_client.py
@@ -22,53 +22,61 @@ from time import sleep
class RestconfClient:
+ __base_odl_url = "restconf/config/network-topology:network-topology/topology/topology-netconf/node/"
__odl_status_check_limit = 10
__odl_status_check_pause = 1
+ # Once confirmed to be reliable, the check should change to use the connection-status API
__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/"
def __init__(self, log, restconf_component_function):
self.__log = log
self.__component_function = restconf_component_function
- def mount_device(self, web_client_service, pnf_id, mount_payload):
- self.__log.debug("mounting device {}", pnf_id)
+ def mount_device(self, web_client_service, nf_id, mount_payload):
+ self.__log.debug("mounting device {}", nf_id)
headers = {"Content-Type": "application/xml"}
- url = self.__base_odl_url + pnf_id
+ url = self.__base_odl_url + nf_id
self.__log.debug("sending mount request, url: {}", url)
web_client_service.exchangeResource("PUT", url, mount_payload, headers)
- self.__wait_for_odl_to_mount(web_client_service, pnf_id)
+ self.__wait_for_odl_to_mount(web_client_service, nf_id)
- def __wait_for_odl_to_mount(self, web_client_service, pnf_id):
+ def __wait_for_odl_to_mount(self, web_client_service, nf_id):
counter = 0
- url = self.__odl_status_check_url + pnf_id
+ url = self.__odl_status_check_url + nf_id
self.__log.info("url for ODL status check: {}", url)
expected_result = '"netconf-node-topology:connection-status":"connected"'
while counter < self.__odl_status_check_limit:
result = web_client_service.exchangeResource("GET", url, "")
if expected_result in result:
- self.__log.info("PNF was mounted successfully on ODL")
+ self.__log.info("NF was mounted successfully on ODL")
return None
sleep(self.__odl_status_check_pause)
counter += 1
- raise Exception("PNF was not mounted on ODL, aborting configuration procedure")
+ raise Exception("NF was not mounted on ODL, aborting configuration procedure")
- def configure_device(self, web_client_service, pnf_id, configlet_resource_path, configlet_to_apply):
- self.log_current_configlet(web_client_service, pnf_id, configlet_resource_path)
- self.__log.info("configuring device: {}, Configlet: {}", pnf_id, configlet_to_apply)
+ def configure_device_json_patch(self, web_client_service, nf_id, configlet_resource_path, configlet_to_apply):
headers = {"Content-Type": "application/yang.patch+json"}
- url = self.__base_odl_url + pnf_id + configlet_resource_path
+ self.__configure_device(web_client_service, nf_id, configlet_resource_path, configlet_to_apply, headers)
+
+ def configure_device_xml_patch(self, web_client_service, nf_id, configlet_resource_path, configlet_to_apply):
+ headers = {"Content-Type": "application/yang.patch+xml"}
+ self.__configure_device(web_client_service, nf_id, configlet_resource_path, configlet_to_apply, headers)
+
+ def __configure_device(self, web_client_service, nf_id, configlet_resource_path, configlet_to_apply, headers):
+ self.__log.debug("headers: {}", headers)
+ self.__log.info("configuring device: {}, Configlet: {}", nf_id, configlet_to_apply)
+ url = self.__base_odl_url + nf_id + configlet_resource_path
self.__log.debug("sending patch request, url: {}", url)
result = web_client_service.exchangeResource("PATCH", url, configlet_to_apply, headers)
self.__log.info("Configuration application result: {}", result)
- def log_current_configlet(self, web_client_service, pnf_id, configlet_resource_path):
- url = self.__base_odl_url + pnf_id + configlet_resource_path
+ def retrieve_device_configuration_subtree(self, web_client_service, nf_id, configlet_resource_path):
+ url = self.__base_odl_url + nf_id + configlet_resource_path
self.__log.debug("sending GET request, url: {}", url)
result = web_client_service.exchangeResource("GET", url, "")
- self.__log.info("Current configuration: {}", result)
+ return result
- def unmount_device(self, web_client_service, pnf_id):
- url = self.__base_odl_url + str(pnf_id)
+ def unmount_device(self, web_client_service, nf_id):
+ url = self.__base_odl_url + nf_id
self.__log.debug("sending unmount request, url: {}", url)
web_client_service.exchangeResource("DELETE", url, "")