From c92a2df8a96e852757817418512ab4920ee32e7f Mon Sep 17 00:00:00 2001
From: Magda Zaremba <magdalena.zaremba@codilime.com>
Date: Fri, 20 Apr 2018 16:53:07 +0200
Subject: [PATCH] Remove fields in "create service template" workflow not
 visible in UI

Change-Id: I51653b5d6a33421bf0fb2e370d1f481fb7409f77
Closes-Bug: #1765743
---
 .../main/js/workflows/createServiceTemplate.js   |  5 -----
 .../vro/workflows/custom/ServiceTemplate.kt      | 16 ----------------
 2 files changed, 21 deletions(-)

diff --git a/o11nplugin-contrail-workflows/src/main/js/workflows/createServiceTemplate.js b/o11nplugin-contrail-workflows/src/main/js/workflows/createServiceTemplate.js
index 31eb7a17..f0cf201a 100644
--- a/o11nplugin-contrail-workflows/src/main/js/workflows/createServiceTemplate.js
+++ b/o11nplugin-contrail-workflows/src/main/js/workflows/createServiceTemplate.js
@@ -5,16 +5,11 @@ item.setParentConnection(parent);
 var properties = new ContrailServiceTemplateType();
 properties.setServiceMode(serviceMode);
 properties.setServiceType(serviceType);
-properties.setAvailabilityZoneEnable(availabilityZoneEnable);
-properties.setInstanceData(instanceData);
 properties.setVersion(version);
 
 if (serviceVirtualizationType){
     properties.setServiceVirtualizationType(serviceVirtualizationType);
 }
-if (vrouterInstanceType){
-    properties.setVrouterInstanceType(vrouterInstanceType);
-}
 
 if (interfaceType){
     interfaceType.forEach(function(element) {
diff --git a/o11nplugin-contrail-workflows/src/main/kotlin/net/juniper/contrail/vro/workflows/custom/ServiceTemplate.kt b/o11nplugin-contrail-workflows/src/main/kotlin/net/juniper/contrail/vro/workflows/custom/ServiceTemplate.kt
index f8606749..e78933d2 100644
--- a/o11nplugin-contrail-workflows/src/main/kotlin/net/juniper/contrail/vro/workflows/custom/ServiceTemplate.kt
+++ b/o11nplugin-contrail-workflows/src/main/kotlin/net/juniper/contrail/vro/workflows/custom/ServiceTemplate.kt
@@ -12,7 +12,6 @@ import net.juniper.contrail.vro.workflows.model.string
 import net.juniper.contrail.vro.workflows.model.number
 import net.juniper.contrail.vro.workflows.model.array
 import net.juniper.contrail.vro.workflows.model.reference
-import net.juniper.contrail.vro.workflows.model.boolean
 import net.juniper.contrail.vro.schema.Schema
 import net.juniper.contrail.vro.workflows.util.extractPredefinedAnswers
 import net.juniper.contrail.vro.config.constants.item
@@ -67,21 +66,6 @@ internal fun createServiceTemplate(schema: Schema) : WorkflowDefinition {
             predefinedAnswers = supportedInterfaceNames
             sameValues = false
         }
-        parameter("vrouterInstanceType", string) {
-            description = propertyDescription<ServiceTemplateType>(schema)
-            mandatory = false
-            extractPredefinedAnswers<ServiceTemplateType>(schema)
-        }
-        parameter("availabilityZoneEnable", boolean) {
-            description = propertyDescription<ServiceTemplateType>(schema)
-            mandatory = false
-            defaultValue = false
-        }
-        parameter("instanceData", string) {
-            description = propertyDescription<ServiceTemplateType>(schema)
-            mandatory = false
-            multiline = true
-        }
         output(item, reference<ServiceTemplate>()) {
             description = "Service template created in this workflow"
         }