You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2023/01/11 06:54:49 UTC

[cloudstack] branch tungsten-integration updated (00d9f3bdc67 -> c12608b9f46)

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

davidjumani pushed a change to branch tungsten-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    from 00d9f3bdc67 Fix lint checks
     add 6790371fe2d fix merge diff display (#7047)
     add eb5c8a5a8c9 server: correctly list suitable hosts for migration with uefi capability (#7024)
     add 2d1d2944e53 merge release branch 4.17 into main
     add 76ec980c76e ui: remove max value (8) of maxsnaps because it might be greater than 8 (#7066)
     add a3289f8ac0c Merge remote-tracking branch 'apache/4.17' into main
     add 9009dd1db88 Emc networker b&r (#6550)
     add cc527523fa7 Allow users to inform timezones on APIs that have the date parameter (#7032)
     add 602f22a0d37 UI: fix cannot list lb rules if cidr_list is NULL (#7058)
     add d2bb6a2510e UI: support serviceofferingid when create vpc offering (#7054)
     add dffbc87278f escapes for injection prtection (#7069)
     add 03674ce1742 Merge release branch 4.16 to 4.17
     add f3e05543ccc Merge release branch 4.17 to main
     add 9cfebdf6e56 Allow domain admins to inform tags when creating offerings (#7052)
     add b392084950d Enable live volume migration for StorPool and small fixes (#6661)
     add c12608b9f46 Merge branch 'main' of github.com:apache/cloudstack into tungsten-integration

No new revisions were added by this update.

Summary of changes:
 .../cloud/configuration/ConfigurationService.java  |   3 +
 .../java/org/apache/cloudstack/api/BaseCmd.java    |   2 +-
 ...AccountAllowedToCreateOfferingsWithTagsCmd.java |  56 ++
 .../admin/offering/UpdateDiskOfferingCmd.java      |   2 -
 .../admin/offering/UpdateServiceOfferingCmd.java   |   3 -
 .../api/command/user/job/ListAsyncJobsCmd.java     |   2 +-
 ...ntAllowedToCreateOfferingsWithTagsResponse.java |  22 +-
 client/pom.xml                                     |   5 +
 .../java/com/cloud/host/dao/HostDetailsDao.java    |   3 +
 .../com/cloud/host/dao/HostDetailsDaoImpl.java     |  13 +-
 .../resources/META-INF/db/schema-41720to41800.sql  |   5 +
 plugins/backup/networker/pom.xml                   |  54 ++
 .../cloudstack/backup/NetworkerBackupProvider.java | 639 ++++++++++++++++++
 .../backup/networker/NetworkerBackupOffering.java  |  76 +++
 .../backup/networker/NetworkerClient.java          | 351 ++++++++++
 .../backup/networker/NetworkerObject.java          |  23 +-
 .../cloudstack/backup/networker/api/Action.java    | 350 ++++++++++
 .../backup/networker/api/ActionSpecificData.java   | 107 +++
 .../cloudstack/backup/networker/api/Attribute.java |  92 +++
 .../backup/networker/api/BackupSpecificData.java   |  75 +++
 .../networker/api/CompletionNotification.java      |  91 +++
 .../cloudstack/backup/networker/api/Expire.java    |  47 ++
 .../cloudstack/backup/networker/api/Instance.java  | 124 ++++
 .../cloudstack/backup/networker/api/Link.java      |  91 +++
 .../backup/networker/api/NetworkerBackup.java      | 334 ++++++++++
 .../backup/networker/api/NetworkerBackups.java     |  92 +++
 .../backup/networker/api/ProtectionPolicies.java   |  92 +++
 .../backup/networker/api/ProtectionPolicy.java     | 175 +++++
 .../backup/networker/api/ResourceId.java           |  91 +++
 .../backup/networker/api/ServerBackup.java         | 140 ++++
 .../cloudstack/backup/networker/api/Size.java      |  90 +++
 .../backup/networker/api/SummaryNotification.java  |  91 +++
 .../backup/networker/api/Traditional.java          | 238 +++++++
 .../cloudstack/networker/module.properties         |  18 +
 .../networker/spring-backup-networker-context.xml  |  27 +
 .../backup/networker/NetworkerClientTest.java      | 732 +++++++++++++++++++++
 plugins/pom.xml                                    |   1 +
 plugins/storage/volume/storpool/pom.xml            |  10 +
 .../StorPoolDownloadTemplateCommandWrapper.java    |   5 +
 .../StorPoolModifyStorageCommandWrapper.java       |   4 +-
 .../kvm/storage/StorPoolStorageAdaptor.java        |  95 +--
 .../driver/StorPoolPrimaryDataStoreDriver.java     | 251 ++++---
 .../datastore/provider/StorPoolHostListener.java   |  39 +-
 .../storage/datastore/util/StorPoolUtil.java       |  71 +-
 .../snapshot/StorPoolVMSnapshotStrategy.java       |   2 +-
 .../driver/StorPoolPrimaryDataStoreDriverTest.java | 245 +++++++
 .../cloudstack/ldap/OpenLdapUserManagerImpl.java   |   6 +-
 scripts/vm/hypervisor/kvm/nsrkvmbackup.sh          | 260 ++++++++
 scripts/vm/hypervisor/kvm/nsrkvmrestore.sh         | 223 +++++++
 .../com/cloud/api/dispatch/ParamProcessWorker.java |  57 +-
 .../configuration/ConfigurationManagerImpl.java    |  30 +-
 .../main/java/com/cloud/hypervisor/KVMGuru.java    | 127 +++-
 .../com/cloud/server/ManagementServerImpl.java     | 432 ++++++------
 .../com/cloud/storage/VolumeApiServiceImpl.java    |  17 +-
 .../com/cloud/server/ManagementServerImplTest.java | 135 +++-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |   6 +
 .../plugins/storpool/MigrateVolumeToStorPool.py    |   7 +
 test/integration/plugins/storpool/sp_util.py       |  31 +
 tools/git/git-fwd-merge                            |   7 +-
 tools/marvin/marvin/lib/base.py                    |   5 +-
 ui/public/config.json                              |   2 +-
 ui/src/components/view/BulkActionProgress.vue      |   2 +-
 ui/src/components/view/BulkActionView.vue          |   2 +-
 ui/src/components/view/StatsTab.vue                |  41 +-
 ui/src/views/network/LoadBalancing.vue             |   2 +-
 ui/src/views/offering/AddComputeOffering.vue       |  24 +-
 ui/src/views/offering/AddDiskOffering.vue          |  23 +-
 ui/src/views/offering/AddVpcOffering.vue           |  52 ++
 ui/src/views/storage/FormSchedule.vue              |   3 +-
 69 files changed, 6023 insertions(+), 550 deletions(-)
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/offering/IsAccountAllowedToCreateOfferingsWithTagsCmd.java
 copy engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDao.java => api/src/main/java/org/apache/cloudstack/api/response/IsAccountAllowedToCreateOfferingsWithTagsResponse.java (58%)
 create mode 100644 plugins/backup/networker/pom.xml
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/NetworkerBackupProvider.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/NetworkerBackupOffering.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/NetworkerClient.java
 copy engine/schema/src/main/java/com/cloud/host/dao/HostDetailsDao.java => plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/NetworkerObject.java (67%)
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Action.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ActionSpecificData.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Attribute.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/BackupSpecificData.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/CompletionNotification.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Expire.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Instance.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Link.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/NetworkerBackup.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/NetworkerBackups.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ProtectionPolicies.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ProtectionPolicy.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ResourceId.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ServerBackup.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Size.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/SummaryNotification.java
 create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Traditional.java
 create mode 100644 plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/module.properties
 create mode 100644 plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/spring-backup-networker-context.xml
 create mode 100644 plugins/backup/networker/src/test/java/org/apache/backup/networker/NetworkerClientTest.java
 create mode 100644 plugins/storage/volume/storpool/src/test/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriverTest.java
 create mode 100755 scripts/vm/hypervisor/kvm/nsrkvmbackup.sh
 create mode 100755 scripts/vm/hypervisor/kvm/nsrkvmrestore.sh