Clean restconf duplicate models and Implementation.

Change-Id: Id439ac5ded631aac0ee7fc69846ebe9bca650bb2
Issue-ID: CCSDK-1499
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>

1 files changed, 12 insertions, 1 deletions

diff --git a/components/scripts/python/ccsdk_restconf/restconf_client.py b/components/scripts/python/ccsdk_restconf/restconf_client.py
index 6d18b03c5..ec25853f0 100644
--- a/components/scripts/python/ccsdk_restconf/restconf_client.py
+++ b/components/scripts/python/ccsdk_restconf/restconf_client.py
@@ -18,10 +18,11 @@
 # ============LICENSE_END=========================================================
 #
 from time import sleep
+from org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor import RestconfExecutorExtensionsKt
+from org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution import ResourceResolutionExtensionsKt
 
 
 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
@@ -32,6 +33,16 @@ class RestconfClient:
         self.__log = log
         self.__component_function = restconf_component_function
 
+    def web_client_service(self, identifier):
+        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)
+
+    def retrieve_resolved_template_from_database(self, key, artifact_template):
+        return ResourceResolutionExtensionsKt.storedContentFromResolvedArtifact(self.component_function, key,
+                                                                                artifact_template)
+
     def mount_device(self, web_client_service, nf_id, mount_payload):
         self.__log.debug("mounting device {}", nf_id)
         headers = {"Content-Type": "application/xml"}