update vLB CDS CBA

Issue-ID: CCSDK-1816
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I1b399aae8abca6a2f5d175560053fa0c7b646896

1 files changed, 53 insertions, 53 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py
index 04ea82ea9..34fd1404d 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Scripts/python/ConfigDeploy.py
@@ -1,54 +1,54 @@
-#  Copyright (c) 2019 Bell Canada.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  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.
-
-import netconf_constant
-from common import ResolutionHelper
-from time import sleep 
-from netconfclient import NetconfClient
-from org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor import \
-  NetconfComponentFunction
-
-
-class ConfigDeploy(NetconfComponentFunction):
-
-  def process(self, execution_request):      
-      log = globals()[netconf_constant.SERVICE_LOG]	  
-      print(globals())
-      print("Waiting 4 minutes until NETCONF server is UP on vLB ...")
-      sleep (240)
-      nc = NetconfClient(log, self, "netconf-connection")
-      rr = ResolutionHelper(self)
-
-      # Get meshed template from DB
-      resolution_key = self.getDynamicProperties("resolution-key").asText()
-      payloadHostname = rr.retrieve_resolved_template_from_database(resolution_key, "baseconfig")
-      payloadInterface = rr.retrieve_resolved_template_from_database(resolution_key, "incremental-config")
-
-      nc.connect()
-      nc.lock()
-      #if not response.isSuccess():
-      #  og.error(response.errorMessage)
-      nc.discard_change()
-      nc.edit_config(message_content=payloadInterface, edit_default_peration="none")
-      nc.edit_config(message_content=payloadHostname, edit_default_peration="none")
-      nc.validate()
-      nc.commit()
-      #nc.commit(confirmed = True, confirm_timeout=15)
-      nc.unlock()
-      nc.disconnect()
-
-  def recover(self, runtime_exception, execution_request):
-        log.error("Exception in the script {}", runtime_exception)
-        print self.addError(runtime_exception.cause.message)
+#  Copyright (c) 2019 Bell Canada.

+#

+#  Licensed under the Apache License, Version 2.0 (the "License");

+#  you may not use this file except in compliance with the License.

+#  You may obtain a copy of the License at

+#

+#      http://www.apache.org/licenses/LICENSE-2.0

+#

+#  Unless required by applicable law or agreed to in writing, software

+#  distributed under the License is distributed on an "AS IS" BASIS,

+#  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.

+

+import netconf_constant

+from common import ResolutionHelper

+from time import sleep 

+from netconfclient import NetconfClient

+from org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor import \

+  NetconfComponentFunction

+

+

+class ConfigDeploy(NetconfComponentFunction):

+

+  def process(self, execution_request):      

+      log = globals()[netconf_constant.SERVICE_LOG]	  

+      print(globals())

+#      print("Waiting 4 minutes until NETCONF server is UP on vLB ...")

+#     sleep (240)

+      nc = NetconfClient(log, self, "netconf-connection")

+      rr = ResolutionHelper(self)

+

+      # Get meshed template from DB

+      resolution_key = self.getDynamicProperties("resolution-key").asText()

+      payloadHostname = rr.retrieve_resolved_template_from_database(resolution_key, "baseconfig")

+      payloadInterface = rr.retrieve_resolved_template_from_database(resolution_key, "incremental-config")

+

+      nc.connect()

+      nc.lock()

+      #if not response.isSuccess():

+      #  og.error(response.errorMessage)

+      nc.discard_change()

+      nc.edit_config(message_content=payloadInterface, edit_default_peration="none")

+      nc.edit_config(message_content=payloadHostname, edit_default_peration="none")

+      nc.validate()

+      nc.commit()

+      #nc.commit(confirmed = True, confirm_timeout=15)

+      nc.unlock()

+      nc.disconnect()

+

+  def recover(self, runtime_exception, execution_request):

+        log.error("Exception in the script {}", runtime_exception)

+        print self.addError(runtime_exception.cause.message)

         return None
\ No newline at end of file