From c7896d90c9d7101a9d7c977beac4c452e6ed9cfe Mon Sep 17 00:00:00 2001 From: Ekaterina Chernova Date: Tue, 15 Sep 2015 19:44:41 +0300 Subject: [PATCH] Update UI definitions to 2.2 version Now latest supported version is 2.2. It was in blueprint. In this commits version of all apps is updated. New definitions will be not supported by old murano releases, since apps from corresponding branch need to be used. Change-Id: I0a001c44ab32b11387bd1c3930aca89391501d8a Closes-Bug: #1495548 --- .../package/Classes/ApacheHttpServer.yaml | 2 -- ApacheHTTPServer/package/UI/ui.yaml | 10 +----- Chef/GitChef/package/Classes/GitChef.yaml | 3 -- Chef/GitChef/package/UI/ui.yaml | 10 +----- Chef/OrionChef/package/Classes/OrionChef.yaml | 2 -- Chef/OrionChef/package/UI/ui.yaml | 10 +----- .../package/Classes/CloudFoundry.yaml | 2 -- CloudFoundry/package/UI/ui.yaml | 10 +----- .../package/Classes/CloudFoundryDiego.yaml | 3 -- CloudFoundryDiego/package/UI/ui.yaml | 10 +----- Guacamole/package/Classes/Guacamole.yaml | 4 +-- Guacamole/package/UI/ui.yaml | 10 +----- HDPSandbox/package/Classes/HDPSandbox.yaml | 3 -- HDPSandbox/package/UI/ui.yaml | 12 +------ MySQL/package/Classes/MySql.yaml | 2 -- MySQL/package/UI/ui.yaml | 34 +++++-------------- PostgreSQL/package/Classes/PostgreSql.yaml | 2 -- PostgreSQL/package/UI/ui.yaml | 33 +++++------------- .../package/Classes/MySQLPuppet.yaml | 3 -- Puppet/MySQLPuppet/package/UI/ui.yaml | 10 +----- Rally/package/Classes/Rally.yaml | 3 -- Rally/package/UI/ui.yaml | 10 +----- Tomcat/package/Classes/Tomcat.yaml | 3 -- Tomcat/package/UI/ui.yaml | 33 +++++------------- WordPress/package/Classes/WordPress.yaml | 2 -- WordPress/package/UI/ui.yaml | 10 +----- ZabbixAgent/package/Classes/ZabbixAgent.yaml | 2 -- ZabbixAgent/package/UI/ui.yaml | 11 +----- .../package/Classes/ZabbixServer.yaml | 2 -- ZabbixServer/package/UI/ui.yaml | 10 +----- 30 files changed, 40 insertions(+), 221 deletions(-) diff --git a/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml b/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml index 3fd37368..d6ff6959 100644 --- a/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml +++ b/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml @@ -22,8 +22,6 @@ Name: ApacheHttpServer Extends: std:Application Properties: - name: - Contract: $.string().notNull() enablePHP: Contract: $.bool() diff --git a/ApacheHTTPServer/package/UI/ui.yaml b/ApacheHTTPServer/package/UI/ui.yaml index bf5206af..32f5d9ca 100644 --- a/ApacheHTTPServer/package/UI/ui.yaml +++ b/ApacheHTTPServer/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: io.murano.apps.apache.ApacheHttpServer - name: $.appConfiguration.name enablePHP: $.appConfiguration.enablePHP instance: ?: @@ -46,13 +45,6 @@ Forms: description: Apache License, Version 2.0 hidden: true required: false - - name: name - type: string - label: Application Name - initial: 'ApacheHttpServer' - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - name: enablePHP label: Enable PHP type: boolean diff --git a/Chef/GitChef/package/Classes/GitChef.yaml b/Chef/GitChef/package/Classes/GitChef.yaml index d8c7a16f..01436687 100644 --- a/Chef/GitChef/package/Classes/GitChef.yaml +++ b/Chef/GitChef/package/Classes/GitChef.yaml @@ -11,9 +11,6 @@ Extends: std:Application Properties: - name: - Contract: $.string().notNull() - instance: Contract: $.class(res:Instance).notNull() diff --git a/Chef/GitChef/package/UI/ui.yaml b/Chef/GitChef/package/UI/ui.yaml index bad5ff7b..8ba8dad2 100644 --- a/Chef/GitChef/package/UI/ui.yaml +++ b/Chef/GitChef/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: io.murano.conflang.chef.GitChef - name: $.appConfiguration.name instance: ?: type: io.murano.resources.LinuxMuranoInstance @@ -45,13 +44,6 @@ Forms: description: ' ' hidden: true required: false - - name: name - type: string - label: Application Name - initial: 'Git (Chef)' - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - name: assignFloatingIP type: boolean label: Assign Floating IP diff --git a/Chef/OrionChef/package/Classes/OrionChef.yaml b/Chef/OrionChef/package/Classes/OrionChef.yaml index 8e6fcd7f..b334bbde 100644 --- a/Chef/OrionChef/package/Classes/OrionChef.yaml +++ b/Chef/OrionChef/package/Classes/OrionChef.yaml @@ -11,8 +11,6 @@ Extends: std:Application Properties: - name: - Contract: $.string().notNull() port: Contract: $.string().notNull() instance: diff --git a/Chef/OrionChef/package/UI/ui.yaml b/Chef/OrionChef/package/UI/ui.yaml index 4b4d5f4e..0acdbfb7 100644 --- a/Chef/OrionChef/package/UI/ui.yaml +++ b/Chef/OrionChef/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: io.murano.conflang.fiware.OrionChef - name: $.appConfiguration.name port: $.appConfiguration.port instance: ?: @@ -46,13 +45,6 @@ Forms: description: ' ' hidden: true required: false - - name: name - type: string - label: Application Name - initial: 'Orion' - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - name: port type: integer label: Port diff --git a/CloudFoundry/package/Classes/CloudFoundry.yaml b/CloudFoundry/package/Classes/CloudFoundry.yaml index 5b688e07..d5213a18 100644 --- a/CloudFoundry/package/Classes/CloudFoundry.yaml +++ b/CloudFoundry/package/Classes/CloudFoundry.yaml @@ -21,8 +21,6 @@ Name: CloudFoundry Extends: std:Application Properties: - name: - Contract: $.string().notNull() instance: Contract: $.class(res:Instance).notNull() diff --git a/CloudFoundry/package/UI/ui.yaml b/CloudFoundry/package/UI/ui.yaml index c18bf2bc..d63504ba 100644 --- a/CloudFoundry/package/UI/ui.yaml +++ b/CloudFoundry/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: io.murano.apps.paas.CloudFoundry - name: $.appConfiguration.name instance: ?: type: io.murano.resources.LinuxMuranoInstance @@ -44,13 +43,6 @@ Forms: description: Apache License, Version 2.0 hidden: true required: false - - name: name - type: string - label: Application Name - initial: CF - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - name: assignFloatingIP type: boolean label: Assign Floating IP diff --git a/CloudFoundryDiego/package/Classes/CloudFoundryDiego.yaml b/CloudFoundryDiego/package/Classes/CloudFoundryDiego.yaml index 0491dd14..9da61a8b 100644 --- a/CloudFoundryDiego/package/Classes/CloudFoundryDiego.yaml +++ b/CloudFoundryDiego/package/Classes/CloudFoundryDiego.yaml @@ -21,9 +21,6 @@ Name: CloudFoundryDiego Extends: std:Application Properties: - name: - Contract: $.string().notNull() - instance: Contract: $.class(res:Instance).notNull() diff --git a/CloudFoundryDiego/package/UI/ui.yaml b/CloudFoundryDiego/package/UI/ui.yaml index 8a4514f3..7eaeda52 100644 --- a/CloudFoundryDiego/package/UI/ui.yaml +++ b/CloudFoundryDiego/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: io.murano.apps.paas.CloudFoundryDiego - name: $.appConfiguration.name instance: ?: type: io.murano.resources.LinuxMuranoInstance @@ -44,13 +43,6 @@ Forms: description: Apache License, Version 2.0 hidden: true required: false - - name: name - type: string - label: Application Name - initial: CF - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - name: assignFloatingIP type: boolean label: Assign Floating IP diff --git a/Guacamole/package/Classes/Guacamole.yaml b/Guacamole/package/Classes/Guacamole.yaml index 239e5ebe..006d7128 100644 --- a/Guacamole/package/Classes/Guacamole.yaml +++ b/Guacamole/package/Classes/Guacamole.yaml @@ -21,8 +21,6 @@ Name: Guacamole Extends: std:Application Properties: - name: - Contract: $.string().notNull() username: Contract: $.string().notNull() password: @@ -55,5 +53,5 @@ Methods: - $address: $.server.instance.floatingIpAddress Else: - $address: $.server.instance.ipAddresses[0] - - $._environment.reporter.report($this, 'Guacamole {0} is available at http://{1}:{2}/guacamole'.format($.name, $address, 8080)) + - $._environment.reporter.report($this, 'Guacamole application is available at http://{1}:{2}/guacamole'.format($address, 8080)) - $.setAttr(deployed, true) diff --git a/Guacamole/package/UI/ui.yaml b/Guacamole/package/UI/ui.yaml index ba45d8c0..2c0e2a26 100644 --- a/Guacamole/package/UI/ui.yaml +++ b/Guacamole/package/UI/ui.yaml @@ -10,12 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.2 Application: ?: type: io.murano.apps.Guacamole - name: $.appConfiguration.name username: $.appConfiguration.username password: $.appConfiguration.password server: $.appConfiguration.server @@ -28,13 +27,6 @@ Forms: description: Apache License, Version 2.0 hidden: true required: false - - name: name - type: string - label: Application Name - initial: Guacamole - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - name: username type: string label: Username diff --git a/HDPSandbox/package/Classes/HDPSandbox.yaml b/HDPSandbox/package/Classes/HDPSandbox.yaml index 4c4006ce..0e126084 100644 --- a/HDPSandbox/package/Classes/HDPSandbox.yaml +++ b/HDPSandbox/package/Classes/HDPSandbox.yaml @@ -9,9 +9,6 @@ Name: HDPSandbox Extends: std:Application Properties: - name: - Contract: $.string().notNull() - instance: Contract: $.class(res:Instance).notNull() diff --git a/HDPSandbox/package/UI/ui.yaml b/HDPSandbox/package/UI/ui.yaml index ac121784..a375dfc5 100644 --- a/HDPSandbox/package/UI/ui.yaml +++ b/HDPSandbox/package/UI/ui.yaml @@ -1,4 +1,4 @@ -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -10,7 +10,6 @@ Templates: Application: ?: type: io.murano.apps.HDPSandbox - name: $.appConfiguration.name instance: ?: type: io.murano.resources.LinuxMuranoInstance @@ -24,15 +23,6 @@ Application: customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - - appConfiguration: - fields: - - name: name - type: string - label: Application Name - initial: 'HDP-Sandbox' - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - instanceConfiguration: fields: - name: flavor diff --git a/MySQL/package/Classes/MySql.yaml b/MySQL/package/Classes/MySql.yaml index 43095110..f13acf7d 100644 --- a/MySQL/package/Classes/MySql.yaml +++ b/MySQL/package/Classes/MySql.yaml @@ -24,8 +24,6 @@ Extends: Properties: instance: Contract: $.class(res:Instance).notNull() - name: - Contract: $.string().notNull() database: Contract: $.string() username: diff --git a/MySQL/package/UI/ui.yaml b/MySQL/package/UI/ui.yaml index 3f3cd37f..6005f27e 100644 --- a/MySQL/package/UI/ui.yaml +++ b/MySQL/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: io.murano.databases.MySql - name: $.appConfiguration.name database: $.initDatabaseConfiguration.database username: $.initDatabaseConfiguration.username password: $.initDatabaseConfiguration.password @@ -34,35 +33,13 @@ Application: image: $.instanceConfiguration.osImage keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone - assignFloatingIp: $.appConfiguration.assignFloatingIP + assignFloatingIp: $.instanceConfiguration.assignFloatingIP networks: useEnvironmentNetwork: $.instanceConfiguration.network[0]=null useFlatNetwork: false customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - - appConfiguration: - fields: - - name: license - type: string - description: Apache License, Version 2.0 - hidden: true - required: false - - name: name - type: string - label: Application Name - initial: MySqlDB - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - - name: assignFloatingIP - type: boolean - label: Assign Floating IP - description: >- - Select to true to assign floating IP automatically - initial: false - required: false - - initDatabaseConfiguration: fields: - name: title @@ -112,6 +89,13 @@ Forms: description: >- Select valid image for the application. Image should already be prepared and registered in glance. + - name: assignFloatingIP + type: boolean + label: Assign Floating IP + description: >- + Select to true to assign floating IP automatically + initial: false + required: false - name: keyPair type: keypair label: Key Pair diff --git a/PostgreSQL/package/Classes/PostgreSql.yaml b/PostgreSQL/package/Classes/PostgreSql.yaml index 69ff4bcd..545f5108 100644 --- a/PostgreSQL/package/Classes/PostgreSql.yaml +++ b/PostgreSQL/package/Classes/PostgreSql.yaml @@ -24,8 +24,6 @@ Extends: Properties: instance: Contract: $.class(res:Instance).notNull() - name: - Contract: $.string().notNull() database: Contract: $.string() username: diff --git a/PostgreSQL/package/UI/ui.yaml b/PostgreSQL/package/UI/ui.yaml index 9b205be7..ab7f125c 100644 --- a/PostgreSQL/package/UI/ui.yaml +++ b/PostgreSQL/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: io.murano.databases.PostgreSql - name: $.appConfiguration.name database: $.initDatabaseConfiguration.database username: $.initDatabaseConfiguration.username password: $.initDatabaseConfiguration.password @@ -34,34 +33,13 @@ Application: image: $.instanceConfiguration.osImage keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone - assignFloatingIp: $.appConfiguration.assignFloatingIP + assignFloatingIp: $.instanceConfiguration.assignFloatingIP networks: useEnvironmentNetwork: $.instanceConfiguration.network[0]=null useFlatNetwork: false customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - - appConfiguration: - fields: - - name: license - type: string - description: Apache License, Version 2.0 - hidden: true - required: false - - name: name - type: string - label: Application Name - initial: PostgreDB - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - - name: assignFloatingIP - type: boolean - label: Assign Floating IP - description: >- - Select to true to assign floating IP automatically - initial: false - required: false - initDatabaseConfiguration: fields: - name: title @@ -110,6 +88,13 @@ Forms: description: >- Select valid image for the application. Image should already be prepared and registered in glance. + - name: assignFloatingIP + type: boolean + label: Assign Floating IP + description: >- + Select to true to assign floating IP automatically + initial: false + required: false - name: keyPair type: keypair label: Key Pair diff --git a/Puppet/MySQLPuppet/package/Classes/MySQLPuppet.yaml b/Puppet/MySQLPuppet/package/Classes/MySQLPuppet.yaml index 97398572..3f843f05 100644 --- a/Puppet/MySQLPuppet/package/Classes/MySQLPuppet.yaml +++ b/Puppet/MySQLPuppet/package/Classes/MySQLPuppet.yaml @@ -11,9 +11,6 @@ Extends: std:Application Properties: - name: - Contract: $.string().notNull() - port: Contract: $.string().notNull() diff --git a/Puppet/MySQLPuppet/package/UI/ui.yaml b/Puppet/MySQLPuppet/package/UI/ui.yaml index ceb5df78..9f4377bd 100644 --- a/Puppet/MySQLPuppet/package/UI/ui.yaml +++ b/Puppet/MySQLPuppet/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: io.murano.conflang.puppet.MySQLPuppet - name: $.appConfiguration.name port: $.appConfiguration.port instance: ?: @@ -52,13 +51,6 @@ Forms: description: 'MySQL port' required: true initial: 3306 - - name: name - type: string - label: Application Name - initial: 'MySQL (Puppet)' - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - name: assignFloatingIP type: boolean label: Assign Floating IP diff --git a/Rally/package/Classes/Rally.yaml b/Rally/package/Classes/Rally.yaml index 1a78d719..9d579436 100644 --- a/Rally/package/Classes/Rally.yaml +++ b/Rally/package/Classes/Rally.yaml @@ -22,9 +22,6 @@ Name: Rally Extends: std:Application Properties: - name: - Contract: $.string().notNull() - instance: Contract: $.class(res:LinuxMuranoInstance).notNull() diff --git a/Rally/package/UI/ui.yaml b/Rally/package/UI/ui.yaml index 79fca1e9..ac7b9bfb 100644 --- a/Rally/package/UI/ui.yaml +++ b/Rally/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: org.openstack.Rally - name: $.appConfiguration.name instance: ?: type: io.murano.resources.LinuxMuranoInstance @@ -45,13 +44,6 @@ Forms: description: Apache License, Version 2.0 hidden: true required: false - - name: name - type: string - label: Application Name - initial: 'Rally' - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - name: assignFloatingIP type: boolean label: Assign Floating IP diff --git a/Tomcat/package/Classes/Tomcat.yaml b/Tomcat/package/Classes/Tomcat.yaml index bdea62a8..e2c4fe3a 100644 --- a/Tomcat/package/Classes/Tomcat.yaml +++ b/Tomcat/package/Classes/Tomcat.yaml @@ -22,9 +22,6 @@ Name: Tomcat Extends: std:Application Properties: - name: - Contract: $.string().notNull() - instance: Contract: $.class(res:Instance).notNull() diff --git a/Tomcat/package/UI/ui.yaml b/Tomcat/package/UI/ui.yaml index 1ce487b0..8d234c63 100644 --- a/Tomcat/package/UI/ui.yaml +++ b/Tomcat/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: io.murano.apps.apache.Tomcat - name: $.appConfiguration.name instance: ?: type: io.murano.resources.LinuxMuranoInstance @@ -31,34 +30,13 @@ Application: image: $.instanceConfiguration.osImage keyname: $.instanceConfiguration.keyPair availabilityZone: $.instanceConfiguration.availabilityZone - assignFloatingIp: $.appConfiguration.assignFloatingIP + assignFloatingIp: $.instanceConfiguration.assignFloatingIP networks: useEnvironmentNetwork: $.instanceConfiguration.network[0]=null useFlatNetwork: false customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet) Forms: - - appConfiguration: - fields: - - name: license - type: string - description: Apache License, Version 2.0 - hidden: true - required: false - - name: name - type: string - label: Application Name - initial: Tomcat - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - - name: assignFloatingIP - type: boolean - label: Assign Floating IP - description: >- - Select to true to assign floating IP automatically - initial: false - required: false - instanceConfiguration: fields: - name: title @@ -80,6 +58,13 @@ Forms: description: >- Select a valid image for the application. Image should already be prepared and registered in glance. + - name: assignFloatingIP + type: boolean + label: Assign Floating IP + description: >- + Select to true to assign floating IP automatically + initial: false + required: false - name: keyPair type: keypair label: Key Pair diff --git a/WordPress/package/Classes/WordPress.yaml b/WordPress/package/Classes/WordPress.yaml index 63e3c0e0..75612f82 100644 --- a/WordPress/package/Classes/WordPress.yaml +++ b/WordPress/package/Classes/WordPress.yaml @@ -22,8 +22,6 @@ Name: WordPress Extends: std:Application Properties: - name: - Contract: $.string().notNull() server: Contract: $.class(srv:ApacheHttpServer).notNull() database: diff --git a/WordPress/package/UI/ui.yaml b/WordPress/package/UI/ui.yaml index b2c00376..8e99c547 100644 --- a/WordPress/package/UI/ui.yaml +++ b/WordPress/package/UI/ui.yaml @@ -10,12 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.2 Application: ?: type: io.murano.apps.WordPress - name: $.appConfiguration.name database: $.appConfiguration.database server: $.appConfiguration.server monitoring: $.appConfiguration.zabbix @@ -32,13 +31,6 @@ Forms: description: Apache License, Version 2.0 hidden: true required: false - - name: name - type: string - label: Application Name - initial: 'WordPress' - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - name: database type: io.murano.databases.MySql label: Database Server diff --git a/ZabbixAgent/package/Classes/ZabbixAgent.yaml b/ZabbixAgent/package/Classes/ZabbixAgent.yaml index e4adc2dd..0d62a99a 100644 --- a/ZabbixAgent/package/Classes/ZabbixAgent.yaml +++ b/ZabbixAgent/package/Classes/ZabbixAgent.yaml @@ -22,8 +22,6 @@ Name: ZabbixAgent Extends: std:Application Properties: - name: - Contract: $.string().notNull() hostname: Contract: $.string().notNull() probe: diff --git a/ZabbixAgent/package/UI/ui.yaml b/ZabbixAgent/package/UI/ui.yaml index 96fab58a..e4603e28 100644 --- a/ZabbixAgent/package/UI/ui.yaml +++ b/ZabbixAgent/package/UI/ui.yaml @@ -10,12 +10,11 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2 +Version: 2.2 Application: ?: type: io.murano.apps.ZabbixAgent - name: $.appConfiguration.name hostname: $.appConfiguration.hostname server: $.appConfiguration.server probe: $.appConfiguration.probeMethod @@ -29,14 +28,6 @@ Forms: description: Apache License, Version 2.0 hidden: true required: false - - name: name - type: string - label: Application Name - initial: ZabbixAgent - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - - name: hostname type: string label: HostName diff --git a/ZabbixServer/package/Classes/ZabbixServer.yaml b/ZabbixServer/package/Classes/ZabbixServer.yaml index 82fb7208..28a04218 100644 --- a/ZabbixServer/package/Classes/ZabbixServer.yaml +++ b/ZabbixServer/package/Classes/ZabbixServer.yaml @@ -22,8 +22,6 @@ Name: ZabbixServer Extends: std:Application Properties: - name: - Contract: $.string().notNull() instance: Contract: $.class(res:Instance).notNull() database: diff --git a/ZabbixServer/package/UI/ui.yaml b/ZabbixServer/package/UI/ui.yaml index 35d12baf..f10e0b22 100644 --- a/ZabbixServer/package/UI/ui.yaml +++ b/ZabbixServer/package/UI/ui.yaml @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -Version: 2.1 +Version: 2.2 Templates: customJoinNet: @@ -22,7 +22,6 @@ Templates: Application: ?: type: io.murano.apps.ZabbixServer - name: $.appConfiguration.name database: $.dbConfiguration.database username: $.dbConfiguration.username password: $.dbConfiguration.password @@ -48,13 +47,6 @@ Forms: description: Apache License, Version 2.0 hidden: true required: false - - name: name - type: string - label: Application Name - initial: ZabbixServer - description: >- - Enter a desired name for the application. Just A-Z, a-z, 0-9, dash and - underline are allowed - name: assignFloatingIP type: boolean label: Assign Floating IP