This is an automated email from the ASF dual-hosted git repository.
rafael pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 4c42aaf [CLOUDSTACK-10356] Fix NPE in Cloudstack found with
NPEDetector (#2573)
add b6d420b CLOUDSTACK-9677: Adding storage policy support for swift as
secondary storage (#2412)
add 8520324 ConfigDrive fixes: CLOUDSTACK-10288, CLOUDSTACK-10289 (#2566)
new b3c22df Forward merge branch '4.11' to master
The 1 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:
.../main/java/com/cloud/agent/api/to/SwiftTO.java | 9 +-
.../main/java/com/cloud/network/NetworkModel.java | 7 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 7 +-
.../resource/XenServerStorageProcessor.java | 115 +-
.../resource/XenServerStorageProcessorTest.java | 113 ++
.../driver/SwiftImageStoreDriverImpl.java | 2 +-
scripts/storage/secondary/swift | 21 +-
scripts/vm/hypervisor/xenserver/swift | 21 +-
.../java/com/cloud/network/NetworkModelImpl.java | 48 +-
.../network/element/ConfigDriveNetworkElement.java | 28 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 5 +-
.../com/cloud/network/MockNetworkModelImpl.java | 2 +-
.../element/ConfigDriveNetworkElementTest.java | 91 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 2 +-
.../resource/NfsSecondaryStorageResource.java | 17 +-
test/integration/component/test_configdrive.py | 1099 ++++++++++++--------
test/integration/plugins/nuagevsp/nuageTestCase.py | 11 +-
test/integration/plugins/nuagevsp/nuage_lib.py | 47 +
.../plugins/nuagevsp/test_nuage_configdrive.py | 649 ++----------
tools/marvin/marvin/jsonHelper.py | 6 +
ui/l10n/en.js | 1 +
ui/scripts/system.js | 29 +-
utils/src/main/java/com/cloud/utils/SwiftUtil.java | 187 ++--
.../test/java/com/cloud/utils/SwiftUtilTest.java | 150 ++-
25 files changed, 1485 insertions(+), 1183 deletions(-)
create mode 100644
plugins/hypervisors/xenserver/test/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessorTest.java
create mode 100644 test/integration/plugins/nuagevsp/nuage_lib.py
--
To stop receiving notification emails like this one, please contact
[email protected].
