aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-06-19 21:16:58 -0400
committerDR695H <dr695h@att.com>2019-06-19 21:16:58 -0400
commit369e51562f068d5e653211902efc69220508eca1 (patch)
tree7ac9c6eaabcc18a7a687d03e0a807009aa561f3a
parent3d12502f70afb8b06fb44065e85630abfdfa7a3e (diff)
move so, clamp, oof to jinja
Issue-ID: TEST-158 Change-Id: I88798326879463103a66a97d4ddbc53e864be01a Signed-off-by: DR695H <dr695h@att.com>
-rw-r--r--robot/assets/oof/optf-has/plan_with_wrong_version.json (renamed from robot/assets/templates/optf-has/plan_with_wrong_version.json)0
-rw-r--r--robot/assets/oof/optf-osdf/pci-opt-request.json (renamed from robot/assets/templates/optf-osdf/pci-opt-request.json)0
-rw-r--r--robot/assets/oof/optf-osdf/placement_request.json (renamed from robot/assets/templates/optf-osdf/placement_request.json)0
-rw-r--r--robot/assets/templates/clamp/create_model.jinja1
-rw-r--r--robot/assets/templates/clamp/create_model.template1
-rw-r--r--robot/assets/templates/clamp/save_model_vlb.jinja1
-rw-r--r--robot/assets/templates/clamp/save_model_vlb.template1
-rw-r--r--robot/assets/templates/cmso/OneVnfOneChangeWindow.jinja (renamed from robot/assets/templates/cmso/OneVnfOneChangeWindow.json.template)18
-rw-r--r--robot/assets/templates/cmso/VidCallbackData.jinja (renamed from robot/assets/templates/cmso/VidCallbackData.json.template)2
-rw-r--r--robot/assets/templates/so/cloud_config_v3.jinja19
-rw-r--r--robot/assets/templates/so/cloud_config_v3.template19
-rw-r--r--robot/assets/templates/so/create_cloud_config.jinja17
-rw-r--r--robot/assets/templates/so/create_cloud_config.template17
-rw-r--r--robot/resources/clamp_interface.robot11
-rw-r--r--robot/resources/oof_interface.robot44
-rw-r--r--robot/resources/so/create_cloud_config.robot15
-rw-r--r--robot/resources/so_interface.robot1
-rw-r--r--robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot1
18 files changed, 86 insertions, 82 deletions
diff --git a/robot/assets/templates/optf-has/plan_with_wrong_version.json b/robot/assets/oof/optf-has/plan_with_wrong_version.json
index 670bcb6d..670bcb6d 100644
--- a/robot/assets/templates/optf-has/plan_with_wrong_version.json
+++ b/robot/assets/oof/optf-has/plan_with_wrong_version.json
diff --git a/robot/assets/templates/optf-osdf/pci-opt-request.json b/robot/assets/oof/optf-osdf/pci-opt-request.json
index 7ec9ab5f..7ec9ab5f 100644
--- a/robot/assets/templates/optf-osdf/pci-opt-request.json
+++ b/robot/assets/oof/optf-osdf/pci-opt-request.json
diff --git a/robot/assets/templates/optf-osdf/placement_request.json b/robot/assets/oof/optf-osdf/placement_request.json
index d9b16ca5..d9b16ca5 100644
--- a/robot/assets/templates/optf-osdf/placement_request.json
+++ b/robot/assets/oof/optf-osdf/placement_request.json
diff --git a/robot/assets/templates/clamp/create_model.jinja b/robot/assets/templates/clamp/create_model.jinja
new file mode 100644
index 00000000..0e4bea89
--- /dev/null
+++ b/robot/assets/templates/clamp/create_model.jinja
@@ -0,0 +1 @@
+{"name":"{{MODEL_NAME}}","controlNamePrefix":"ClosedLoop-","bpmnText":"","propText":"{}","imageText":"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\" width=\"100%\" height=\"100%\">\n\t\t<defs>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmnw\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"6\" refY=\"6\" id=\"markerSjdype4kmny\">\n\t\t\t\t\t\t<circle cx=\"6\" cy=\"6\" r=\"3.5\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></circle>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"8.5\" refY=\"5\" id=\"markerSjdype4kmo0\">\n\t\t\t\t\t\t<path d=\"m 1 5 l 0 -3 l 7 3 l -7 3 z\" style=\"stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmo2\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-1\" refY=\"10\" id=\"markerSjdype4kmo4\">\n\t\t\t\t\t\t<path d=\"M 0 10 L 8 6 L 16 10 L 8 14 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-5\" refY=\"10\" id=\"markerSjdype4kmo6\">\n\t\t\t\t\t\t<path d=\"M 1 4 L 5 16\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t</defs>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1\" transform=\"matrix(1,0,0,1,50,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1_label\" transform=\"matrix(1,0,0,1,23,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"VesCollector_1g9cmz0\" transform=\"matrix(1,0,0,1,207,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"120,80 120,20 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<polyline points=\"20,0 20,80 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"14\">V</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"26\">E</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"38\">S</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"25.5\" y=\"43.5\">VesCollector</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"TCA_1d13unw\" transform=\"matrix(1,0,0,1,453,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,60 120,60 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"48\" y=\"43.5\">TCA</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"Policy_12lup3h\" transform=\"matrix(1,0,0,1,687,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,40 60,0 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"43.5\" y=\"43.5\">Policy</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape selected\" data-element-id=\"EndEvent_16kg9fx\" transform=\"matrix(1,0,0,1,925,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 4;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-nw\" transform=\"matrix(1,0,0,1,0,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-ne\" transform=\"matrix(0,1,-1,0,36,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-se\" transform=\"matrix(-1,0,0,-1,36,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-sw\" transform=\"matrix(0,-1,1,0,0,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"EndEvent_16kg9fx_label\" transform=\"matrix(1,0,0,1,898,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1ahk7jg\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"80\" y=\"174\" width=\"133\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 86,180L207,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"86,180 207,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1ahk7jg_label\" transform=\"matrix(1,0,0,1,101.5,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_18ahat1\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"321\" y=\"174\" width=\"138\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 327,180L453,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"327,180 453,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_18ahat1_label\" transform=\"matrix(1,0,0,1,345,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1mo9gxb\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"567\" y=\"174\" width=\"126\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 573,180L687,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"573,180 687,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1mo9gxb_label\" transform=\"matrix(1,0,0,1,585,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1dgtrrq\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"801\" y=\"174\" width=\"130\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 807,180L925,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"807,180 925,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1dgtrrq_label\" transform=\"matrix(1,0,0,1,821,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n</svg>","templateName":"{{TEMPLATE_NAME}}"}
diff --git a/robot/assets/templates/clamp/create_model.template b/robot/assets/templates/clamp/create_model.template
deleted file mode 100644
index dfa628cd..00000000
--- a/robot/assets/templates/clamp/create_model.template
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"${MODEL_NAME}","controlNamePrefix":"ClosedLoop-","bpmnText":"","propText":"{}","imageText":"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\" width=\"100%\" height=\"100%\">\n\t\t<defs>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmnw\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"6\" refY=\"6\" id=\"markerSjdype4kmny\">\n\t\t\t\t\t\t<circle cx=\"6\" cy=\"6\" r=\"3.5\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></circle>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"8.5\" refY=\"5\" id=\"markerSjdype4kmo0\">\n\t\t\t\t\t\t<path d=\"m 1 5 l 0 -3 l 7 3 l -7 3 z\" style=\"stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmo2\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-1\" refY=\"10\" id=\"markerSjdype4kmo4\">\n\t\t\t\t\t\t<path d=\"M 0 10 L 8 6 L 16 10 L 8 14 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-5\" refY=\"10\" id=\"markerSjdype4kmo6\">\n\t\t\t\t\t\t<path d=\"M 1 4 L 5 16\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t</defs>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1\" transform=\"matrix(1,0,0,1,50,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1_label\" transform=\"matrix(1,0,0,1,23,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"VesCollector_1g9cmz0\" transform=\"matrix(1,0,0,1,207,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"120,80 120,20 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<polyline points=\"20,0 20,80 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"14\">V</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"26\">E</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"38\">S</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"25.5\" y=\"43.5\">VesCollector</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"TCA_1d13unw\" transform=\"matrix(1,0,0,1,453,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,60 120,60 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"48\" y=\"43.5\">TCA</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"Policy_12lup3h\" transform=\"matrix(1,0,0,1,687,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,40 60,0 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"43.5\" y=\"43.5\">Policy</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape selected\" data-element-id=\"EndEvent_16kg9fx\" transform=\"matrix(1,0,0,1,925,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 4;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-nw\" transform=\"matrix(1,0,0,1,0,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-ne\" transform=\"matrix(0,1,-1,0,36,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-se\" transform=\"matrix(-1,0,0,-1,36,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-sw\" transform=\"matrix(0,-1,1,0,0,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"EndEvent_16kg9fx_label\" transform=\"matrix(1,0,0,1,898,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1ahk7jg\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"80\" y=\"174\" width=\"133\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 86,180L207,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"86,180 207,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1ahk7jg_label\" transform=\"matrix(1,0,0,1,101.5,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_18ahat1\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"321\" y=\"174\" width=\"138\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 327,180L453,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"327,180 453,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_18ahat1_label\" transform=\"matrix(1,0,0,1,345,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1mo9gxb\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"567\" y=\"174\" width=\"126\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 573,180L687,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"573,180 687,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1mo9gxb_label\" transform=\"matrix(1,0,0,1,585,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1dgtrrq\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"801\" y=\"174\" width=\"130\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 807,180L925,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"807,180 925,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1dgtrrq_label\" transform=\"matrix(1,0,0,1,821,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n</svg>","templateName":"${TEMPLATE_NAME}"}
diff --git a/robot/assets/templates/clamp/save_model_vlb.jinja b/robot/assets/templates/clamp/save_model_vlb.jinja
new file mode 100644
index 00000000..a6a144ba
--- /dev/null
+++ b/robot/assets/templates/clamp/save_model_vlb.jinja
@@ -0,0 +1 @@
+{"name":"{{MODEL_NAME}}","controlNamePrefix":"ClosedLoop-","bpmnText":"","propText":"{\"Policy_12lup3h\":{\"{{POLICY_NAME}}\":[{\"name\":\"pname\",\"value\":\"{{POLICY_NAME}}\"},{\"name\":\"pid\",\"value\":\"0\"},{\"name\":\"timeout\",\"value\":\"345\"},{\"policyConfigurations\":[[{\"name\":\"maxRetries\",\"value\":[\"3\"]},{\"name\":\"retryTimeLimit\",\"value\":[\"180\"]},{\"name\":\"_id\",\"value\":[\"YJ6lIO4\"]},{\"name\":\"parentPolicy\",\"value\":[\"\"]},{\"name\":\"actor\",\"value\":[\"APPC\"]},{\"name\":\"recipePayload\",\"value\":[\"\"]},{\"name\":\"recipeLevel\",\"value\":[\"\"]},{\"name\":\"targetResourceId\",\"value\":[\"\"]},{\"name\":\"targetResourceIdOther\",\"value\":[\"\"]},{\"name\":\"guardPolicyType\",\"value\":[\"GUARD_MIN_MAX\"]},{\"name\":\"guardTargets\",\"value\":[\".*\"]},{\"name\":\"minGuard\",\"value\":[\"1\"]},{\"name\":\"maxGuard\",\"value\":[\"1\"]},{\"name\":\"limitGuard\",\"value\":[\"1\"]},{\"name\":\"timeUnitsGuard\",\"value\":[\"minute\"]},{\"name\":\"timeWindowGuard\",\"value\":[\"10\"]},{\"name\":\"guardActiveStart\",\"value\":[\"00:00:01-05:00\"]},{\"name\":\"guardActiveEnd\",\"value\":[\"23:59:59-05:00\"]}]]}]},\"TCA_1d13unw\":{\"New_Set\":[{\"name\":\"tname\",\"value\":\"New_Set\"},{\"name\":\"tuuid\",\"value\":\"6aae3b26-6c63-t4de-f072-c812fb90204b\"},{\"name\":\"tcaPol\",\"value\":\"{{POLICY_NAME}}\"},{\"name\":\"eventName\",\"value\":\"vLoadBalancer\"},{\"name\":\"controlLoopSchemaType\",\"value\":\"VNF\"},{\"name\":\"tcaPolId\",\"value\":\"0\"},{\"serviceConfigurations\":[[\"{{DOLLAR_SIGN}}.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"GREATER\",\"200\",\"ONSET\"]]}]}}","imageText":"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\" width=\"100%\" height=\"100%\">\n\t\t<defs>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmnw\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"6\" refY=\"6\" id=\"markerSjdype4kmny\">\n\t\t\t\t\t\t<circle cx=\"6\" cy=\"6\" r=\"3.5\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></circle>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"8.5\" refY=\"5\" id=\"markerSjdype4kmo0\">\n\t\t\t\t\t\t<path d=\"m 1 5 l 0 -3 l 7 3 l -7 3 z\" style=\"stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmo2\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-1\" refY=\"10\" id=\"markerSjdype4kmo4\">\n\t\t\t\t\t\t<path d=\"M 0 10 L 8 6 L 16 10 L 8 14 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-5\" refY=\"10\" id=\"markerSjdype4kmo6\">\n\t\t\t\t\t\t<path d=\"M 1 4 L 5 16\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t</defs>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1\" transform=\"matrix(1,0,0,1,50,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1_label\" transform=\"matrix(1,0,0,1,23,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"VesCollector_1g9cmz0\" transform=\"matrix(1,0,0,1,207,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"120,80 120,20 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<polyline points=\"20,0 20,80 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"14\">V</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"26\">E</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"38\">S</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"25.5\" y=\"43.5\">VesCollector</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"TCA_1d13unw\" transform=\"matrix(1,0,0,1,453,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,60 120,60 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"48\" y=\"43.5\">TCA</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"Policy_12lup3h\" transform=\"matrix(1,0,0,1,687,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,40 60,0 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"43.5\" y=\"43.5\">Policy</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape selected\" data-element-id=\"EndEvent_16kg9fx\" transform=\"matrix(1,0,0,1,925,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 4;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-nw\" transform=\"matrix(1,0,0,1,0,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-ne\" transform=\"matrix(0,1,-1,0,36,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-se\" transform=\"matrix(-1,0,0,-1,36,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-sw\" transform=\"matrix(0,-1,1,0,0,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"EndEvent_16kg9fx_label\" transform=\"matrix(1,0,0,1,898,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1ahk7jg\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"80\" y=\"174\" width=\"133\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 86,180L207,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"86,180 207,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1ahk7jg_label\" transform=\"matrix(1,0,0,1,101.5,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_18ahat1\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"321\" y=\"174\" width=\"138\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 327,180L453,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"327,180 453,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_18ahat1_label\" transform=\"matrix(1,0,0,1,345,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1mo9gxb\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"567\" y=\"174\" width=\"126\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 573,180L687,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"573,180 687,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1mo9gxb_label\" transform=\"matrix(1,0,0,1,585,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1dgtrrq\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"801\" y=\"174\" width=\"130\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 807,180L925,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"807,180 925,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1dgtrrq_label\" transform=\"matrix(1,0,0,1,821,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n</svg>","templateName":"{{TEMPLATE_NAME}}","typeId":null,"deploymentId":null}
diff --git a/robot/assets/templates/clamp/save_model_vlb.template b/robot/assets/templates/clamp/save_model_vlb.template
deleted file mode 100644
index 945953a0..00000000
--- a/robot/assets/templates/clamp/save_model_vlb.template
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"${MODEL_NAME}","controlNamePrefix":"ClosedLoop-","bpmnText":"","propText":"{\"Policy_12lup3h\":{\"${POLICY_NAME}\":[{\"name\":\"pname\",\"value\":\"${POLICY_NAME}\"},{\"name\":\"pid\",\"value\":\"0\"},{\"name\":\"timeout\",\"value\":\"345\"},{\"policyConfigurations\":[[{\"name\":\"maxRetries\",\"value\":[\"3\"]},{\"name\":\"retryTimeLimit\",\"value\":[\"180\"]},{\"name\":\"_id\",\"value\":[\"YJ6lIO4\"]},{\"name\":\"parentPolicy\",\"value\":[\"\"]},{\"name\":\"actor\",\"value\":[\"APPC\"]},{\"name\":\"recipePayload\",\"value\":[\"\"]},{\"name\":\"recipeLevel\",\"value\":[\"\"]},{\"name\":\"targetResourceId\",\"value\":[\"\"]},{\"name\":\"targetResourceIdOther\",\"value\":[\"\"]},{\"name\":\"guardPolicyType\",\"value\":[\"GUARD_MIN_MAX\"]},{\"name\":\"guardTargets\",\"value\":[\".*\"]},{\"name\":\"minGuard\",\"value\":[\"1\"]},{\"name\":\"maxGuard\",\"value\":[\"1\"]},{\"name\":\"limitGuard\",\"value\":[\"1\"]},{\"name\":\"timeUnitsGuard\",\"value\":[\"minute\"]},{\"name\":\"timeWindowGuard\",\"value\":[\"10\"]},{\"name\":\"guardActiveStart\",\"value\":[\"00:00:01-05:00\"]},{\"name\":\"guardActiveEnd\",\"value\":[\"23:59:59-05:00\"]}]]}]},\"TCA_1d13unw\":{\"New_Set\":[{\"name\":\"tname\",\"value\":\"New_Set\"},{\"name\":\"tuuid\",\"value\":\"6aae3b26-6c63-t4de-f072-c812fb90204b\"},{\"name\":\"tcaPol\",\"value\":\"${POLICY_NAME}\"},{\"name\":\"eventName\",\"value\":\"vLoadBalancer\"},{\"name\":\"controlLoopSchemaType\",\"value\":\"VNF\"},{\"name\":\"tcaPolId\",\"value\":\"0\"},{\"serviceConfigurations\":[[\"${DOLLAR_SIGN}.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta\",\"GREATER\",\"200\",\"ONSET\"]]}]}}","imageText":"<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\" width=\"100%\" height=\"100%\">\n\t\t<defs>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmnw\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"6\" refY=\"6\" id=\"markerSjdype4kmny\">\n\t\t\t\t\t\t<circle cx=\"6\" cy=\"6\" r=\"3.5\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></circle>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"20\" markerHeight=\"20\" orient=\"auto\" refX=\"8.5\" refY=\"5\" id=\"markerSjdype4kmo0\">\n\t\t\t\t\t\t<path d=\"m 1 5 l 0 -3 l 7 3 l -7 3 z\" style=\"stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"11\" refY=\"10\" id=\"markerSjdype4kmo2\">\n\t\t\t\t\t\t<path d=\"M 1 5 L 11 10 L 1 15\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-1\" refY=\"10\" id=\"markerSjdype4kmo4\">\n\t\t\t\t\t\t<path d=\"M 0 10 L 8 6 L 16 10 L 8 14 Z\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#ffffff\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t\t\t<marker viewBox=\"0 0 20 20\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\" refX=\"-5\" refY=\"10\" id=\"markerSjdype4kmo6\">\n\t\t\t\t\t\t<path d=\"M 1 4 L 5 16\" style=\"stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;\" fill=\"#000000\" stroke=\"#000000\"></path>\n\t\t\t\t</marker>\n\t\t</defs>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1\" transform=\"matrix(1,0,0,1,50,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"StartEvent_1_label\" transform=\"matrix(1,0,0,1,23,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"VesCollector_1g9cmz0\" transform=\"matrix(1,0,0,1,207,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"120,80 120,20 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<polyline points=\"20,0 20,80 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"14\">V</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"26\">E</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"5\" y=\"38\">S</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"25.5\" y=\"43.5\">VesCollector</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"TCA_1d13unw\" transform=\"matrix(1,0,0,1,453,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,60 120,60 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"48\" y=\"43.5\">TCA</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"Policy_12lup3h\" transform=\"matrix(1,0,0,1,687,140)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"132\" height=\"92\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" rx=\"0\" ry=\"0\" style=\"stroke-width: 2;\" stroke=\"#000000\" fill=\"#ffffff\"></rect>\n\t\t\t\t\t\t\t\t<polyline points=\"0,40 60,0 \" style=\"stroke-width: 2;\" fill=\"none\" stroke=\"#000000\"></polyline>\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 12px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"43.5\" y=\"43.5\">Policy</tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"120\" height=\"80\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape selected\" data-element-id=\"EndEvent_16kg9fx\" transform=\"matrix(1,0,0,1,925,162)\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"48\" height=\"48\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<circle cx=\"18\" cy=\"18\" r=\"18\" style=\"stroke-width: 4;\" stroke=\"#000000\" fill=\"#ffffff\"></circle>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"36\" height=\"36\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-nw\" transform=\"matrix(1,0,0,1,0,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-ne\" transform=\"matrix(0,1,-1,0,36,0)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-se\" transform=\"matrix(-1,0,0,-1,36,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<g class=\" djs-resizer djs-resizer-sw\" transform=\"matrix(0,-1,1,0,0,36)\">\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"5\" height=\"5\" class=\" djs-resizer-visual\"></rect>\n\t\t\t\t\t\t\t\t<rect x=\"-7\" y=\"-7\" width=\"20\" height=\"20\" class=\" djs-resizer-hit\"></rect>\n\t\t\t\t\t\t</g>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"EndEvent_16kg9fx_label\" transform=\"matrix(1,0,0,1,898,198)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1ahk7jg\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"80\" y=\"174\" width=\"133\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 86,180L207,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"86,180 207,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1ahk7jg_label\" transform=\"matrix(1,0,0,1,101.5,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_18ahat1\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"321\" y=\"174\" width=\"138\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 327,180L453,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"327,180 453,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_18ahat1_label\" transform=\"matrix(1,0,0,1,345,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1mo9gxb\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"567\" y=\"174\" width=\"126\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 573,180L687,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"573,180 687,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1mo9gxb_label\" transform=\"matrix(1,0,0,1,585,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-connection\" data-element-id=\"SequenceFlow_1dgtrrq\" style=\"display: block;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"801\" y=\"174\" width=\"130\" height=\"12\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<path d=\"m 807,180L925,180 \" style=\"stroke-width: 2; stroke-linejoin: round; marker-end: url(&quot;#markerSjdype4kmnw&quot;);\" fill=\"none\" stroke=\"#000000\"></path>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<polyline points=\"807,180 925,180 \" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></polyline>\n\t\t\t\t</g>\n\t\t</g>\n\t\t<g class=\"djs-group\" xmlns=\"http://www.w3.org/2000/svg\">\n\t\t\t\t<g class=\"djs-element djs-shape\" data-element-id=\"SequenceFlow_1dgtrrq_label\" transform=\"matrix(1,0,0,1,821,170)\" style=\"display: none;\">\n\t\t\t\t\t\t<rect fill=\"none\" class=\"djs-outline\" x=\"-6\" y=\"-6\" width=\"102\" height=\"32\"></rect>\n\t\t\t\t\t\t<g class=\"djs-visual\">\n\t\t\t\t\t\t\t\t<text style=\"font-family: Arial,sans-serif; font-size: 11px;\" class=\" djs-label\">\n\t\t\t\t\t\t\t\t\t\t<tspan x=\"45\" y=\"0\"></tspan>\n\t\t\t\t\t\t\t\t</text>\n\t\t\t\t\t\t</g>\n\t\t\t\t\t\t<rect x=\"0\" y=\"0\" width=\"90\" height=\"20\" style=\"stroke-opacity: 0; stroke-width: 15;\" fill=\"none\" stroke=\"#ffffff\" class=\"djs-hit\"></rect>\n\t\t\t\t</g>\n\t\t</g>\n</svg>","templateName":"${TEMPLATE_NAME}","typeId":null,"deploymentId":null}
diff --git a/robot/assets/templates/cmso/OneVnfOneChangeWindow.json.template b/robot/assets/templates/cmso/OneVnfOneChangeWindow.jinja
index 158f5919..691aaff9 100644
--- a/robot/assets/templates/cmso/OneVnfOneChangeWindow.json.template
+++ b/robot/assets/templates/cmso/OneVnfOneChangeWindow.jinja
@@ -1,12 +1,12 @@
{
"domain" : "ChangeManagement",
- "scheduleId" : "${uuid}",
- "scheduleName" : "${uuid}",
- "userId" : "${userId}",
+ "scheduleId" : "{{uuid}}",
+ "scheduleName" : "{{uuid}}",
+ "userId" : "{{userId}}",
"domainData" : [{
- "CallbackUrl" : "${callbackUrl}",
- "CallbackData" : "${callbackData}",
- "WorkflowName" : "${workflow}"
+ "CallbackUrl" : "{{callbackUrl}}",
+ "CallbackData" : "{{callbackData}}",
+ "WorkflowName" : "{{workflow}}"
}
],
"schedulingInfo" : {
@@ -17,11 +17,11 @@
"vnfDetails" : [{
"groupId" : "group",
"node" : [
- "${node1}"
+ "{{node1}}"
],
"changeWindow" : [{
- "startTime" : "${start_time1}",
- "endTime" : "${end_time1}"
+ "startTime" : "{{start_time1}}",
+ "endTime" : "{{end_time1}}"
}
]
}
diff --git a/robot/assets/templates/cmso/VidCallbackData.json.template b/robot/assets/templates/cmso/VidCallbackData.jinja
index 9abf9b9b..c4c53167 100644
--- a/robot/assets/templates/cmso/VidCallbackData.json.template
+++ b/robot/assets/templates/cmso/VidCallbackData.jinja
@@ -1,5 +1,5 @@
{
- "vnfName" : "${vnfName}",
+ "vnfName" : "{{vnfName}}",
"vnfInstanceId" : "dummy-vnfinstance-id",
"modelInfo" : {
"modelType" : "vnf",
diff --git a/robot/assets/templates/so/cloud_config_v3.jinja b/robot/assets/templates/so/cloud_config_v3.jinja
new file mode 100644
index 00000000..6d445e56
--- /dev/null
+++ b/robot/assets/templates/so/cloud_config_v3.jinja
@@ -0,0 +1,19 @@
+{
+ "id": "{{site_name}}",
+ "region_id": "{{region_id}}",
+ "aic_version": "2.5",
+ "clli": "{{clli}}",
+ "identityService": {
+ "identity_url": "{{identity_url}}",
+ "mso_id": "{{mso_id}}",
+ "mso_pass": "{{mso_pass}}",
+ "admin_tenant": "{{admin_tenant}}",
+ "member_role": "{{member_role}}",
+ "tenant_meta_data": true,
+ "id": "{{identity_id}}",
+ "identity_server_type": "{{identity_server_type}}",
+ "identity_authentication_type": "{{authentication_type}}",
+ "project_domain_name": "{{project_domain_name}}",
+ "user_domain_name": "{{user_domain_name}}"
+ }
+}
diff --git a/robot/assets/templates/so/cloud_config_v3.template b/robot/assets/templates/so/cloud_config_v3.template
deleted file mode 100644
index 61674589..00000000
--- a/robot/assets/templates/so/cloud_config_v3.template
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "id": "${site_name}",
- "region_id": "${region_id}",
- "aic_version": "2.5",
- "clli": "${clli}",
- "identityService": {
- "identity_url": "${identity_url}",
- "mso_id": "${mso_id}",
- "mso_pass": "${mso_pass}",
- "admin_tenant": "${admin_tenant}",
- "member_role": "${member_role}",
- "tenant_meta_data": true,
- "id": "${identity_id}",
- "identity_server_type": "${identity_server_type}",
- "identity_authentication_type": "${authentication_type}",
- "project_domain_name": "${project_domain_name}",
- "user_domain_name": "${user_domain_name}"
- }
-}
diff --git a/robot/assets/templates/so/create_cloud_config.jinja b/robot/assets/templates/so/create_cloud_config.jinja
new file mode 100644
index 00000000..aeb6a826
--- /dev/null
+++ b/robot/assets/templates/so/create_cloud_config.jinja
@@ -0,0 +1,17 @@
+{
+ "id": "{{site_name}}",
+ "region_id": "{{region_id}}",
+ "aic_version": "2.5",
+ "clli": "{{clli}}",
+ "identityService": {
+ "identity_url": "{{identity_url}}",
+ "mso_id": "{{mso_id}}",
+ "mso_pass": "{{mso_pass}}",
+ "admin_tenant": "{{admin_tenant}}",
+ "member_role": "{{member_role}}",
+ "tenant_meta_data": true,
+ "id": "{{identity_id}}",
+ "identity_server_type": "{{identity_server_type}}",
+ "identity_authentication_type": "{{authentication_type}}"
+ }
+}
diff --git a/robot/assets/templates/so/create_cloud_config.template b/robot/assets/templates/so/create_cloud_config.template
deleted file mode 100644
index 969a8b05..00000000
--- a/robot/assets/templates/so/create_cloud_config.template
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "id": "${site_name}",
- "region_id": "${region_id}",
- "aic_version": "2.5",
- "clli": "${clli}",
- "identityService": {
- "identity_url": "${identity_url}",
- "mso_id": "${mso_id}",
- "mso_pass": "${mso_pass}",
- "admin_tenant": "${admin_tenant}",
- "member_role": "${member_role}",
- "tenant_meta_data": true,
- "id": "${identity_id}",
- "identity_server_type": "${identity_server_type}",
- "identity_authentication_type": "${authentication_type}"
- }
-}
diff --git a/robot/resources/clamp_interface.robot b/robot/resources/clamp_interface.robot
index b8ec12bf..a83bc4d3 100644
--- a/robot/resources/clamp_interface.robot
+++ b/robot/resources/clamp_interface.robot
@@ -4,9 +4,8 @@ Library RequestsLibrary
Library Collections
Library String
Library ONAPLibrary.JSON
-
+Library ONAPLibrary.Templating
Resource global_properties.robot
-Resource json_templater.robot
*** Variables ***
${CLAMP_HEALTH_CHECK_PATH} /restservices/clds/v1/healthcheck
@@ -15,7 +14,7 @@ ${CLAMP_BASE_PATH} /restservices/clds/v1
${CLAMP_CLIENT_KEY} robot/assets/keys/org.onap.clamp.key.clear.pem
${CLAMP_CLIENT_CERT} robot/assets/keys/org.onap.clamp.cert.pem
-${CLAMP_TEMPLATE_PATH} robot/assets/templates/clamp
+${CLAMP_TEMPLATE_PATH} clamp
*** Keywords ***
@@ -23,7 +22,8 @@ Run CLAMP Create Model
[Documentation] Create a new CLAMP Model
[Arguments] ${model_name} ${template_name}
${dict}= Create Dictionary MODEL_NAME=${model_name} TEMPLATE_NAME=${template_name}
- ${data}= Fill JSON Template File ${CLAMP_TEMPLATE_PATH}/create_model.template ${dict}
+ Create Environment clamp ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Apply Template clamp ${CLAMP_TEMPLATE_PATH}/create_model.jinja ${dict}
${data_path}= Set Variable ${CLAMP_BASE_PATH}/clds/model/${model_name}
${resp}= Run CLAMP HTTPS Put Request ${data_path} ${data}
Should Be Equal As Strings ${resp.status_code} 200
@@ -35,7 +35,8 @@ Run CLAMP Save vLB Model
[Documentation] Save CLAMP Model
[Arguments] ${model_name} ${template_name} ${policy_name}
${dict}= Create Dictionary MODEL_NAME=${model_name} TEMPLATE_NAME=${template_name} POLICY_NAME=${policy_name} DOLLAR_SIGN=$
- ${data}= Fill JSON Template File ${CLAMP_TEMPLATE_PATH}/save_model_vlb.template ${dict}
+ Create Environment clamp ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Apply Template clamp ${CLAMP_TEMPLATE_PATH}/save_model_vlb.jinja ${dict}
${data_path}= Set Variable ${CLAMP_BASE_PATH}/clds/model/${model_name}
${resp}= Run CLAMP HTTPS Put Request ${data_path} ${data}
Should Be Equal As Strings ${resp.status_code} 200
diff --git a/robot/resources/oof_interface.robot b/robot/resources/oof_interface.robot
index ad002f4b..eaf91b28 100644
--- a/robot/resources/oof_interface.robot
+++ b/robot/resources/oof_interface.robot
@@ -7,46 +7,47 @@ Library String
Library DateTime
Library Collections
Library ONAPLibrary.JSON
+Library ONAPLibrary.Templating
Resource global_properties.robot
-Resource json_templater.robot
*** Variables ***
${OOF_HOMING_HEALTH_CHECK_PATH} /v1/plans/healthcheck
${OOF_SNIRO_HEALTH_CHECK_PATH} /api/oof/v1/healthcheck
${OOF_CMSO_HEALTH_CHECK_PATH} /cmso/v1/health?checkInterfaces=true
-${OOF_CMSO_TEMPLATE_FOLDER} robot/assets/templates/cmso
+${OOF_CMSO_TEMPLATE_FOLDER} cmso
${OOF_CMSO_UTC} %Y-%m-%dT%H:%M:%SZ
-${OOF_HOMING_PLAN_FOLDER} robot/assets/templates/optf-has
-${OOF_OSDF_TEMPLATE_FOLDER} robot/assets/templates/optf-osdf
+${OOF_HOMING_PLAN_FOLDER} robot/assets/oof/optf-has
+${OOF_OSDF_TEMPLATE_FOLDER} robot/assets/oof/optf-osdf
${OOF_HOMING_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT}
${OOF_SNIRO_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR}:${GLOBAL_OOF_SNIRO_SERVER_PORT}
${OOF_CMSO_ENDPOINT} ${GLOBAL_OOF_CMSO_PROTOCOL}://${GLOBAL_INJECTED_OOF_CMSO_IP_ADDR}:${GLOBAL_OOF_CMSO_SERVER_PORT}
${OOF_OSDF_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT}
-${OOF_HOMING_AUTH} Basic YWRtaW4xOnBsYW4uMTU=
*** Keywords ***
Run OOF-Homing Health Check
- [Documentation] Runs OOF-Homing Health check
- ${resp}= Run OOF-Homing Get Request ${OOF_HOMING_HEALTH_CHECK_PATH}
- Should Be Equal As Integers ${resp.status_code} 200
+ [Documentation] Runs OOF-Homing Health check
+ ${resp}= Run OOF-Homing Get Request ${OOF_HOMING_HEALTH_CHECK_PATH}
+ Should Be Equal As Integers ${resp.status_code} 200
Run OOF-Homing Get Request
- [Documentation] Runs OOF-Homing Get request
- [Arguments] ${data_path}
- ${session}= Create Session session ${OOF_HOMING_ENDPOINT}
- ${resp}= Get Request session ${data_path}
- Should Be Equal As Integers ${resp.status_code} 200
- Log Received response from OOF-Homing ${resp.text}
- [Return] ${resp}
+ [Documentation] Runs OOF-Homing Get request
+ [Arguments] ${data_path}
+ ${session}= Create Session session ${OOF_HOMING_ENDPOINT}
+ ${resp}= Get Request session ${data_path}
+ Should Be Equal As Integers ${resp.status_code} 200
+ Log Received response from OOF-Homing ${resp.text}
+ [Return] ${resp}
RUN OOF-Homing SendPlanWithWrongVersion
- [Documentation] It sends a POST request to conductor
+ [Documentation] It sends a POST request to conductor
${session}= Create Session optf-cond ${OOF_HOMING_ENDPOINT}
${data}= Get Binary File ${OOF_HOMING_PLAN_FOLDER}${/}plan_with_wrong_version.json
- &{headers}= Create Dictionary Authorization=${OOF_HOMING_Auth} Content-Type=application/json Accept=application/json
+ ${auth}= Create List ${GLOBAL_OOF_HOMING_USERNAME} ${GLOBAL_OOF_HOMING_PASSWORD}
+ ${session}= Create Session session ${OOF_CMSO_ENDPOINT} auth=${auth}
+ &{headers}= Create Dictionary Content-Type=application/json Accept=application/json
${resp}= Post Request optf-cond /v1/plans data=${data} headers=${headers}
Log *********************
Log response = ${resp}
@@ -99,7 +100,7 @@ Run OOF-CMSO Post Scheduler
Run OOF-CMSO Future Schedule
[Documentation] Runs CMSO Future Schedule ETE test. One VNF, One Change Window
- [Arguments] ${request_file}=OneVnfOneChangeWindow.json.template ${workflow}=Replace ${minutesFromNow}=3
+ [Arguments] ${request_file}=OneVnfOneChangeWindow.jinja ${workflow}=Replace ${minutesFromNow}=3
${uuid}= Generate UUID4
${resp}= OOF-CMSO Create Schedule ${uuid} ${request_file} workflow=${workflow} minutesFromNow=${minutesFromNow}
Should Be Equal as Strings ${resp.status_code} 202
@@ -126,16 +127,17 @@ OOF-CMSO Create Schedule
\ ${end_time}= Get Current Date UTC + ${tomorrow} minutes result_format=${OOF_CMSO_UTC}
\ Set To Dictionary ${map} start_time${i}=${start_time} end_time${i}=${end_time}
${requestList}= Create List
+ Create Environment oof ${GLOBAL_TEMPLATE_FOLDER}
:FOR ${vnf} IN @{nodelist}
\ Set To Dictionary ${map} node${nn} ${vnf}
\ ${nn}= Evaluate ${nn}+1
- \ Set To DIctionary ${dict} vnfName=${vnf}
- \ ${requestInfo}= Fill JSON Template File ${OOF_CMSO_TEMPLATE_FOLDER}/VidCallbackData.json.template ${dict}
+ \ Set To DIctionary ${dict} vnfName=${vnf}
+ \ ${requestInfo}= Apply Template oof ${OOF_CMSO_TEMPLATE_FOLDER}/VidCallbackData.jinja ${dict}
\ Append To List ${requestList} ${requestInfo}
${callBackDataMap}= Create Dictionary requestType=Update requestDetails=${requestList}
${callbackDataString}= OOF-CMSO Json Escape ${callbackDataMap}
Set To Dictionary ${map} callbackData=${callbackDataString}
- ${data}= Fill JSON Template File ${OOF_CMSO_TEMPLATE_FOLDER}/${request_file} ${map}
+ ${data}= Apply Template oof ${OOF_CMSO_TEMPLATE_FOLDER}/${request_file} ${map}
${resp}= Run OOF-CMSO Post Scheduler cmso/v1/schedules/${uuid} data=${data}
[Return] ${resp}
diff --git a/robot/resources/so/create_cloud_config.robot b/robot/resources/so/create_cloud_config.robot
index 8762d415..9c310fd0 100644
--- a/robot/resources/so/create_cloud_config.robot
+++ b/robot/resources/so/create_cloud_config.robot
@@ -1,25 +1,26 @@
*** Settings ***
Documentation Create Cloud Config
-Resource ../json_templater.robot
Resource ../so_interface.robot
Library OperatingSystem
Library Collections
+Library ONAPLibrary.Templating
*** Variables ***
${CLOUD_CONFIG_PATH} /cloudSite
${SYSTEM USER} robot-ete
-${SO_ADD_CLOUD_CONFIG}= robot/assets/templates/so/create_cloud_config.template
-${SO_ADD_CLOUD_CONFIG_V3}= robot/assets/templates/so/cloud_config_v3.template
+${SO_ADD_CLOUD_CONFIG}= so/create_cloud_config.jinja
+${SO_ADD_CLOUD_CONFIG_V3}= so/cloud_config_v3.jinja
*** Keywords ***
Create Cloud Configuration
[Documentation] Creates a cloud configuration in SO, so it knows how to talk to an openstack cloud
[Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type}
${arguments}= Create Dictionary site_name=${site_name} region_id=${region_id} clli=${clli} identity_id=${identity_id} identity_url=${identity_url} mso_id=${mso_id} mso_pass=${mso_pass} admin_tenant=${admin_tenant} member_role=${member_role} identity_server_type=${identity_server_type} authentication_type=${authentication_type}
- ${data}= Fill JSON Template File ${SO_ADD_CLOUD_CONFIG} ${arguments}
+ Create Environment so ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Apply Template so ${SO_ADD_CLOUD_CONFIG} ${arguments}
${get_resp}= Run SO Catalog Post request ${CLOUD_CONFIG_PATH}/${site_name} ${data}
${get_resp}= Run Keyword If '${get_resp.status_code}'=='404' Update Cloud Configuration ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type}
@@ -31,7 +32,8 @@ Create Cloud Configuration v3
[Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} ${project_domain_name} ${user_domain_Name}
${arguments}= Create Dictionary site_name=${site_name} region_id=${region_id} clli=${clli} identity_id=${identity_id} identity_url=${identity_url} mso_id=${mso_id} mso_pass=${mso_pass} admin_tenant=${admin_tenant} member_role=${member_role} identity_server_type=${identity_server_type} authentication_type=${authentication_type} project_domain_name=${project_domain_name} user_domain_name=${user_domain_name}
Log ${arguments}
- ${data}= Fill JSON Template File ${SO_ADD_CLOUD_CONFIG_V3} ${arguments}
+ Create Environment so ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Apply Template so ${SO_ADD_CLOUD_CONFIG_V3} ${arguments}
${get_resp}= Run SO Catalog Post request ${CLOUD_CONFIG_PATH} ${data}
${status_string}= Convert To String ${get_resp.status_code}
Should Match Regexp ${status_string} ^(201|200)$
@@ -40,7 +42,8 @@ Update Cloud Configuration
[Documentation] Updates a cloud configuration in SO
[Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type}
${arguments}= Create Dictionary site_name=${site_name} region_id=${region_id} clli=${clli} identity_id=${identity_id} identity_url=${identity_url} mso_id=${mso_id} mso_pass=${mso_pass} admin_tenant=${admin_tenant} member_role=${member_role} identity_server_type=${identity_server_type} authentication_type=${authentication_type}
- ${data}= Fill JSON Template File ${SO_ADD_CLOUD_CONFIG} ${arguments}
+ Create Environment so ${GLOBAL_TEMPLATE_FOLDER}
+ ${data}= Apply Template so ${SO_ADD_CLOUD_CONFIG} ${arguments}
${get_resp}= Run SO Catalog Put request ${CLOUD_CONFIG_PATH}/${site_name} ${data}
Should Be Equal As Strings ${get_resp.status_code} 200
[Return] ${get_resp}
diff --git a/robot/resources/so_interface.robot b/robot/resources/so_interface.robot
index 6c4fd26e..1e555dbf 100644
--- a/robot/resources/so_interface.robot
+++ b/robot/resources/so_interface.robot
@@ -5,7 +5,6 @@ Library ONAPLibrary.Utilities
Library OperatingSystem
Library Collections
Resource global_properties.robot
-Resource ../resources/json_templater.robot
*** Variables ***
${MSO_HEALTH_CHECK_PATH} /manage/health
${MSO_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_IP_ADDR}:${GLOBAL_MSO_SERVER_PORT}
diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
index e5ffc97e..f11715e3 100644
--- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot
@@ -18,7 +18,6 @@ Resource ../openstack/neutron_interface.robot
Resource ../heatbridge.robot
Resource ../global_properties.robot
-Resource ../json_templater.robot
Resource ../so_interface.robot
Library ONAPLibrary.Openstack