This is an automated email from the ASF dual-hosted git repository. shwstppr pushed a commit to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 9fd410be36d5aa537999df3fd78804d4915318d8 Merge: 813d53d031a 9bd359a039a Author: Abhishek Kumar <[email protected]> AuthorDate: Fri Mar 1 17:34:27 2024 +0530 Merge remote-tracking branch 'apache/4.18' into 4.19 .github/workflows/build.yml | 2 +- .github/workflows/ci.yml | 2 +- .github/workflows/codecov.yml | 2 +- .github/workflows/main-sonar-check.yml | 2 +- .github/workflows/rat.yml | 2 +- .github/workflows/sonar-check.yml | 2 +- .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 12 +++++++++++- .../java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java | 10 +++++----- ui/public/locales/en.json | 2 +- ui/src/config/section/infra/phynetworks.js | 5 +++++ ui/src/views/infra/network/IpRangesTabPublic.vue | 6 ++++++ 11 files changed, 34 insertions(+), 13 deletions(-) diff --cc .github/workflows/build.yml index 1be892f4577,c90c37c1c61..dc2bd9db2bd --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@@ -30,10 -27,10 +30,10 @@@ jobs build: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' diff --cc .github/workflows/ci.yml index dd96fcfce4b,087e2575f73..63f1085d406 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@@ -194,23 -186,14 +194,23 @@@ jobs component/test_vpc_network component/test_vpc_offerings component/test_vpc_routers - component/test_vpn_users", - "component/test_vpc_network_lbrules" ] + component/test_vpn_users + component/test_vpc_network_lbrules", + "smoke/test_list_accounts + smoke/test_list_disk_offerings + smoke/test_list_domains + smoke/test_list_hosts + smoke/test_list_service_offerings + smoke/test_list_storage_pools + smoke/test_list_volumes"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' diff --cc .github/workflows/codecov.yml index 430d62df8de,fcbcf9b8bfc..f7b28fdeecc --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@@ -32,12 -32,10 +32,12 @@@ jobs name: codecov runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up JDK11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '11' diff --cc .github/workflows/rat.yml index 64fa4c3da0c,70b29eecd31..b8f83de8194 --- a/.github/workflows/rat.yml +++ b/.github/workflows/rat.yml @@@ -30,9 -27,9 +30,9 @@@ jobs build: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '11' distribution: 'adopt' diff --cc ui/src/views/infra/network/IpRangesTabPublic.vue index bfaf6605123,dc5589785ab..40a3140c35f --- a/ui/src/views/infra/network/IpRangesTabPublic.vue +++ b/ui/src/views/infra/network/IpRangesTabPublic.vue @@@ -34,60 -34,64 +34,66 @@@ :rowKey="record => record.id" :pagination="false" > - <template #gateway="{record}"> - {{ record.gateway || record.ip6gateway }} - </template> - <template #cidr="{record}"> - {{ record.cidr || record.ip6cidr }} - </template> - <template #startip="{record}"> - {{ record.startip || record.startipv6 }} - </template> - <template #endip="{record}"> - {{ record.endip || record.endipv6 }} - </template> - <template #account="{record}" v-if="!basicGuestNetwork"> - <a-button @click="() => handleOpenAccountModal(record)">{{ record.domain === undefined ? `${$t('label.system.ip.pool')}` : `[ ${record.domain}] ${record.account === undefined ? '' : record.account}` }}</a-button> - </template> - <template #actions="{record}"> - <div - class="actions" - style="text-align: right" > - <router-link :to="{ name: 'publicip', query: { vlanid: record.id }}" target="_blank"> + <template #bodyCell="{ column, record }"> + <template v-if="column.key === 'gateway'"> + {{ record.gateway || record.ip6gateway }} + </template> + <template v-if="column.key === 'cidr'"> + {{ record.cidr || record.ip6cidr }} + </template> + <template v-if="column.key === 'startip'"> + {{ record.startip || record.startipv6 }} + </template> + <template v-if="column.key === 'endip'"> + {{ record.endip || record.endipv6 }} + </template> + <template v-if="column.key === 'account' && !basicGuestNetwork"> + <a-button @click="() => handleOpenAccountModal(record)">{{ record.domain === undefined ? `${$t('label.system.ip.pool')}` : `[ ${record.domain}] ${record.account === undefined ? '' : record.account}` }}</a-button> + </template> + <template v-if="column.key === 'actions'"> + <div + class="actions" + style="text-align: right" > ++ <router-link :to="{ name: 'publicip', query: { vlanid: record.id }}" target="_blank"> ++ <tooltip-button ++ tooltipPlacement="bottom" ++ :tooltip="$t('label.view') + ' ' + $t('label.public.ip.addresses')" ++ icon="environment-outlined"/> ++ </router-link> <tooltip-button + v-if="!record.domain && !basicGuestNetwork && record.gateway && !record.ip6gateway" tooltipPlacement="bottom" - :tooltip="$t('label.view') + ' ' + $t('label.public.ip.addresses')" - icon="environment-outlined"/> - </router-link> - <tooltip-button - v-if="!record.domain && !basicGuestNetwork && record.gateway && !record.ip6gateway" - tooltipPlacement="bottom" - :tooltip="$t('label.add.account')" - icon="user-add-outlined" - @onClick="() => handleOpenAddAccountModal(record)" - :disabled="!('dedicatePublicIpRange' in $store.getters.apis)" /> - <tooltip-button - v-if="record.domain && !basicGuestNetwork" - tooltipPlacement="bottom" - :tooltip="$t('label.release.account')" - icon="user-delete-outlined" - type="primary" - :danger="true" - @onClick="() => handleRemoveAccount(record.id)" - :disabled="!('releasePublicIpRange' in $store.getters.apis)" /> - <tooltip-button - tooltipPlacement="bottom" - :tooltip="$t('label.update.ip.range')" - icon="edit-outlined" - type="primary" - :danger="true" - @onClick="() => handleUpdateIpRangeModal(record)" - :disabled="!('updateVlanIpRange' in $store.getters.apis)" /> - <tooltip-button - tooltipPlacement="bottom" - :tooltip="$t('label.remove.ip.range')" - icon="delete-outlined" - type="primary" - :danger="true" - @onClick="handleDeleteIpRange(record.id)" - :disabled="!('deleteVlanIpRange' in $store.getters.apis)" /> - </div> + :tooltip="$t('label.add.account')" + icon="user-add-outlined" + @onClick="() => handleOpenAddAccountModal(record)" + :disabled="!('dedicatePublicIpRange' in $store.getters.apis)" /> + <tooltip-button + v-if="record.domain && !basicGuestNetwork" + tooltipPlacement="bottom" + :tooltip="$t('label.release.account')" + icon="user-delete-outlined" + type="primary" + :danger="true" + @onClick="() => handleRemoveAccount(record.id)" + :disabled="!('releasePublicIpRange' in $store.getters.apis)" /> + <tooltip-button + tooltipPlacement="bottom" + :tooltip="$t('label.update.ip.range')" + icon="edit-outlined" + type="primary" + :danger="true" + @onClick="() => handleUpdateIpRangeModal(record)" + :disabled="!('updateVlanIpRange' in $store.getters.apis)" /> + <tooltip-button + tooltipPlacement="bottom" + :tooltip="$t('label.remove.ip.range')" + icon="delete-outlined" + type="primary" + :danger="true" + @onClick="handleDeleteIpRange(record.id)" + :disabled="!('deleteVlanIpRange' in $store.getters.apis)" /> + </div> + </template> </template> </a-table> <a-pagination
