You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pa...@apache.org on 2019/07/16 09:25:50 UTC
[cloudstack] branch master updated (98e84e3 -> e15c311)
This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 98e84e3 server: fix public IP association/disassociation to new network (#3489)
new c85b3e5 server: ability to create disk offerings for domain(s) and zone(s)
new 728afba refactorings
new 9c117f2 DB upgrade path and UI fixes
new 7721126 remove domain id usage
new 5988884 wip changes
new 8cabbce wip domainId removal stuff
new 02913e9 server: fix failing unit test issue
new 6a90246 find in set implementation
new e3da9ec fix db issues
new d04c6ea remove getDomainId and write the workaround code
new f431711 sql changes for service offering
new 94f425f refactored changes
new dd0294e add helper method for findings offerings by zone id
new b8f1cf2 schema: update service_offering details constraint
new 2102888 server: changes for domain, zone specified service offerings
new 9f46efe server update service, disk offerings for domain(s) and zone(s)
new 98df2c2 server: zone, domain IDs in service, disk offering details hidden for user
new 977c5b7 schema: domain and zone IDs in offering details hidden for user in upgrade
new e2bb43a refactoring
new dc589a4 server: create network offering for specified domain(s) and zone(s)
new eaa7592 test fix and temporary skip for search test
new c671e07 server: update network offering for specified domain(s) & zone(s)
new de79fbd fix compilation error
new 366b253 server: create, update VPC offering for domain(s) & zone(s)
new d068417 vpc offering check access, list response changes
new 45e4b54 ui: network, vpc offering domain(s), zones(s) in details
new 8e999ad server: fix for failing searchForNetworkOfferings unit test
new 490e4ad refactoring
new cf7f1ab server: volume disk offering owner checkaccess fix
new 5598618 refactoring
new 7c7237e server: create network owner check access fix
new 15efa1b test: Added Marvin test for domain specific offerings
new b749fe1 server: vpc offering check access fix
new 89859e4 test: Added Marvin test for domain specific VPC offerings
new 179d229 ui: fixed create offering domain multi-selection
new 6d82e63 Merge branch 'master' into storage-offering-domains-zones
new f78b99c refactoring: code review comment changes
new 1323036 refactoring: fixed comment typo
new 852a228 server: fix for incorrect createVPCOffering argument
new cf347c8 Merge branch 'master' into storage-offering-domains-zones
new d2e40c9 ui: filter offerings for zone while listing
new df37f16 ui: fix for public 'All zones' offering creation
new 26a5d50 Merge branch 'master' into storage-offering-domains-zones
new a3808af ui: fix for domain validation while creating non-public offerings
new c556abf server: overwrite associated domain(s), zones(s) with offering on update
new baf7e0a server, api: allowing domain(s), zone(s) overwrite while updating offerings
new 392b5c3 ui: added action to update offering linked domain(s) and zone(s)
new 379b660 ui: fix for multiple zones while create/update offering issue
new 9aa61e5 server: fix for update VPC offering zomain, zone mixup
new 62fc132 server: fix for delete service offering long value parse bug
new 101953b test: fix test failures due to update*Offering domain, zone overwrite changes
new 8cff58d Merge branch 'master' into storage-offering-domains-zones
new 5628bd1 Merge branch 'master' into storage-offering-domains-zones
new 12218e3 Merge branch 'master' into storage-offering-domains-zones
new b168eba ui: fix for domain selection not showing create disk offering
new 0badbe9 server: fix for delete compute offerings by domain admin
new 8c4efaf server, ui: domain-admin update compute and disk offering access
new 54cdab2 ui: fix for create vpc offering domain selection
new fc83815 Merge branch 'master' into storage-offering-domains-zones
new 5766ddb ui: fix for create network offering domain, zone selection bug
new 18439ca server, api, ui: filtering network offerings for a domain while create network
new d75a26d ui: fix for delete VPC offering bug
new 9df8d7b ui: create L2, Isolated network - filter offerings for domain
new 7010f85 Merge branch 'master' into storage-offering-domains-zones
new cb8f58b server: fix for user account able to list child domain n/w offering
new 6d51689 ui: fix for multiple network offering listing
new e15c311 Merge pull request #3248 from shapeblue/storage-offering-domains-zones
The 32108 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:
.../cloud/configuration/ConfigurationService.java | 42 +
.../java/com/cloud/network/vpc/VpcOffering.java | 11 +-
.../cloud/network/vpc/VpcProvisioningService.java | 34 +-
.../main/java/com/cloud/offering/DiskOffering.java | 12 +-
.../java/com/cloud/offering/NetworkOffering.java | 2 +-
.../java/com/cloud/offering/ServiceOffering.java | 3 -
.../main/java/com/cloud/user/AccountService.java | 11 +-
.../org/apache/cloudstack/acl/SecurityChecker.java | 10 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../admin/network/CreateNetworkOfferingCmd.java | 103 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 91 +-
.../admin/offering/CreateDiskOfferingCmd.java | 46 +-
.../admin/offering/CreateServiceOfferingCmd.java | 58 +-
.../admin/offering/UpdateDiskOfferingCmd.java | 90 +-
.../admin/offering/UpdateServiceOfferingCmd.java | 87 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 41 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 80 +-
.../user/network/ListNetworkOfferingsCmd.java | 12 +
.../user/offering/ListDiskOfferingsCmd.java | 12 +
.../user/offering/ListServiceOfferingsCmd.java | 12 +
.../api/command/user/vpc/ListVPCOfferingsCmd.java | 15 +-
.../api/response/DiskOfferingResponse.java | 31 +-
.../api/response/NetworkOfferingResponse.java | 51 +-
.../api/response/ServiceOfferingResponse.java | 33 +-
.../api/response/VpcOfferingResponse.java | 51 +-
.../cloud/configuration/ConfigurationManager.java | 11 +-
.../engine/orchestration/NetworkOrchestrator.java | 20 +-
.../main/java/com/cloud/domain/dao/DomainDao.java | 2 +-
.../java/com/cloud/domain/dao/DomainDaoImpl.java | 1 -
.../vpc/VpcOfferingDetailsVO.java} | 29 +-
.../java/com/cloud/network/vpc/VpcOfferingVO.java | 16 +-
.../network/vpc/dao/VpcOfferingDetailsDao.java} | 13 +-
.../network/vpc/dao/VpcOfferingDetailsDaoImpl.java | 58 +
.../cloud/offerings/NetworkOfferingDetailsVO.java | 11 +-
.../offerings/dao/NetworkOfferingDaoImpl.java | 4 +-
.../offerings/dao/NetworkOfferingDetailsDao.java | 8 +-
.../dao/NetworkOfferingDetailsDaoImpl.java | 38 +-
.../java/com/cloud/service/ServiceOfferingVO.java | 21 +-
.../com/cloud/service/dao/ServiceOfferingDao.java | 6 -
.../cloud/service/dao/ServiceOfferingDaoImpl.java | 43 -
.../service/dao/ServiceOfferingDetailsDao.java | 4 +
.../service/dao/ServiceOfferingDetailsDaoImpl.java | 29 +-
.../java/com/cloud/storage/DiskOfferingVO.java | 42 +-
.../com/cloud/storage/dao/DiskOfferingDao.java | 1 -
.../com/cloud/storage/dao/DiskOfferingDaoImpl.java | 30 +-
.../resourcedetail/ResourceDetailsDao.java | 23 +-
.../resourcedetail/ResourceDetailsDaoBase.java | 17 +
.../resourcedetail/dao/DiskOfferingDetailsDao.java | 5 +-
.../dao/DiskOfferingDetailsDaoImpl.java | 28 +
.../spring-engine-schema-core-daos-context.xml | 3 +
.../resources/META-INF/db/schema-41200to41300.sql | 251 +++++
.../main/java/com/cloud/utils/db/SearchBase.java | 12 +-
.../java/com/cloud/utils/db/SearchCriteria.java | 2 +-
.../cloudstack/quota/vo/ServiceOfferingVO.java | 4 +-
.../contrail/management/ContrailManagerImpl.java | 6 +-
.../contrail/management/ManagementServerMock.java | 3 +-
.../contrail/management/MockAccountManager.java | 17 +-
.../src/main/java/com/cloud/acl/DomainChecker.java | 177 ++-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 40 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 49 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 120 +-
.../cloud/api/query/dao/DiskOfferingJoinDao.java | 6 +
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 32 +-
.../api/query/dao/NetworkOfferingJoinDao.java | 20 +-
.../api/query/dao/NetworkOfferingJoinDaoImpl.java | 108 ++
.../api/query/dao/ServiceOfferingJoinDao.java | 4 +
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 17 +-
.../{HostTagDao.java => VpcOfferingJoinDao.java} | 17 +-
.../api/query/dao/VpcOfferingJoinDaoImpl.java | 87 ++
.../com/cloud/api/query/vo/DiskOfferingJoinVO.java | 102 +-
.../cloud/api/query/vo/NetworkOfferingJoinVO.java | 398 +++++++
.../cloud/api/query/vo/ServiceOfferingJoinVO.java | 28 +-
.../com/cloud/api/query/vo/VpcOfferingJoinVO.java | 132 +--
.../configuration/ConfigurationManagerImpl.java | 769 ++++++++++---
.../java/com/cloud/network/NetworkServiceImpl.java | 18 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 307 +++++-
.../com/cloud/server/ConfigurationServerImpl.java | 16 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 26 +-
.../main/java/com/cloud/test/DatabaseConfig.java | 22 +-
.../java/com/cloud/user/AccountManagerImpl.java | 41 +-
.../java/com/cloud/user/DomainManagerImpl.java | 57 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 14 +-
.../configuration/ConfigurationManagerTest.java | 65 +-
.../com/cloud/user/AccountManagerImplTest.java | 58 +-
.../AccountManagerImplVolumeDeleteEventTest.java | 4 +-
.../com/cloud/user/AccountManagetImplTestBase.java | 2 +-
.../java/com/cloud/user/DomainManagerImplTest.java | 19 +-
.../com/cloud/user/MockAccountManagerImpl.java | 17 +-
.../vm/DeploymentPlanningManagerImplTest.java | 13 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 44 +-
.../networkoffering/CreateNetworkOfferingTest.java | 20 +-
.../src/test/resources/createNetworkOffering.xml | 5 +-
.../smoke/test_domain_disk_offerings.py | 364 +++++++
.../smoke/test_domain_network_offerings.py | 360 ++++++
.../smoke/test_domain_service_offerings.py | 410 +++++++
.../integration/smoke/test_domain_vpc_offerings.py | 405 +++++++
ui/css/cloudstack3.css | 8 +
ui/l10n/en.js | 6 +
ui/scripts/configuration.js | 1152 +++++++++++++++++++-
ui/scripts/docs.js | 34 +-
ui/scripts/instanceWizard.js | 12 +
ui/scripts/network.js | 111 +-
ui/scripts/sharedFunctions.js | 112 +-
ui/scripts/storage.js | 20 +-
104 files changed, 6522 insertions(+), 1023 deletions(-)
copy engine/schema/src/main/java/com/cloud/{dc/DataCenterDetailVO.java => network/vpc/VpcOfferingDetailsVO.java} (80%)
copy engine/schema/src/main/java/{org/apache/cloudstack/resourcedetail/dao/Site2SiteVpnGatewayDetailsDao.java => com/cloud/network/vpc/dao/VpcOfferingDetailsDao.java} (72%)
create mode 100644 engine/schema/src/main/java/com/cloud/network/vpc/dao/VpcOfferingDetailsDaoImpl.java
copy engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworkDao.java => server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDao.java (63%)
create mode 100644 server/src/main/java/com/cloud/api/query/dao/NetworkOfferingJoinDaoImpl.java
copy server/src/main/java/com/cloud/api/query/dao/{HostTagDao.java => VpcOfferingJoinDao.java} (67%)
create mode 100644 server/src/main/java/com/cloud/api/query/dao/VpcOfferingJoinDaoImpl.java
create mode 100644 server/src/main/java/com/cloud/api/query/vo/NetworkOfferingJoinVO.java
copy engine/schema/src/main/java/com/cloud/network/vpc/VpcOfferingVO.java => server/src/main/java/com/cloud/api/query/vo/VpcOfferingJoinVO.java (56%)
create mode 100644 test/integration/smoke/test_domain_disk_offerings.py
create mode 100644 test/integration/smoke/test_domain_network_offerings.py
create mode 100644 test/integration/smoke/test_domain_service_offerings.py
create mode 100644 test/integration/smoke/test_domain_vpc_offerings.py