From 06f3d90d4119f1b2e13e834ffdcff4a010444101 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Thu, 19 Aug 2021 17:10:17 +0530 Subject: [PATCH 1/2] ui: Update placeholders for adding new tier (#5326) * ui: Update placeholders for adding new tier * Fix VpcTiersTab * Removing icon style and colon --- ui/public/locales/en.json | 11 +++-- ui/src/views/network/VpcTiersTab.vue | 62 ++++++++++++++++++++++------ 2 files changed, 57 insertions(+), 16 deletions(-) diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index 2b991fd15fb..25ca38eac78 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -333,7 +333,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", @@ -617,8 +617,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", @@ -628,6 +626,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.vpn.connection": "Create VPN Connection", "label.created": "Created", @@ -2163,7 +2167,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", diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue index f64bd0d5ff8..f53f73609d3 100644 --- a/ui/src/views/network/VpcTiersTab.vue +++ b/ui/src/views/network/VpcTiersTab.vue @@ -22,7 +22,7 @@ icon="plus" style="width: 100%;margin-bottom: 20px;" :disabled="!('createNetwork' in $store.getters.apis)" - @click="handleOpenModal">{{ $t('label.add.network') }} + @click="handleOpenModal">{{ $t('label.add.new.tier') }}
@@ -161,13 +161,25 @@ @ok="handleAddNetworkSubmit"> - + + + {{ $t('label.name') }} + + + + + :placeholder="$t('label.create.tier.name.description')" + v-decorator="['name', {rules: [{ required: true, message: `${$t('label.required')}` }]}]" + autoFocus /> - + + + {{ $t('label.networkofferingid') }} + + + + @@ -175,22 +187,48 @@ - + + + {{ $t('label.gateway') }} + + + + - + + + {{ $t('label.netmask') }} + + + + - + + + {{ $t('label.externalid') }} + + + + - + + + {{ $t('label.aclid') }} + + + + From 7fa63b3fe93b594d9a1b67794c3c8fcdef870631 Mon Sep 17 00:00:00 2001 From: Wei Zhou <57355700+weizhouapache@users.noreply.github.com> Date: Thu, 19 Aug 2021 14:11:34 +0200 Subject: [PATCH 2/2] add license header in HostMetricsResponseTest.java (#5342) --- .../response/HostMetricsResponseTest.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/plugins/metrics/src/test/java/org/apache/cloudstack/response/HostMetricsResponseTest.java b/plugins/metrics/src/test/java/org/apache/cloudstack/response/HostMetricsResponseTest.java index 4e6f35ab6e6..6955ec61c34 100644 --- a/plugins/metrics/src/test/java/org/apache/cloudstack/response/HostMetricsResponseTest.java +++ b/plugins/metrics/src/test/java/org/apache/cloudstack/response/HostMetricsResponseTest.java @@ -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;