Utilize Custom Network selector in Apache App

A new control allowing to select existing networks for the instance to
join has been implemented in Ie256c36523c67f27e4cb0b7c9aeed76b2abd28af

This patch modifies Apache HTTP Server application to utilize this
control. It adds it to the "configure instance" dialog step of the
wizard and passes the values returned from the control to the 'networks'
section of instance object in the generated Object Model.

Note, that this also bumps the "Version" of the used UI definition
notaion to 2.1, so this app becomes incompatible with pre-Liberty Murano
releases and with the Murano built from Liberty master prior the landing
of Ie256c36523c67f27e4cb0b7c9aeed76b2abd28af.

Depends-On: Ie256c36523c67f27e4cb0b7c9aeed76b2abd28af

Change-Id: I98ec3ce1992cc6ddbabd3f9ea79891dc952c51a6
This commit is contained in:
Alexander Tivelkov 2015-07-14 19:34:27 +03:00
parent 6e4289166a
commit 9d97a773d4
1 changed files with 18 additions and 1 deletions

View File

@ -10,7 +10,14 @@
# License for the specific language governing permissions and limitations
# under the License.
Version: 2
Version: 2.1
Templates:
customJoinNet:
- ?:
type: io.murano.resources.ExistingNeutronNetwork
internalNetworkName: $.instanceConfiguration.network[0]
internalSubnetworkName: $.instanceConfiguration.network[1]
Application:
?:
@ -26,6 +33,10 @@ Application:
keyname: $.instanceConfiguration.keyPair
availabilityZone: $.instanceConfiguration.availabilityZone
assignFloatingIp: $.appConfiguration.assignFloatingIP
networks:
useEnvironmentNetwork: $.instanceConfiguration.network[0]=null
useFlatNetwork: false
customNetworks: switch($.instanceConfiguration.network[0], $=null=>list(), $!=null=>$customJoinNet)
Forms:
- appConfiguration:
@ -98,6 +109,12 @@ Forms:
label: Availability zone
description: Select availability zone where application would be installed.
required: false
- name: network
type: network
label: Network
description: Select a network to join. 'Auto' corresponds to a default environment's network.
required: false
murano_networks: translate
- name: unitNamingPattern
type: string
label: Instance Naming Pattern