This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 6d014fa network: de-associate IP address if enabling static nat fails
(#3836)
add 0f5b0e6 VM ingestion (#3606)
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/event/EventTypes.java | 2 +
api/src/main/java/com/cloud/vm/UserVmService.java | 4 +
.../main/java/com/cloud/vm/VmDetailConstants.java | 8 +
.../org/apache/cloudstack/api/ApiConstants.java | 19 +
.../admin/vm/ImportUnmanagedInstanceCmd.java | 300 +++++
.../ListUnmanagedInstancesCmd.java} | 109 +-
.../api/response/DomainRouterResponse.java | 4 +
.../cloudstack/api/response/NicResponse.java | 69 +-
.../response/UnmanagedInstanceDiskResponse.java | 159 +++
.../api/response/UnmanagedInstanceResponse.java | 190 +++
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 353 ++++++
.../org/apache/cloudstack/vm/VmImportService.java | 18 +-
.../agent/api/GetUnmanagedInstancesAnswer.java | 58 +
.../agent/api/GetUnmanagedInstancesCommand.java | 73 ++
debian/cloudstack-common.install | 1 +
.../service/NetworkOrchestrationService.java | 3 +
.../service/VolumeOrchestrationService.java | 22 +
.../engine/orchestration/NetworkOrchestrator.java | 65 ++
.../engine/orchestration/VolumeOrchestrator.java | 58 +-
.../com/cloud/service/dao/ServiceOfferingDao.java | 2 +-
.../cloud/service/dao/ServiceOfferingDaoImpl.java | 6 +-
.../main/java/com/cloud/storage/VMTemplateVO.java | 7 +
.../cloud/storage/dao/GuestOSHypervisorDao.java | 2 +
.../storage/dao/GuestOSHypervisorDaoImpl.java | 26 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 2 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 7 +
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 2 +
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 14 +
.../hypervisor/vmware/resource/VmwareResource.java | 803 +++++++++----
scripts/vm/hypervisor/vmware/discover_networks.py | 288 +++++
.../com/cloud/server/ManagementServerImpl.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 140 ++-
.../apache/cloudstack/vm/VmImportManagerImpl.java | 1216 ++++++++++++++++++++
.../spring-server-compute-context.xml | 2 +
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 5 +
.../cloudstack/vm/VmImportManagerImplTest.java | 351 ++++++
tools/apidoc/gen_toc.py | 1 +
.../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 13 +
.../vmware/mo/DistributedVirtualSwitchMO.java | 28 +-
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 12 +
.../hypervisor/vmware/mo/VmwareHypervisorHost.java | 4 +
41 files changed, 4084 insertions(+), 364 deletions(-)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/{ha/EnableHAForClusterCmd.java
=> vm/ListUnmanagedInstancesCmd.java} (55%)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceDiskResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/response/UnmanagedInstanceResponse.java
create mode 100644
api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java
copy
plugins/storage/volume/cloudbyte/src/main/java/org/apache/cloudstack/storage/datastore/util/ElastistorVolumeApiService.java
=> api/src/main/java/org/apache/cloudstack/vm/VmImportService.java (62%)
create mode 100644
core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesAnswer.java
create mode 100644
core/src/main/java/com/cloud/agent/api/GetUnmanagedInstancesCommand.java
create mode 100755 scripts/vm/hypervisor/vmware/discover_networks.py
create mode 100644
server/src/main/java/org/apache/cloudstack/vm/VmImportManagerImpl.java
create mode 100644
server/src/test/java/org/apache/cloudstack/vm/VmImportManagerImplTest.java
