This is an automated email from the ASF dual-hosted git repository.
Pearl1594 pushed a change to branch support-multi-vlan-guestnet
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from b4c18d655ec Fix NullPointerException in
LibvirtComputingResourceTest.testMigrateCommand
new 749b2b7f005 Fix DHCP databag merge clobbering a trunk nic's sibling
entry on shared VPC-tier VRs
new 0988acea429 Usage: Fix usage_network_offering row mismatches on nic
removal and default-nic swap
new fb2e91f41d5 Finish VM deploy/VNF UI, migration host-readiness, and
trunk-association rule/listing support
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/com/cloud/server/ManagementService.java | 7 +
.../admin/host/FindHostsForMigrationCmd.java | 7 +
.../admin/network/AssociateNetworkToNicCmd.java | 4 +-
.../admin/network/ChangeNicPrimaryNetworkCmd.java | 4 +-
.../network/DisassociateNetworkFromNicCmd.java | 4 +-
.../api/command/user/vm/BaseDeployVMCmd.java | 2 +-
.../api/response/HostForMigrationResponse.java | 8 +
.../cloud/agent/api/routing/DhcpEntryCommand.java | 12 ++
.../virtualnetwork/facade/DhcpEntryConfigItem.java | 2 +-
.../virtualnetwork/model/VmDhcpConfig.java | 16 +-
.../main/java/com/cloud/event/UsageEventUtils.java | 5 +-
.../engine/orchestration/NetworkOrchestrator.java | 15 ++
.../usage/dao/UsageNetworkOfferingDaoImpl.java | 9 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 7 +-
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 18 ++
.../java/com/cloud/api/query/QueryManagerImpl.java | 41 ++++
.../java/com/cloud/network/NetworkServiceImpl.java | 45 +++-
.../cloud/network/router/CommandSetupHelper.java | 42 +++-
.../com/cloud/server/ManagementServerImpl.java | 14 ++
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 6 +-
.../com/cloud/network/NetworkServiceImplTest.java | 38 ++++
systemvm/debian/opt/cloud/bin/cs_dhcp.py | 20 +-
ui/public/locales/en.json | 22 ++
ui/src/components/view/ListView.vue | 13 +-
ui/src/config/section/infra/hosts.js | 2 +-
ui/src/utils/multiNetworkNic.js | 89 ++++++++
ui/src/views/compute/DeployVM.vue | 76 +++++--
ui/src/views/compute/DeployVnfAppliance.vue | 37 +++-
ui/src/views/compute/MigrateWizard.vue | 5 +
.../views/compute/wizard/NetworkConfiguration.vue | 228 ++++++++++++++++++---
ui/src/views/compute/wizard/VnfNicsSelection.vue | 173 +++++++++++++++-
ui/src/views/infra/Resources.vue | 47 ++++-
ui/src/views/network/EnableStaticNat.vue | 51 ++---
ui/src/views/network/InternalLBAssignVmForm.vue | 34 +--
ui/src/views/network/LoadBalancing.vue | 38 ++--
ui/src/views/network/NicsTab.vue | 159 +++++++++++++-
ui/src/views/network/NicsTable.vue | 47 ++++-
ui/src/views/network/PortForwarding.vue | 43 ++--
38 files changed, 1230 insertions(+), 160 deletions(-)
create mode 100644 ui/src/utils/multiNetworkNic.js
