Skip to content

Commit d23a995

Browse files
yadvryadvr
committed
Merge remote-tracking branch 'origin/4.15' into main
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2 parents c34a0c5 + 7fa63b3 commit d23a995

3 files changed

Lines changed: 74 additions & 16 deletions

File tree

‎plugins/metrics/src/test/java/org/apache/cloudstack/response/HostMetricsResponseTest.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
118
package org.apache.cloudstack.response;
219

320
import org.junit.Assert;

‎ui/public/locales/en.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
"label.add.new.netscaler": "Add new NetScaler",
347347
"label.add.new.pa": "Add new Palo Alto",
348348
"label.add.new.srx": "Add new SRX",
349-
"label.add.new.tier": "Add new tier",
349+
"label.add.new.tier": "Add New Tier",
350350
"label.add.nfs.secondary.staging.store": "Add NFS Secondary Staging Store",
351351
"label.add.niciranvp.device": "Add Nvp Controller",
352352
"label.add.note": "Add Note",
@@ -640,8 +640,6 @@
640640
"label.create.account": "Create Account",
641641
"label.create.backup": "Start Backup",
642642
"label.create.network": "Create New Network",
643-
"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.",
644-
"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",
645643
"label.create.nfs.secondary.staging.storage": "Create NFS Secondary Staging Store",
646644
"label.create.nfs.secondary.staging.store": "Create NFS secondary staging store",
647645
"label.create.project": "Create project",
@@ -651,6 +649,12 @@
651649
"label.create.snapshot.for.volume": "Created snapshot for volume",
652650
"label.create.ssh.key.pair": "Create a SSH Key Pair",
653651
"label.create.template": "Create template",
652+
"label.create.tier.aclid.description": "The ACL associated with the Tier",
653+
"label.create.tier.externalid.description": "ID of the network in an external system",
654+
"label.create.tier.gateway.description": "Gateway of the tier in the super CIDR range, not overlapping the CIDR of other tier in this VPC.",
655+
"label.create.tier.name.description": "A unique name for the tier",
656+
"label.create.tier.netmask.description": "Netmask of the tier. For example 255.255.255.0",
657+
"label.create.tier.networkofferingid.description": "The network offering for the tier",
654658
"label.create.user": "Create user",
655659
"label.create.vpc.tier": "Create VPC tier",
656660
"label.create.vpn.connection": "Create VPN Connection",
@@ -2214,7 +2218,6 @@
22142218
"label.unauthorized": "Unauthorized",
22152219
"label.unavailable": "Unavailable",
22162220
"label.unhealthy.threshold": "Unhealthy Threshold",
2217-
"label.unique.name.tier": "A unique name of the tier",
22182221
"label.unit": "Usage Unit",
22192222
"label.unknown": "Unknown",
22202223
"label.unlimited": "Unlimited",

‎ui/src/views/network/VpcTiersTab.vue‎

Lines changed: 50 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
icon="plus"
2323
style="width: 100%;margin-bottom: 20px;"
2424
:disabled="!('createNetwork' in $store.getters.apis)"
25-
@click="handleOpenModal">{{ $t('label.add.network') }}</a-button>
25+
@click="handleOpenModal">{{ $t('label.add.new.tier') }}</a-button>
2626
<a-list class="list">
2727
<a-list-item v-for="(network, idx) in networks" :key="idx" class="list__item">
2828
<div class="list__item-outer-container">
@@ -164,13 +164,25 @@
164164
v-ctrl-enter="handleAddNetworkSubmit">
165165
<a-spin :spinning="modalLoading">
166166
<a-form @submit.prevent="handleAddNetworkSubmit" :form="form">
167-
<a-form-item :label="$t('label.name')">
167+
<a-form-item :colon="false">
168+
<span slot="label">
169+
{{ $t('label.name') }}
170+
<a-tooltip placement="right" :title="$t('label.create.tier.name.description')">
171+
<a-icon type="info-circle" />
172+
</a-tooltip>
173+
</span>
168174
<a-input
169-
:placeholder="$t('label.unique.name.tier')"
170-
v-decorator="['name',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"
171-
autoFocus></a-input>
175+
:placeholder="$t('label.create.tier.name.description')"
176+
v-decorator="['name', {rules: [{ required: true, message: `${$t('label.required')}` }]}]"
177+
autoFocus />
172178
</a-form-item>
173-
<a-form-item :label="$t('label.networkofferingid')">
179+
<a-form-item :colon="false">
180+
<span slot="label">
181+
{{ $t('label.networkofferingid') }}
182+
<a-tooltip placement="right" :title="$t('label.create.tier.networkofferingid.description')">
183+
<a-icon type="info-circle" />
184+
</a-tooltip>
185+
</span>
174186
<a-select
175187
v-decorator="['networkOffering',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"
176188
@change="val => { this.handleNetworkOfferingChange(val) }">
@@ -187,22 +199,48 @@
187199
}]"
188200
:placeholder="this.$t('label.vlan')"/>
189201
</a-form-item>
190-
<a-form-item :label="$t('label.gateway')">
202+
<a-form-item :colon="false">
203+
<span slot="label">
204+
{{ $t('label.gateway') }}
205+
<a-tooltip placement="right" :title="$t('label.create.tier.gateway.description')">
206+
<a-icon type="info-circle" />
207+
</a-tooltip>
208+
</span>
191209
<a-input
192-
:placeholder="$t('label.create.network.gateway.description')"
210+
:placeholder="$t('label.create.tier.gateway.description')"
193211
v-decorator="['gateway',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"></a-input>
194212
</a-form-item>
195-
<a-form-item :label="$t('label.netmask')">
213+
<a-form-item :colon="false">
214+
<span slot="label">
215+
{{ $t('label.netmask') }}
216+
<a-tooltip placement="right" :title="$t('label.create.tier.netmask.description')">
217+
<a-icon type="info-circle" />
218+
</a-tooltip>
219+
</span>
196220
<a-input
197-
:placeholder="$t('label.create.network.netmask.description')"
221+
:placeholder="$t('label.create.tier.netmask.description')"
198222
v-decorator="['netmask',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"></a-input>
199223
</a-form-item>
200-
<a-form-item :label="$t('label.externalid')">
224+
<a-form-item :colon="false">
225+
<span slot="label">
226+
{{ $t('label.externalid') }}
227+
<a-tooltip placement="right" :title="$t('label.create.tier.externalid.description')">
228+
<a-icon type="info-circle" />
229+
</a-tooltip>
230+
</span>
201231
<a-input
232+
:placeholder=" $t('label.create.tier.externalid.description')"
202233
v-decorator="['externalId']"></a-input>
203234
</a-form-item>
204-
<a-form-item :label="$t('label.aclid')">
235+
<a-form-item :colon="false">
236+
<span slot="label">
237+
{{ $t('label.aclid') }}
238+
<a-tooltip placement="right" :title="$t('label.create.tier.aclid.description')">
239+
<a-icon type="info-circle" />
240+
</a-tooltip>
241+
</span>
205242
<a-select
243+
:placeholder="$t('label.create.tier.aclid.description')"
206244
v-decorator="['acl',{rules: [{ required: true, message: `${$t('label.required')}` }]}]"
207245
@change="val => { this.handleNetworkAclChange(val) }">
208246
<a-select-option v-for="item in networkAclList" :key="item.id" :value="item.id">

0 commit comments

Comments
 (0)