From da4caf492050e17c1aaa8915064659a16e060d8d Mon Sep 17 00:00:00 2001
From: xg353y <xg353y@intl.att.com>
Date: Fri, 3 Nov 2017 16:16:16 +0100
Subject: Update the policyName send to Policy

Change-Id: Ib8ef7feb2404b15f215a1a7967d3af7d6ac89da0
Issue-Id: CLAMP-62
Signed-off-by: xg353y <xg353y@intl.att.com>
---
 .../META-INF/resources/designer/scripts/app.js     | 29 ++++++++++++++++++++--
 src/main/resources/clds/clds-reference.properties  |  1 +
 2 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/META-INF/resources/designer/scripts/app.js b/src/main/resources/META-INF/resources/designer/scripts/app.js
index f300bb092..3c723626e 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/app.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/app.js
@@ -393,7 +393,7 @@ var app = angular.module('clds-app', ['ngRoute',
               $scope
                 .cldsConfirmPerformAction("RESTART");
             } else if (name == "Refresh Status") {
-              $scope.cldsPerformAction("REFRESH");
+              $scope.refreshStatus();
             } else if (name == "Properties CL") {
               $scope.cldsOpenModelProperties();
             } else if (name == "Deploy") {
@@ -1175,7 +1175,32 @@ var app = angular.module('clds-app', ['ngRoute',
                 // + data);
               });
         };
-
+        $scope.refreshStatus = function() {
+            var modelName = selected_model;
+            var svgXml = "";
+            console.log(abootDiagram.saveSVG({
+              format: true
+            }, function(err, xml) {
+              if (err)
+                console.log("error")
+              else
+                console.log(xml)
+              svgXml = xml;
+            }));
+            console.log("refreStatus modelName=" + modelName);
+            cldsModelService
+              .getModel(modelName)
+              .then(
+                function(pars) {
+                  console
+                    .log("refreStatus: pars=" +
+                      pars);
+                  cldsModelService
+                    .processRefresh(pars);
+                },
+                function(data) {
+                });
+          };
         $scope.cldsConfirmPerformAction = function(uiAction) {
           var dlg = dialogs.confirm('Message',
             'Do you want to ' +
diff --git a/src/main/resources/clds/clds-reference.properties b/src/main/resources/clds/clds-reference.properties
index ab33d5ce6..a17537603 100644
--- a/src/main/resources/clds/clds-reference.properties
+++ b/src/main/resources/clds/clds-reference.properties
@@ -29,6 +29,7 @@
 #
 dcae.template={"properties":{"service_name":"","service_ids":[],"vnf_ids":[],"location_ids":[]},"template":{"tca":{"dcae":{"inputTopic":"","outputTopic":"","closedLoopControlName":"","closedLoopEventClient":"configuration.dcae.microservice.tca.xml","policyName":"","policyScope":"service=vSCP;resource=F5;type=configuration","policyVersion":"v0.0.1","serviceConfigurations":{}}}}}
 dcae.decode.service_ids={"vUSP":["vUSP - vCTS"],"Trinity":["ASBGv TLS VNF","ASBGv No TLS","ASBGv (NO TLS) VNF","ASBGv TLS","NSBGv VNF","NSBGv"],"vSCP":["AKRON_vSCP_F5_FW-SVC/vSCP_F5_FW 1","ALLEN_vSCP_F5_FW-SVC/vSCP_F5_FW 1"],"vProbes":["vProbes - FW"]}
+dcae.deployment.template={"serviceTypeId": "???", "inputs": {"aaiEnrichmentHost": "10.0.1.1", "enableAAIEnrichment": "true", "subscriberHostName" : "10.0.11.1", "publisherHostName" : "10.0.11.1"}}
 #
 # SDC request blueprint properties
 #
-- 
cgit 1.2.3-korg