mirror of https://github.com/apache/cloudstack.git
Merge remote-tracking branch 'origin/4.15' into main
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav
commit
d23a9954e8
|
|
@ -1,3 +1,20 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.response;
|
||||
|
||||
import org.junit.Assert;
|
||||
|
|
|
|||
|
|
@ -346,7 +346,7 @@
|
|||
"label.add.new.netscaler": "Add new NetScaler",
|
||||
"label.add.new.pa": "Add new Palo Alto",
|
||||
"label.add.new.srx": "Add new SRX",
|
||||
"label.add.new.tier": "Add new tier",
|
||||
"label.add.new.tier": "Add New Tier",
|
||||
"label.add.nfs.secondary.staging.store": "Add NFS Secondary Staging Store",
|
||||
"label.add.niciranvp.device": "Add Nvp Controller",
|
||||
"label.add.note": "Add Note",
|
||||
|
|
@ -640,8 +640,6 @@
|
|||
"label.create.account": "Create Account",
|
||||
"label.create.backup": "Start Backup",
|
||||
"label.create.network": "Create New Network",
|
||||
"label.create.network.gateway.description": "The gateway of the tier in the super CIDR range and not overlapping the CIDR of any other tier in this VPC.",
|
||||
"label.create.network.netmask.description": "Netmask of the tier. For example, with VPC CIDR of 10.0.0.0/16 and network tier CIDR of 10.1.1.0/24, gateway is 10.1.1.1 and netmask is 255.255.255.0",
|
||||
"label.create.nfs.secondary.staging.storage": "Create NFS Secondary Staging Store",
|
||||
"label.create.nfs.secondary.staging.store": "Create NFS secondary staging store",
|
||||
"label.create.project": "Create project",
|
||||
|
|
@ -651,6 +649,12 @@
|
|||
"label.create.snapshot.for.volume": "Created snapshot for volume",
|
||||
"label.create.ssh.key.pair": "Create a SSH Key Pair",
|
||||
"label.create.template": "Create template",
|
||||
"label.create.tier.aclid.description": "The ACL associated with the Tier",
|
||||
"label.create.tier.externalid.description": "ID of the network in an external system",
|
||||
"label.create.tier.gateway.description": "Gateway of the tier in the super CIDR range, not overlapping the CIDR of other tier in this VPC.",
|
||||
"label.create.tier.name.description": "A unique name for the tier",
|
||||
"label.create.tier.netmask.description": "Netmask of the tier. For example 255.255.255.0",
|
||||
"label.create.tier.networkofferingid.description": "The network offering for the tier",
|
||||
"label.create.user": "Create user",
|
||||
"label.create.vpc.tier": "Create VPC tier",
|
||||
"label.create.vpn.connection": "Create VPN Connection",
|
||||
|
|
@ -2214,7 +2218,6 @@
|
|||
"label.unauthorized": "Unauthorized",
|
||||
"label.unavailable": "Unavailable",
|
||||
"label.unhealthy.threshold": "Unhealthy Threshold",
|
||||
"label.unique.name.tier": "A unique name of the tier",
|
||||
"label.unit": "Usage Unit",
|
||||
"label.unknown": "Unknown",
|
||||
"label.unlimited": "Unlimited",
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
icon="plus"
|
||||
style="width: 100%;margin-bottom: 20px;"
|
||||
:disabled="!('createNetwork' in $store.getters.apis)"
|
||||
@click="handleOpenModal">{{ $t('label.add.network') }}</a-button>
|
||||
@click="handleOpenModal">{{ $t('label.add.new.tier') }}</a-button>
|
||||
<a-list class="list">
|
||||
<a-list-item v-for="(network, idx) in networks" :key="idx" class="list__item">
|
||||
<div class="list__item-outer-container">
|
||||
|
|
@ -164,13 +164,25 @@
|
|||
v-ctrl-enter="handleAddNetworkSubmit">
|
||||
<a-spin :spinning="modalLoading">
|
||||
<a-form @submit.prevent="handleAddNetworkSubmit" :form="form">
|
||||
<a-form-item :label="$t('label.name')">
|
||||
<a-form-item :colon="false">
|
||||
<span slot="label">
|
||||
{{ $t('label.name') }}
|
||||
<a-tooltip placement="right" :title="$t('label.create.tier.name.description')">
|
||||
<a-icon type="info-circle" />
|
||||
</a-tooltip>
|
||||
</span>
|
||||
<a-input
|
||||
:placeholder="$t('label.unique.name.tier')"
|
||||
v-decorator="['name',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"
|
||||
autoFocus></a-input>
|
||||
:placeholder="$t('label.create.tier.name.description')"
|
||||
v-decorator="['name', {rules: [{ required: true, message: `${$t('label.required')}` }]}]"
|
||||
autoFocus />
|
||||
</a-form-item>
|
||||
<a-form-item :label="$t('label.networkofferingid')">
|
||||
<a-form-item :colon="false">
|
||||
<span slot="label">
|
||||
{{ $t('label.networkofferingid') }}
|
||||
<a-tooltip placement="right" :title="$t('label.create.tier.networkofferingid.description')">
|
||||
<a-icon type="info-circle" />
|
||||
</a-tooltip>
|
||||
</span>
|
||||
<a-select
|
||||
v-decorator="['networkOffering',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"
|
||||
@change="val => { this.handleNetworkOfferingChange(val) }">
|
||||
|
|
@ -187,22 +199,48 @@
|
|||
}]"
|
||||
:placeholder="this.$t('label.vlan')"/>
|
||||
</a-form-item>
|
||||
<a-form-item :label="$t('label.gateway')">
|
||||
<a-form-item :colon="false">
|
||||
<span slot="label">
|
||||
{{ $t('label.gateway') }}
|
||||
<a-tooltip placement="right" :title="$t('label.create.tier.gateway.description')">
|
||||
<a-icon type="info-circle" />
|
||||
</a-tooltip>
|
||||
</span>
|
||||
<a-input
|
||||
:placeholder="$t('label.create.network.gateway.description')"
|
||||
:placeholder="$t('label.create.tier.gateway.description')"
|
||||
v-decorator="['gateway',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"></a-input>
|
||||
</a-form-item>
|
||||
<a-form-item :label="$t('label.netmask')">
|
||||
<a-form-item :colon="false">
|
||||
<span slot="label">
|
||||
{{ $t('label.netmask') }}
|
||||
<a-tooltip placement="right" :title="$t('label.create.tier.netmask.description')">
|
||||
<a-icon type="info-circle" />
|
||||
</a-tooltip>
|
||||
</span>
|
||||
<a-input
|
||||
:placeholder="$t('label.create.network.netmask.description')"
|
||||
:placeholder="$t('label.create.tier.netmask.description')"
|
||||
v-decorator="['netmask',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"></a-input>
|
||||
</a-form-item>
|
||||
<a-form-item :label="$t('label.externalid')">
|
||||
<a-form-item :colon="false">
|
||||
<span slot="label">
|
||||
{{ $t('label.externalid') }}
|
||||
<a-tooltip placement="right" :title="$t('label.create.tier.externalid.description')">
|
||||
<a-icon type="info-circle" />
|
||||
</a-tooltip>
|
||||
</span>
|
||||
<a-input
|
||||
:placeholder=" $t('label.create.tier.externalid.description')"
|
||||
v-decorator="['externalId']"></a-input>
|
||||
</a-form-item>
|
||||
<a-form-item :label="$t('label.aclid')">
|
||||
<a-form-item :colon="false">
|
||||
<span slot="label">
|
||||
{{ $t('label.aclid') }}
|
||||
<a-tooltip placement="right" :title="$t('label.create.tier.aclid.description')">
|
||||
<a-icon type="info-circle" />
|
||||
</a-tooltip>
|
||||
</span>
|
||||
<a-select
|
||||
:placeholder="$t('label.create.tier.aclid.description')"
|
||||
v-decorator="['acl',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"
|
||||
@change="val => { this.handleNetworkAclChange(val) }">
|
||||
<a-select-option v-for="item in networkAclList" :key="item.id" :value="item.id">
|
||||
|
|
|
|||
Loading…
Reference in New Issue