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

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


    omit 423a0fee03 added comments to marvin test cases
    omit 0195b4d622 Fix marvin test case
    omit 684ba3a68f Fix custom userdata params for config drive by adding 
userdata file name and value metadata json
    omit c1a7cd356c remove delete cascade on user_vm and vm_template tables for 
userdata id foreign key reference.
    omit 4806b905e2 Added length to userdata param
    omit 96e606fb3e Removed required param for iso id in linkuserdatatotemplate 
cmd
    omit 559494edea Added validation to userdata params so that it wont contain 
any VR metadafile names
    omit b44ccf67b3 Added ISO id to the linkuserdatatotemplate API
    omit 1909c348f0 Added blank values for userdata in edit template form
    omit 47770e52f2 Added resetVMUserdata in UI for stopped VM
    omit 7b25234963 Added new UnitTests for resetVMUserData
    omit 63bb904e9a Added new API to reset UserData of a VM along with UpdateVM 
API
    omit 17d8fd893a Add comments section to userdata
    omit be7d7f6f89 Added userdata selection in deploy VM form for ISOs
    omit 27a04e1aca Added userdata details to register and upload iso forms
    omit 8cecb94aef Few more code fixes
    omit 30d9322e27 Few code fixes
    omit d24cd86e76 Added few more marvin tests for userdata
    omit 37a43c007f Fixed marvin tests for registerd userdata
    omit 5c0adda532 Adding marvin tests for userdata
    omit 7386992d60 Few improvements in the code
    omit 2290ae1129 Fix Userdata delete flow
    omit be8201ea45 Fix unused imports
    omit f597b65e7b Move test file to proper files
    omit 5aa92271af Remove unused imports
    omit 916e5c743a Added unit tests for linking userdata to template
    omit de4bbc6046 Added unit tests for userdata
    omit 7874f91b8f fixes in deploy VM form to support deny userdata policy
    omit eabfebb040 Few UI fixes in deploy VM and edit template form
    omit 550770fc99 update userdata linking to template
    omit e9abe4bc49 Allow override append of userdata in deploy VM flow
    omit 0adeb8c65b added userdata policy list to register template form
    omit 4735ba88cf Added ToolTips and fixes deploy VM, register userdata form
    omit f9ed36c719 Added userdata denyoverride flag and userdata params section
    omit cde176acd3 Userdata Navigation in template view
    omit 701b91c996 Fixed unit tests and imports
    omit 7eb0ef7127 Small fixes and added userdata to updateVM flow
    omit bb2776afc5 Added userdata params to registeruserdata UI form
    omit e94ca8c723 Added userdata list to deploy VM form
    omit d194b3e444 UI: added userdata id to deloyvm wizard
    omit 43b79b0c10 Updated template response and views
    omit 6435c4f02f Write userdata details into metadata VR
    omit ecaf032c89 Added userdata details to the deployVM cmd flow
    omit 8a69c09385 UI: added a new section for userdata
    omit 877feb7459 Fixed userdata append scenario between template userdata 
and user provided userdata
    omit f4bee3d47c Added userdata id in deploy VM flow
    omit 0839bd5b73 Few fixes
    omit 8ee904eb93 UserData as first clas resource
     add c56220fcf2 Updating pom.xml version numbers for release 4.17.0.0
     add 038a669d6b Updating pom.xml version numbers for release 
4.17.1.0-SNAPSHOT
     add 7ed8d54db2 Fix version numbers
     add 0bcc609f05 Updating pom.xml version numbers for release 
4.18.0.0-SNAPSHOT
     add 8333e8fbd7 Fix upgrade version on files
     add 9b50e417f7 Add upgrade path for 4.17.1
     add 2aca780011 Merge branch '4.17'
     add 1feef50b5a Add upgrade path for 4.18.0
     add 559e275d76 Fix upgrade schema cleanup
     add cb7cbeca25 Fix deploy from ISO with custom disk offering (#6441)
     add 78a1602eb9 fixes error when creating volume from the snapshot (#6443)
     add 7526c5fc08 Merge branch '4.17'
     add 885e749333 fixes the added storage tags issues on adding primary 
storage (#6438)
     add 22c48363a1 hide project delete button while in this project view 
(#6439)
     add e20a57dc13 Merge branch '4.17'
     add d45d257b9a UI: fix create vpc private gw by regular users (#6445)
     add aae0fae950 UI: Fix hypervisor not selected by default when deploying 
VM from ISO (#6436)
     add 64262d943f Merge branch '4.17'
     add a84664fc9d Specify vm snapshot uuid in response over db id in the 
async job response (#6449)
     add 90a0ee0b6c fix pseudo random behaviour in pool selection (#6307)
     add bfe1697721 some  component tests fixes (#5442)
     add 84eed6db72 Merge branch '4.17'
     add 78d76e1781 UserData as first clas resource
     add 88317725f0 Few fixes
     add 5a7f2c5fa0 Added userdata id in deploy VM flow
     add 9f000e5341 Fixed userdata append scenario between template userdata 
and user provided userdata
     add 57b41e2f85 UI: added a new section for userdata
     add 636953c603 Added userdata details to the deployVM cmd flow
     add d75dd6963c Write userdata details into metadata VR
     add 4a41d63eb4 Updated template response and views
     add d0a1527cd8 UI: added userdata id to deloyvm wizard
     add a28ad74652 Added userdata list to deploy VM form
     add 71bc4a87f3 Added userdata params to registeruserdata UI form
     add e0b5892d47 Small fixes and added userdata to updateVM flow
     add 772815da8d Fixed unit tests and imports
     add 6e6b73bea4 Userdata Navigation in template view
     add c79b40712e Added userdata denyoverride flag and userdata params section
     add 936f5b27af Added ToolTips and fixes deploy VM, register userdata form
     add c0e6c1b6d9 added userdata policy list to register template form
     add 4462ce332d Allow override append of userdata in deploy VM flow
     add 219ce8e4b8 update userdata linking to template
     add 41d342387b Few UI fixes in deploy VM and edit template form
     add 5abb09792e fixes in deploy VM form to support deny userdata policy
     add f8dc739a84 Added unit tests for userdata
     add d2f5622bb4 Added unit tests for linking userdata to template
     add a98ad3d0c4 Remove unused imports
     add 024a8a6501 Move test file to proper files
     add f4aa9c7e2a Fix unused imports
     add efa8413080 Fix Userdata delete flow
     add ca5652e131 Few improvements in the code
     add 48f8028fd6 Adding marvin tests for userdata
     add cc9eb6dd4b Fixed marvin tests for registerd userdata
     add 5c0c3e8472 Added few more marvin tests for userdata
     add d9bf8e60bb Few code fixes
     add af0e061ab6 Few more code fixes
     add 8c52832867 Added userdata details to register and upload iso forms
     add f38bb87254 Added userdata selection in deploy VM form for ISOs
     add 2cf4c72487 Add comments section to userdata
     add 3842a5143b Added new API to reset UserData of a VM along with UpdateVM 
API
     add 8df8ed77ce Added new UnitTests for resetVMUserData
     add 4adb268850 Added resetVMUserdata in UI for stopped VM
     add 6d35227cdd Added blank values for userdata in edit template form
     add c68e954611 Added ISO id to the linkuserdatatotemplate API
     add 85ade350ab Added validation to userdata params so that it wont contain 
any VR metadafile names
     add 839187bd1d Removed required param for iso id in linkuserdatatotemplate 
cmd
     add 37f64e89f3 Added length to userdata param
     add 950f24dfd3 remove delete cascade on user_vm and vm_template tables for 
userdata id foreign key reference.
     add 80837af5bf Fix custom userdata params for config drive by adding 
userdata file name and value metadata json
     add 5b8f6e905f Fix marvin test case
     add a9f2115a8a added comments to marvin test cases
     add 64fd08b222 Fix document link in UI

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   (423a0fee03)
            \
             N -- N -- N   refs/heads/UserDataAsFirstClassResource (64fd08b222)

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:
 agent/pom.xml                                      |   2 +-
 api/pom.xml                                        |   2 +-
 .../api/command/user/network/CreateNetworkCmd.java |   3 +-
 .../user/vmsnapshot/CreateVMSnapshotCmd.java       |   1 +
 client/pom.xml                                     |   2 +-
 core/pom.xml                                       |   2 +-
 debian/changelog                                   |  12 +
 developer/pom.xml                                  |   2 +-
 engine/api/pom.xml                                 |   2 +-
 engine/components-api/pom.xml                      |   2 +-
 .../main/java/com/cloud/storage/StorageUtil.java   |  14 +
 engine/network/pom.xml                             |   2 +-
 engine/orchestration/pom.xml                       |   2 +-
 .../engine/orchestration/VolumeOrchestrator.java   |  40 +--
 engine/pom.xml                                     |   2 +-
 engine/schema/pom.xml                              |   2 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |   4 +
 .../com/cloud/upgrade/dao/Upgrade41610to41700.java |   2 +-
 ...e41600to41610.java => Upgrade41700to41710.java} |  24 +-
 ...e41600to41610.java => Upgrade41710to41800.java} |  24 +-
 ...cleanup.sql => schema-41700to41710-cleanup.sql} |   2 +-
 ...21to430-cleanup.sql => schema-41700to41710.sql} |   5 +-
 ...cleanup.sql => schema-41710to41800-cleanup.sql} |   2 +-
 ...21to430-cleanup.sql => schema-41710to41800.sql} |   5 +-
 engine/service/pom.xml                             |   2 +-
 engine/storage/cache/pom.xml                       |   2 +-
 engine/storage/configdrive/pom.xml                 |   2 +-
 engine/storage/datamotion/pom.xml                  |   2 +-
 engine/storage/image/pom.xml                       |   2 +-
 engine/storage/integration-test/pom.xml            |   2 +-
 engine/storage/pom.xml                             |   2 +-
 engine/storage/snapshot/pom.xml                    |   2 +-
 .../allocator/AbstractStoragePoolAllocator.java    |  53 +++-
 .../AbstractStoragePoolAllocatorTest.java          | 113 +++++++
 engine/storage/volume/pom.xml                      |   2 +-
 framework/agent-lb/pom.xml                         |   2 +-
 framework/ca/pom.xml                               |   2 +-
 framework/cluster/pom.xml                          |   2 +-
 framework/config/pom.xml                           |   2 +-
 framework/db/pom.xml                               |   2 +-
 framework/direct-download/pom.xml                  |   4 +-
 framework/events/pom.xml                           |   2 +-
 framework/ipc/pom.xml                              |   2 +-
 framework/jobs/pom.xml                             |   2 +-
 framework/managed-context/pom.xml                  |   2 +-
 framework/pom.xml                                  |   2 +-
 framework/quota/pom.xml                            |   2 +-
 framework/rest/pom.xml                             |   2 +-
 framework/security/pom.xml                         |   2 +-
 framework/spring/lifecycle/pom.xml                 |   2 +-
 framework/spring/module/pom.xml                    |   2 +-
 plugins/acl/dynamic-role-based/pom.xml             |   2 +-
 plugins/acl/project-role-based/pom.xml             |   2 +-
 plugins/acl/static-role-based/pom.xml              |   2 +-
 .../explicit-dedication/pom.xml                    |   2 +-
 .../host-affinity/pom.xml                          |   2 +-
 .../host-anti-affinity/pom.xml                     |   2 +-
 plugins/alert-handlers/snmp-alerts/pom.xml         |   2 +-
 plugins/alert-handlers/syslog-alerts/pom.xml       |   2 +-
 plugins/api/discovery/pom.xml                      |   2 +-
 plugins/api/rate-limit/pom.xml                     |   2 +-
 plugins/api/solidfire-intg-test/pom.xml            |   2 +-
 plugins/api/vmware-sioc/pom.xml                    |   2 +-
 plugins/backup/dummy/pom.xml                       |   2 +-
 plugins/backup/veeam/pom.xml                       |   2 +-
 plugins/ca/root-ca/pom.xml                         |   2 +-
 plugins/database/mysql-ha/pom.xml                  |   2 +-
 plugins/database/quota/pom.xml                     |   2 +-
 plugins/dedicated-resources/pom.xml                |   2 +-
 .../implicit-dedication/pom.xml                    |   2 +-
 .../user-concentrated-pod/pom.xml                  |   2 +-
 .../deployment-planners/user-dispersing/pom.xml    |   2 +-
 plugins/event-bus/inmemory/pom.xml                 |   2 +-
 plugins/event-bus/kafka/pom.xml                    |   2 +-
 plugins/event-bus/rabbitmq/pom.xml                 |   2 +-
 plugins/ha-planners/skip-heurestics/pom.xml        |   2 +-
 plugins/host-allocators/random/pom.xml             |   2 +-
 plugins/hypervisors/baremetal/pom.xml              |   2 +-
 plugins/hypervisors/hyperv/pom.xml                 |   2 +-
 plugins/hypervisors/kvm/pom.xml                    |   2 +-
 plugins/hypervisors/ovm/pom.xml                    |   2 +-
 plugins/hypervisors/ovm3/pom.xml                   |   2 +-
 plugins/hypervisors/simulator/pom.xml              |   2 +-
 plugins/hypervisors/ucs/pom.xml                    |   2 +-
 plugins/hypervisors/vmware/pom.xml                 |   2 +-
 plugins/hypervisors/xenserver/pom.xml              |   2 +-
 plugins/integrations/cloudian/pom.xml              |   2 +-
 plugins/integrations/kubernetes-service/pom.xml    |   2 +-
 plugins/integrations/prometheus/pom.xml            |   2 +-
 plugins/metrics/pom.xml                            |   2 +-
 plugins/network-elements/bigswitch/pom.xml         |   2 +-
 plugins/network-elements/brocade-vcs/pom.xml       |   2 +-
 plugins/network-elements/cisco-vnmc/pom.xml        |   2 +-
 plugins/network-elements/dns-notifier/pom.xml      |   2 +-
 .../network-elements/elastic-loadbalancer/pom.xml  |   2 +-
 plugins/network-elements/f5/pom.xml                |   2 +-
 plugins/network-elements/globodns/pom.xml          |   2 +-
 .../network-elements/internal-loadbalancer/pom.xml |   2 +-
 plugins/network-elements/juniper-contrail/pom.xml  |   2 +-
 plugins/network-elements/juniper-srx/pom.xml       |   2 +-
 plugins/network-elements/netscaler/pom.xml         |   2 +-
 plugins/network-elements/nicira-nvp/pom.xml        |   2 +-
 plugins/network-elements/opendaylight/pom.xml      |   2 +-
 plugins/network-elements/ovs/pom.xml               |   2 +-
 plugins/network-elements/palo-alto/pom.xml         |   2 +-
 plugins/network-elements/stratosphere-ssp/pom.xml  |   2 +-
 plugins/network-elements/vxlan/pom.xml             |   2 +-
 .../outofbandmanagement-drivers/ipmitool/pom.xml   |   2 +-
 .../nested-cloudstack/pom.xml                      |   2 +-
 .../outofbandmanagement-drivers/redfish/pom.xml    |   2 +-
 plugins/pom.xml                                    |   2 +-
 plugins/storage-allocators/random/pom.xml          |   2 +-
 plugins/storage/image/default/pom.xml              |   2 +-
 plugins/storage/image/s3/pom.xml                   |   2 +-
 plugins/storage/image/sample/pom.xml               |   2 +-
 plugins/storage/image/swift/pom.xml                |   2 +-
 plugins/storage/volume/cloudbyte/pom.xml           |   2 +-
 plugins/storage/volume/datera/pom.xml              |   2 +-
 plugins/storage/volume/default/pom.xml             |   2 +-
 plugins/storage/volume/linstor/pom.xml             |   2 +-
 plugins/storage/volume/nexenta/pom.xml             |   2 +-
 plugins/storage/volume/sample/pom.xml              |   2 +-
 plugins/storage/volume/scaleio/pom.xml             |   2 +-
 plugins/storage/volume/solidfire/pom.xml           |   2 +-
 plugins/storage/volume/storpool/pom.xml            |   2 +-
 plugins/user-authenticators/ldap/pom.xml           |   2 +-
 plugins/user-authenticators/md5/pom.xml            |   2 +-
 plugins/user-authenticators/pbkdf2/pom.xml         |   2 +-
 plugins/user-authenticators/plain-text/pom.xml     |   2 +-
 plugins/user-authenticators/saml2/pom.xml          |   2 +-
 plugins/user-authenticators/sha256salted/pom.xml   |   2 +-
 pom.xml                                            |   2 +-
 quickcloud/pom.xml                                 |   2 +-
 server/pom.xml                                     |   2 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    | 323 +++++++++++++--------
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |   3 +
 .../cloud/storage/VolumeApiServiceImplTest.java    |   3 -
 services/console-proxy/pom.xml                     |   2 +-
 services/console-proxy/rdpconsole/pom.xml          |   2 +-
 services/console-proxy/server/pom.xml              |   2 +-
 services/pom.xml                                   |   2 +-
 services/secondary-storage/controller/pom.xml      |   2 +-
 services/secondary-storage/pom.xml                 |   2 +-
 services/secondary-storage/server/pom.xml          |   2 +-
 systemvm/pom.xml                                   |   2 +-
 test/integration/broken/test_vpc_vm_life_cycle.py  |   2 +-
 test/integration/component/test_host_ha.py         |  49 +---
 .../component/test_rootvolume_resize.py            |   6 +-
 .../test_attach_multiple_volumes.py}               | 161 ++++++++--
 test/pom.xml                                       |   2 +-
 tools/apidoc/pom.xml                               |   2 +-
 tools/checkstyle/pom.xml                           |   2 +-
 tools/devcloud-kvm/pom.xml                         |   2 +-
 tools/devcloud4/pom.xml                            |   2 +-
 tools/docker/Dockerfile                            |   2 +-
 tools/docker/Dockerfile.marvin                     |   4 +-
 tools/marvin/pom.xml                               |   2 +-
 tools/marvin/setup.py                              |   2 +-
 tools/pom.xml                                      |   2 +-
 ui/src/config/section/compute.js                   |   2 +-
 ui/src/config/section/project.js                   |   2 +-
 ui/src/config/section/storage.js                   |  14 +-
 ui/src/views/compute/DeployVM.vue                  |   5 +-
 ui/src/views/infra/AddPrimaryStorage.vue           |   5 -
 ui/src/views/network/VpcTab.vue                    |   6 +-
 ui/src/views/storage/CreateVolume.vue              |  28 +-
 usage/pom.xml                                      |   2 +-
 utils/pom.xml                                      |   2 +-
 vmware-base/pom.xml                                |   2 +-
 169 files changed, 767 insertions(+), 430 deletions(-)
 copy 
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41600to41610.java => 
Upgrade41700to41710.java} (74%)
 copy 
engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41600to41610.java => 
Upgrade41710to41800.java} (74%)
 copy 
engine/schema/src/main/resources/META-INF/db/{schema-41600to41610-cleanup.sql 
=> schema-41700to41710-cleanup.sql} (93%)
 copy engine/schema/src/main/resources/META-INF/db/{schema-421to430-cleanup.sql 
=> schema-41700to41710.sql} (94%)
 copy 
engine/schema/src/main/resources/META-INF/db/{schema-41600to41610-cleanup.sql 
=> schema-41710to41800-cleanup.sql} (93%)
 copy engine/schema/src/main/resources/META-INF/db/{schema-421to430-cleanup.sql 
=> schema-41710to41800.sql} (94%)
 create mode 100644 
engine/storage/src/test/java/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocatorTest.java
 rename test/integration/{component/test_simultaneous_volume_attach.py => 
smoke/test_attach_multiple_volumes.py} (61%)

Reply via email to