Fix Guard policy payload

[clamp.git] / src / main / resources / META-INF / resources / designer / partials / portfolios / operational_policy_window.html

diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
index 82b4803..db81e47 100644 (file)
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   ONAP CLAMP
   ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+  Copyright (C) 2017-2019 AT&T Intellectual Property. All rights
                               reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License"); 
@@ -110,7 +110,9 @@ label {
                                                                <select type="text" id="trigger_policy" name="trigger_policy"
                                                                        class="form-control" ng-model="null_dump"
                                                                        ng-init="initPolicySelect()"
-                                                                       ng-options="policy for policy in policy_ids track by policy"></select>
+                                                                       ng-options="policy for policy in policy_ids track by policy">
+                                                                       <option value="">-- choose an option --</option>
+                                                                       </select>
                                                        </div>
 
                                                        <label for="timeout" class="col-sm-3"
@@ -127,6 +129,13 @@ label {
                                                                        checked="true" class="form-control">
                                                        </div>
                                                </div>
+                                               <div class="form-group clearfix row">
+                                                   <label class="col-sm-4 control-label" for="clname">ControlLoopName</label>
+                                                   <div class="col-sm-8">
+                                                           <input type="text" class="form-control" name="controlLoopName"
+                                                                   readonly="readonly" id="clname" ng-model="clname"/>
+                                                   </div>
+                                               </div>
                                        </div>
                                </form>
                                <div class="panel-heading" style="background-color: white;">
@@ -158,9 +167,8 @@ label {
                                                <label class="col-sm-4 control-label" for="recipe">Recipe</label>
                                                <div class="col-sm-8">
                                                        <select class="form-control" name="recipe" id="recipe"
-                                                               enableFilter="true"
-                                                               ng-click="updateGuardRecipe($event);initTargetResourceId()"
-                                                               ng-model="recipe">
+                                                               enableFilter="true"  ng-model="recipe" ng-click="updateGuardRecipe($event)">
+                                                               <option value="">-- choose an option --</option>
                                                                <option value="Restart">Restart</option>
                                                                <option value="Rebuild">Rebuild</option>
                                                                <option value="Migrate">Migrate</option>
@@ -193,7 +201,8 @@ label {
                                        <div class="form-group clearfix">
                                                <label for="actor" class="col-sm-4 control-label"> Actor</label>
                                                <div class="col-sm-8">
-                                                       <select class="form-control" id="actor" name="actor">
+                                                       <select class="form-control" id="actor" name="actor" ng-click="updateGuardActor($event)" ng-model="actor">
+                                                           <option value="">-- choose an option --</option>
                                                                <option value="APPC">APPC</option>
                                                                <option value="SO">SO</option>
                                                                <option value="VFC">VFC</option>
@@ -214,7 +223,9 @@ label {
                                                <div class="col-sm-8">
                                                        <select class="form-control" id="success" name="success"
                                                                ng-model="null_dump"
-                                                               ng-options="policy for policy in policy_ids track by policy"></select>
+                                                               ng-options="policy for policy in policy_ids track by policy">
+                                                               <option value="">-- choose an option --</option>
+                                                               </select>
                                                </div>
                                        </div>
                                        <div class="form-group clearfix">
@@ -223,7 +234,9 @@ label {
                                                <div class="col-sm-8">
                                                        <select class="form-control" id="failure" name="failure"
                                                                ng-model="null_dump"
-                                                               ng-options="policy for policy in policy_ids track by policy"></select>
+                                                               ng-options="policy for policy in policy_ids track by policy">
+                                                               <option value="">-- choose an option --</option>
+                                                               </select>
                                                </div>
                                        </div>
                                        <div class="form-group clearfix">
@@ -232,7 +245,9 @@ label {
                                                <div class="col-sm-8">
                                                        <select class="form-control" id="failure_timeout"
                                                                name="failure_timeout" ng-model="null_dump"
-                                                               ng-options="policy for policy in policy_ids track by policy"></select>
+                                                               ng-options="policy for policy in policy_ids track by policy">
+                                                               <option value="">-- choose an option --</option>
+                                                               </select>
                                                </div>
                                        </div>
                                        <div class="form-group clearfix">
@@ -241,7 +256,9 @@ label {
                                                <div class="col-sm-8">
                                                        <select class="form-control" id="failure_retries"
                                                                name="failure_retries" ng-model="null_dump"
-                                                               ng-options="policy for policy in policy_ids track by policy"></select>
+                                                               ng-options="policy for policy in policy_ids track by policy">
+                                                               <option value="">-- choose an option --</option>
+                                                               </select>
                                                </div>
                                        </div>
                                        <div class="form-group clearfix">
@@ -250,7 +267,9 @@ label {
                                                <div class="col-sm-8">
                                                        <select class="form-control" id="failure_exception"
                                                                name="failure_exception" ng-model="null_dump"
-                                                               ng-options="policy for policy in policy_ids track by policy"></select>
+                                                               ng-options="policy for policy in policy_ids track by policy">
+                                                               <option value="">-- choose an option --</option>
+                                                               </select>
                                                </div>
                                        </div>
                                        <div class="form-group clearfix">
@@ -259,7 +278,9 @@ label {
                                                <div class="col-sm-8">
                                                        <select class="form-control" id="failure_guard"
                                                                name="failure_guard" ng-model="null_dump"
-                                                               ng-options="policy for policy in policy_ids track by policy"></select>
+                                                               ng-options="policy for policy in policy_ids track by policy">
+                                                               <option value="">-- choose an option --</option>
+                                                               </select>
                                                </div>
                                        </div>
                                </form>
@@ -270,8 +291,9 @@ label {
                                                        Type</label>
                                                <div class="col-sm-8">
                                                        <select class="form-control" name="type" id="type"
-                                                               ng-click="initTargetResourceId()" ng-model="type">
-                                                               <option value="VFC">VFC</option>
+                                                               ng-click="initTargetResourceId($event)" ng-model="type">
+                                                               <option value="">-- choose an option --</option>                                                    
+                                                               <option value="VFModule">VFModule</option>
                                                                <option value="VM">VM</option>
                                                                <option value="VNF">VNF</option>
                                                        </select>
@@ -282,10 +304,9 @@ label {
                                                        Target ResourceId</label>
                                                <div class="col-sm-8">
                                                        <select class="form-control" name="resourceId" id="resourceId"
-                                                               enableFilter="true" ng-click="changeTargetResourceId()"
+                                                               enableFilter="true" ng-click="changeTargetResourceId($event)"
                                                                ng-model="resourceId">
-                                                               <option value=""></option>
-                                                               <option value="Other:">Other:</option>
+                                                               <option value="">-- choose an option --</option>
                                                        </select>
                                                </div>
                                        </div>
@@ -354,7 +375,7 @@ label {
                                        title="Guard policy associated" style="border: 2px dotted gray;">
 
                                        <div class="form-group clearfix">
-                                               <label class="col-sm-4 control-label" for="id">ID</label>
+                                               <label class="col-sm-4 control-label" for="id">Guard Policy ID</label>
                                                <div class="col-sm-8">
                                                        <input type="text" class="form-control" name="id" id="id" />
                                                </div>
@@ -363,7 +384,7 @@ label {
                                                <label class="col-sm-4 control-label" for="recipe">Recipe</label>
                                                <div class="col-sm-8">
                                                        <input type="text" class="form-control" name="recipe"
-                                                               readonly="readonly" id="recipe" />
+                                                               readonly="readonly" id="recipe"/>
                                                </div>
                                        </div>
                                        <div class="form-group clearfix">
@@ -373,38 +394,43 @@ label {
                                                                readonly="readonly" id="clname" ng-model="clname"/>
                                                </div>
                                        </div>
-                                       
-                                       
+                                       <div class="form-group clearfix">
+                                           <label for="actor" class="col-sm-4 control-label">Actor</label>
+                                               <div class="col-sm-8">
+                                                   <input type="text" class="form-control" name="actor"
+                                                               readonly="readonly" id="actor" />
+                                               </div>
+                                       </div>
                                        <div class="form-group clearfix">
 
-                                               <label for="guardTargets" class="col-sm-4 control-label">Guard
+                                               <label for="targets" class="col-sm-4 control-label">Guard
                                                        targets</label>
                                                <div class="col-sm-8">
-                                                       <input class="form-control" name="guardTargets" id="guardTargets" />
+                                                       <input class="form-control" name="targets" id="targets" />
                                                </div>
                                        </div>
 
                                        <div class="form-group clearfix" id="minMaxGuardPolicyDiv">
-                                               <label for="minGuard" class="col-sm-4 control-label"> Min
+                                               <label for="min" class="col-sm-4 control-label"> Min
                                                        Guard</label>
                                                <div class="col-sm-8">
-                                                       <input class="form-control" name="minGuard" id="minGuard" />
+                                                       <input class="form-control" name="min" id="min" />
                                                </div>
-                                               <label for="maxGuard" class="col-sm-4 control-label"> Max
+                                               <label for="max" class="col-sm-4 control-label"> Max
                                                        Guard</label>
                                                <div class="col-sm-8">
-                                                       <input class="form-control" name="maxGuard" id="maxGuard" />
+                                                       <input class="form-control" name="max" id="max" />
                                                </div>
                                        </div>
                                        <div class="form-group clearfix"
                                                id="frequencyLimiterGuardPolicyDiv" style="display: none">
-                                               <label for="limitGuard" class="col-sm-4 control-label">Limit</label>
+                                               <label for="limit" class="col-sm-4 control-label">Limit</label>
                                                <div class="col-sm-8">
-                                                       <input class="form-control" name="limitGuard" id="limitGuard" />
+                                                       <input class="form-control" name="limit" id="limit" />
                                                </div>
                                                <div class="col-sm-8">
-                                                       <select class="form-control" name="timeUnitsGuard"
-                                                               id="timeUnitsGuard">
+                                                       <select class="form-control" name="timeUnits"
+                                                               id="timeUnits">
                                                                <option value=""></option>
                                                                <option value="minute">minute</option>
                                                                <option value="hour">hour</option>
@@ -413,12 +439,12 @@ label {
                                                                <option value="month">month</option>
                                                                <option value="year">year</option>
 
-                                                       </select> <label for="timeWindowGuard" class="col-sm-4 control-label">Time
+                                                       </select> <label for="timeWindow" class="col-sm-4 control-label">Time
                                                                Window</label>
                                                </div>
                                                <div class="col-sm-8">
-                                                       <input class="form-control" name="timeWindowGuard"
-                                                               id="timeWindowGuard" />
+                                                       <input class="form-control" name="timeWindow"
+                                                               id="timeWindow" />
                                                </div>
                                        </div>
                                        <div class="form-group clearfix">