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/13 08:01:06 UTC

[cloudstack] branch healthcheck-main updated (c6fd85e2ec6 -> 47b256e5dbd)

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

dahn pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard c6fd85e2ec6 healthcheck hack, please don't merge this
     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 df96af3de47 delete F5 and SRX plugins (#7023)
     add a85973a0cab ssvm: synchorise when adding iptables and routing rules (#6942)
     add 00426ede465 Add `pre-commit` workflow with 3 Git hooks (#6273)
     add c2350f96755 update owasp dep checker for 'column width bug' (#7068)
     add d33d84fa0fb server/UI: fix some issues with network offering details (#7057)
     add c1b17d2c42b Merge remote-tracking branch 'apache/4.17'
     add 08d54da938c tests: assess prerequisite before doing the actual test (#7040)
     add 44185744780 simulator: use ubuntu 22.04 in Dockerfile (#6978)
     add aad03530af9 Search for resource type efficiently (#6242)
     add c0a32d00b73 Use Super-Linter Slim Image (#6610)
     add 1dd064c8a9f server: fix cannot update vm if it uses unconstraint dynamic offering (#7077)
     add 4d80ea68465 UI: fix diskofferingstrictness is not passed when create compute offering (#7072)
     add e5158b29ee9 vmware: encode disk path for URL based access (#6989)
     add 0c925be44d7 merge LTS 4.17 in main
     add f9117df0b5b server: allow expunging VMs in Expunging state (#7086)
     add 3ea2f1dc9fd updates roles read-only (#7080)
     add 4bb43f7879d UI: do not show FW/LB/PF tabs for CKS cluster in advanced network with SG (#7076)
     add 566578297b6 Merge release branch 4.17 to main
     add 47b256e5dbd healthcheck hack, please don't merge this

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c6fd85e2ec6)
            \
             N -- N -- N   refs/heads/healthcheck-main (47b256e5dbd)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .github/workflows/linter.yml                       |   24 +-
 .../module.properties => .pre-commit-config.yaml   |   28 +-
 .../cloud/configuration/ConfigurationService.java  |    3 +
 .../main/java/com/cloud/server/ResourceTag.java    |   15 +
 .../java/org/apache/cloudstack/api/BaseCmd.java    |    2 +-
 ...UploadTemplateDirectDownloadCertificateCmd.java |    0
 ...AccountAllowedToCreateOfferingsWithTagsCmd.java |   56 +
 .../admin/offering/UpdateDiskOfferingCmd.java      |    2 -
 .../admin/offering/UpdateServiceOfferingCmd.java   |    3 -
 .../api/command/user/job/ListAsyncJobsCmd.java     |    2 +-
 ...ntAllowedToCreateOfferingsWithTagsResponse.java |   68 +-
 client/pom.xml                                     |   20 +-
 .../java/com/cloud/service/ServiceOfferingVO.java  |    2 +-
 .../resources/META-INF/db/schema-41720to41800.sql  |   38 +
 .../src/test/java/com/cloud/host/HostVOTest.java   |  122 +-
 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}         |   53 +-
 .../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        |    4 +-
 .../networker/spring-backup-networker-context.xml} |   21 +-
 .../backup/networker/NetworkerClientTest.java      |  732 ++++
 .../cloud/baremetal/database/BaremetalRctDao.java  |   52 +-
 .../baremetal/database/BaremetalRctDaoImpl.java    |   52 +-
 .../cloud/baremetal/database/BaremetalRctVO.java   |  164 +-
 .../com/cloud/baremetal/manager/BaremetalRct.java  |  250 +-
 .../baremetal/manager/BaremetalVlanManager.java    |   86 +-
 .../manager/BaremetalVlanManagerImpl.java          |  544 +--
 .../networkservice/BaremetalRctResponse.java       |  110 +-
 .../networkservice/BaremetalSwitchBackend.java     |   68 +-
 .../BaremetalVirtualRouterCommands.java            |  244 +-
 .../networkservice/BaremetalVlanStruct.java        |  184 +-
 .../Force10BaremetalSwitchBackend.java             |  332 +-
 .../security_group_agent/cs_sg_agent.py            |  472 +--
 .../security_group_agent/xmlobject.py              |  194 +-
 plugins/network-elements/f5/pom.xml                |   41 -
 .../api/commands/AddExternalLoadBalancerCmd.java   |  118 -
 .../cloud/api/commands/AddF5LoadBalancerCmd.java   |  143 -
 .../api/commands/ConfigureF5LoadBalancerCmd.java   |  124 -
 .../commands/DeleteExternalLoadBalancerCmd.java    |   96 -
 .../api/commands/DeleteF5LoadBalancerCmd.java      |  112 -
 .../api/commands/ListExternalLoadBalancersCmd.java |   90 -
 .../commands/ListF5LoadBalancerNetworksCmd.java    |  108 -
 .../cloud/api/commands/ListF5LoadBalancersCmd.java |  112 -
 .../cloud/api/response/F5LoadBalancerResponse.java |  109 -
 .../element/F5ExternalLoadBalancerElement.java     |  538 ---
 .../F5ExternalLoadBalancerElementService.java      |   97 -
 .../cloud/network/resource/F5BigIpResource.java    | 1176 ------
 plugins/network-elements/juniper-srx/pom.xml       |   37 -
 .../cloud/api/commands/AddExternalFirewallCmd.java |  110 -
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |  135 -
 .../api/commands/ConfigureSrxFirewallCmd.java      |  117 -
 .../api/commands/DeleteExternalFirewallCmd.java    |   84 -
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |  105 -
 .../api/commands/ListExternalFirewallsCmd.java     |   83 -
 .../api/commands/ListSrxFirewallNetworksCmd.java   |  102 -
 .../cloud/api/commands/ListSrxFirewallsCmd.java    |  109 -
 .../cloud/api/response/SrxFirewallResponse.java    |  159 -
 .../element/JuniperSRXExternalFirewallElement.java |  551 ---
 .../element/JuniperSRXFirewallElementService.java  |   95 -
 .../cloud/network/resource/JuniperSrxResource.java | 3795 --------------------
 .../META-INF/cloudstack/srx/spring-srx-context.xml |   35 -
 plugins/pom.xml                                    |   12 +-
 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 +-
 pom.xml                                            |    2 +-
 scripts/vm/hypervisor/kvm/nsrkvmbackup.sh          |  260 ++
 scripts/vm/hypervisor/kvm/nsrkvmrestore.sh         |  223 ++
 .../main/java/com/cloud/api/ApiResponseHelper.java |    2 +-
 .../com/cloud/api/dispatch/ParamProcessWorker.java |   57 +-
 .../configuration/ConfigurationManagerImpl.java    |   39 +-
 .../main/java/com/cloud/hypervisor/KVMGuru.java    |  127 +-
 .../network/ExternalFirewallDeviceManager.java     |    2 +-
 .../com/cloud/server/ManagementServerImpl.java     |    2 +
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   17 +-
 .../com/cloud/tags/ResourceManagerUtilImpl.java    |   10 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |    2 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    6 +
 .../resource/NfsSecondaryStorageResource.java      |    8 +-
 test/integration/component/test_host.py            |  400 +--
 .../component/test_multi_tag_support.py            |  434 +--
 .../component/test_ncc_integration_dedicated.py    |  538 +--
 .../component/test_ncc_integration_shared.py       |  646 ++--
 test/integration/component/test_tags.py            |   68 +-
 .../plugins/storpool/MigrateVolumeToStorPool.py    |    7 +
 test/integration/plugins/storpool/sp_util.py       |   31 +
 test/metadata/func/srxstresswithportfwd.xml        |  595 ---
 tools/docker/Dockerfile                            |    6 +-
 tools/marvin/marvin/configGenerator.py             |   33 +-
 tools/marvin/marvin/lib/base.py                    |    5 +-
 ui/public/config.json                              |    2 +-
 ui/public/locales/en.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/compute/KubernetesServiceTab.vue      |    2 +-
 ui/src/views/infra/network/ServiceProvidersTab.vue |   59 -
 .../infra/network/providers/AddSrxFirewall.vue     |  381 --
 .../infra/network/providers/ProviderListView.vue   |    9 -
 ui/src/views/network/LoadBalancing.vue             |    2 +-
 ui/src/views/offering/AddComputeOffering.vue       |   26 +-
 ui/src/views/offering/AddDiskOffering.vue          |   23 +-
 ui/src/views/offering/AddNetworkOffering.vue       |    4 +-
 ui/src/views/offering/AddVpcOffering.vue           |   52 +
 ui/src/views/storage/FormSchedule.vue              |    3 +-
 .../hypervisor/vmware/util/VmwareContext.java      |   52 +-
 132 files changed, 8283 insertions(+), 12407 deletions(-)
 rename plugins/network-elements/juniper-srx/src/main/resources/META-INF/cloudstack/srx/module.properties => .pre-commit-config.yaml (51%)
 mode change 100755 => 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/offering/IsAccountAllowedToCreateOfferingsWithTagsCmd.java
 copy plugins/hypervisors/baremetal/src/main/java/com/cloud/baremetal/networkservice/BaremetalSwitchBackend.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 plugins/{hypervisors/baremetal/src/main/java/com/cloud/baremetal/database/BaremetalRctDao.java => backup/networker/src/main/java/org/apache/cloudstack/backup/networker/NetworkerObject.java} (77%)
 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
 rename plugins/{network-elements/f5/src/main/resources/META-INF/cloudstack/f5 => backup/networker/src/main/resources/META-INF/cloudstack/networker}/module.properties (96%)
 rename plugins/{network-elements/f5/src/main/resources/META-INF/cloudstack/f5/spring-f5-context.xml => backup/networker/src/main/resources/META-INF/cloudstack/networker/spring-backup-networker-context.xml} (57%)
 create mode 100644 plugins/backup/networker/src/test/java/org/apache/backup/networker/NetworkerClientTest.java
 delete mode 100644 plugins/network-elements/f5/pom.xml
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/AddExternalLoadBalancerCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/AddF5LoadBalancerCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListExternalLoadBalancersCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListF5LoadBalancersCmd.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/response/F5LoadBalancerResponse.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/network/element/F5ExternalLoadBalancerElement.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/network/element/F5ExternalLoadBalancerElementService.java
 delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/network/resource/F5BigIpResource.java
 delete mode 100644 plugins/network-elements/juniper-srx/pom.xml
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddExternalFirewallCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddSrxFirewallCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ConfigureSrxFirewallCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteExternalFirewallCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteSrxFirewallCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListExternalFirewallsCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallsCmd.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/response/SrxFirewallResponse.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/element/JuniperSRXFirewallElementService.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/resource/JuniperSrxResource.java
 delete mode 100644 plugins/network-elements/juniper-srx/src/main/resources/META-INF/cloudstack/srx/spring-srx-context.xml
 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
 delete mode 100644 test/metadata/func/srxstresswithportfwd.xml
 delete mode 100644 ui/src/views/infra/network/providers/AddSrxFirewall.vue