diff options
author | 2019-08-09 21:49:19 +0000 | |
---|---|---|
committer | 2019-08-09 21:49:19 +0000 | |
commit | 3c1781135b4029fdc657b2009259d3b8ddd8eebc (patch) | |
tree | 0031f38e1bd6c2cc86fa7465e0ea50af9eeb7b8f /components/scripts/python/ccsdk_restconf/restconf_client.py | |
parent | e5b42d3d61651866c0f12b5de6653b1a9d2b9b85 (diff) | |
parent | 1596f69d2e59a158ae509e798448a398b2c9559f (diff) |
Merge "Fixed restconf Python scripts bugs caused by BPP refactor"
Diffstat (limited to 'components/scripts/python/ccsdk_restconf/restconf_client.py')
-rw-r--r-- | components/scripts/python/ccsdk_restconf/restconf_client.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/scripts/python/ccsdk_restconf/restconf_client.py b/components/scripts/python/ccsdk_restconf/restconf_client.py index ec25853f0..43f2a02c4 100644 --- a/components/scripts/python/ccsdk_restconf/restconf_client.py +++ b/components/scripts/python/ccsdk_restconf/restconf_client.py @@ -34,13 +34,13 @@ class RestconfClient: self.__component_function = restconf_component_function def web_client_service(self, identifier): - RestconfExecutorExtensionsKt.restconfClientService(self.__component_function, identifier) + return RestconfExecutorExtensionsKt.restconfClientService(self.__component_function, identifier) def resolve_and_generate_message_from_template_prefix(self, artifact_prefix): - return ResourceResolutionExtensionsKt.contentFromResolvedArtifact(self.component_function, artifact_prefix) + return ResourceResolutionExtensionsKt.contentFromResolvedArtifact(self.__component_function, artifact_prefix) def retrieve_resolved_template_from_database(self, key, artifact_template): - return ResourceResolutionExtensionsKt.storedContentFromResolvedArtifact(self.component_function, key, + return ResourceResolutionExtensionsKt.storedContentFromResolvedArtifact(self.__component_function, key, artifact_template) def mount_device(self, web_client_service, nf_id, mount_payload): @@ -55,6 +55,7 @@ class RestconfClient: counter = 0 url = self.__odl_status_check_url + nf_id self.__log.info("url for ODL status check: {}", url) + # TODO: allow JSON format change expected_result = '"netconf-node-topology:connection-status":"connected"' while counter < self.__odl_status_check_limit: result = web_client_service.exchangeResource("GET", url, "") |