You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2018/01/12 09:44:47 UTC

[cloudstack] branch master updated (7ca4582 -> b176648)

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 7ca4582  CLOUDSTACK-10188 - Resource Accounting for primary storage is Broken when Domains are in use (#2362)
     add b176648  CLOUDSTACK-9813: Extending Config Drive support (#2097)

No new revisions were added by this update.

Summary of changes:
 api/src/com/cloud/network/Network.java             |    2 +
 api/src/com/cloud/network/NetworkModel.java        |   24 +
 .../api/command/user/vm/DeployVMCmd.java           |    3 +-
 .../api/command/user/vm/UpdateVMCmd.java           |    3 +-
 .../src/com/cloud/agent/api/AttachIsoAnswer.java   |   43 +-
 core/src/com/cloud/agent/api/AttachIsoCommand.java |   26 +-
 ...mmand.java => HandleConfigDriveIsoCommand.java} |   44 +-
 .../api/agent/test/AttachIsoCommandTest.java       |   29 +-
 .../src/com/cloud/vm/VirtualMachineManager.java    |    2 +-
 .../kvm/resource/LibvirtComputingResource.java     |   28 +-
 .../kvm/resource/LibvirtDomainXMLParser.java       |    3 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   36 +-
 .../wrapper/LibvirtAttachIsoCommandWrapper.java    |   18 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  109 +-
 .../storage/resource/VmwareStorageProcessor.java   |    6 +-
 .../CitrixPrepareForMigrationCommandWrapper.java   |    2 +-
 .../com/cloud/network/element/NuageVspElement.java |   75 +-
 .../network/guru/NuageVspGuestNetworkGuru.java     |   41 +-
 .../cloud/network/manager/NuageVspManagerImpl.java |   22 +-
 .../cloud/network/resource/NuageVspResource.java   |    8 +-
 .../src/com/cloud/util/NuageVspEntityBuilder.java  |    3 +-
 .../cloud/network/element/NuageVspElementTest.java |    8 +
 .../network/guru/NuageVspGuestNetworkGuruTest.java |    2 +
 .../com/cloud/util/NuageVspEntityBuilderTest.java  |    2 +-
 .../spring-server-network-context.xml              |    4 +
 server/src/com/cloud/network/NetworkModelImpl.java |   25 +-
 .../src/com/cloud/network/NetworkServiceImpl.java  |   23 +-
 .../network/element/ConfigDriveNetworkElement.java |  424 ++++
 .../src/com/cloud/network/vpc/VpcManagerImpl.java  |    4 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java     |   11 +
 .../element/ConfigDriveNetworkElementTest.java     |  272 +++
 server/test/com/cloud/vm/UserVmManagerTest.java    |   30 +-
 .../resource/NfsSecondaryStorageResource.java      |  459 +++-
 setup/bindir/cloud-get-vm-data-configdrive.in      |    2 +-
 .../bindir/cloud-set-guest-password-configdrive.in |    2 +-
 setup/bindir/cloud-set-guest-sshkey-configdrive.in |    2 +-
 ...d-set-windows-guest-password-configdrive.bat.in |    2 +-
 test/integration/component/test_configdrive.py     | 1947 +++++++++++++++++
 .../integration/component/test_dhcp_dns_offload.py |   16 +-
 test/integration/plugins/nuagevsp/nuageTestCase.py |   66 +-
 .../plugins/nuagevsp/test_nuage_configdrive.py     | 2278 ++++++++++++++++++++
 .../plugins/nuagevsp/test_nuage_static_nat.py      |   41 +-
 tools/marvin/marvin/config/test_data.py            |   57 +-
 ui/scripts/configuration.js                        |    2 +-
 ui/scripts/system.js                               |  122 ++
 .../hypervisor/vmware/mo/VirtualMachineMO.java     |   60 +-
 46 files changed, 6043 insertions(+), 345 deletions(-)
 copy plugins/network-elements/bigswitch/src/com/cloud/agent/api/GetControllerDataAnswer.java => core/src/com/cloud/agent/api/AttachIsoAnswer.java (53%)
 copy core/src/com/cloud/agent/api/{AttachOrDettachConfigDriveCommand.java => HandleConfigDriveIsoCommand.java} (59%)
 create mode 100644 server/src/com/cloud/network/element/ConfigDriveNetworkElement.java
 create mode 100644 server/test/com/cloud/network/element/ConfigDriveNetworkElementTest.java
 create mode 100644 test/integration/component/test_configdrive.py
 create mode 100644 test/integration/plugins/nuagevsp/test_nuage_configdrive.py

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].