You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by ustcweizhou <gi...@git.apache.org> on 2016/01/22 07:56:42 UTC
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
GitHub user ustcweizhou opened a pull request:
https://github.com/apache/cloudstack/pull/1357
CLOUDSTACK-8958: release dedicated ip range in domain removal
We are able to assign didacated vlan ip ranges after the merge of CLOUDSTACK-8958.
These ip ranges need to be released automatically when we delete a domain.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ustcweizhou/cloudstack release-ip-ranges-for-domain
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1357.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1357
----
commit 252ebb56f23cdffa243f8c71116688f19f6f9f0c
Author: Wei Zhou <w....@tech.leaseweb.com>
Date: 2016-01-20T16:21:06Z
CLOUDSTACK-8958: release dedicated ip range in domain removal
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by GabrielBrascher <gi...@git.apache.org>.
Github user GabrielBrascher commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1357#discussion_r50616343
--- Diff: engine/components-api/src/com/cloud/configuration/ConfigurationManager.java ---
@@ -219,6 +219,8 @@ Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetwor
void createDefaultSystemNetworks(long zoneId) throws ConcurrentOperationException;
+ boolean releaseDomainSpecificVirtualRanges(long domainId);
+
--- End diff --
@ustcweizhou Could you please create a Javadoc? Thanks.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
Re: [GitHub] cloudstack pull request: CLOUDSTACK-8958: release
dedicated ip ran...
Posted by Daan Hoogland <da...@gmail.com>.
Bharat et al,
>From this report, I find it difficult to get a feel for the quality of the
pr. Clearly some of the failures are not related to this PR but are some
related? Can you give some guidance as to how to read the report?
Biligual auto correct use. Read at your own risico
Op 22 mrt. 2016 12:23 PM schreef "bvbharatk" <gi...@git.apache.org>:
> Github user bvbharatk commented on the pull request:
>
> https://github.com/apache/cloudstack/pull/1357#issuecomment-199767590
>
> ### ACS CI BVT Run
> **Sumarry:**
> Build Number 118
> Hypervisor xenserver
> NetworkType Advanced
> Passed=105
> Failed=13
> Skipped=4
>
> **The follwing tests have known issues**
> test_03_rvpc_privategw_static_routes
> ContextSuite context=TestDeployVM>:setup
> test_01_primary_storage_iscsi
> test_04_change_offering_small
> test_07_list_default_iso
> test_04_extract_template
> test_01_test_vm_volume_snapshot
> test_04_extract_Iso
> test_02_vpc_privategw_static_routes
> test02_internallb_haproxy_stats_on_all_interfaces
> test_vpc_remote_access_vpn
> ContextSuite context=TestNiciraContoller>:setup
> test_vpc_site2site_vpn
> test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80
> test_dedicateGuestVlanRange
>
> _Link to logs Folder (search by build_no):_
> https://www.dropbox.com/sh/yj3wnzbceo9uef2/AAB6u-Iap-xztdm6jHX9SjPja?dl=0
>
>
> **Failed tests:**
> * integration.smoke.test_privategw_acl.TestPrivateGwACL
>
> * test_01_vpc_privategw_acl Failing since 5 runs
>
>
> **Skipped tests:**
> test_vm_nic_adapter_vmxnet3
> test_deploy_vgpu_enabled_vm
> test_06_copy_template
> test_06_copy_iso
>
> **Passed test suits:**
> integration.smoke.test_deploy_vm_with_userdata.TestDeployVmWithUserData
>
> integration.smoke.test_affinity_groups_projects.TestDeployVmWithAffinityGroup
> integration.smoke.test_portable_publicip.TestPortablePublicIPAcquire
> integration.smoke.test_over_provisioning.TestUpdateOverProvision
> integration.smoke.test_global_settings.TestUpdateConfigWithScope
> integration.smoke.test_guest_vlan_range.TestDedicateGuestVlanRange
> integration.smoke.test_scale_vm.TestScaleVm
> integration.smoke.test_service_offerings.TestCreateServiceOffering
> integration.smoke.test_loadbalance.TestLoadBalance
> integration.smoke.test_routers.TestRouterServices
> integration.smoke.test_reset_vm_on_reboot.TestResetVmOnReboot
> integration.smoke.test_snapshots.TestSnapshotRootDisk
>
> integration.smoke.test_deploy_vms_with_varied_deploymentplanners.TestDeployVmWithVariedPlanners
> integration.smoke.test_network.TestDeleteAccount
> integration.smoke.test_non_contigiousvlan.TestUpdatePhysicalNetwork
> integration.smoke.test_deploy_vm_iso.TestDeployVMFromISO
> integration.smoke.test_public_ip_range.TestDedicatePublicIPRange
> integration.smoke.test_multipleips_per_nic.TestDeployVM
> integration.smoke.test_regions.TestRegions
> integration.smoke.test_affinity_groups.TestDeployVmWithAffinityGroup
> integration.smoke.test_network_acl.TestNetworkACL
> integration.smoke.test_pvlan.TestPVLAN
> integration.smoke.test_volumes.TestCreateVolume
> integration.smoke.test_ssvm.TestSSVMs
> integration.smoke.test_nic.TestNic
> integration.smoke.test_deploy_vm_root_resize.TestDeployVM
> integration.smoke.test_resource_detail.TestResourceDetail
> integration.smoke.test_secondary_storage.TestSecStorageServices
> integration.smoke.test_vm_life_cycle.TestDeployVM
> integration.smoke.test_disk_offerings.TestCreateDiskOffering
>
>
> ---
> If your project is set up for it, you can reply to this email and have your
> reply appear on GitHub as well. If your project does not have this feature
> enabled and wishes so, or if the feature is enabled but not working, please
> contact infrastructure at infrastructure@apache.org or file a JIRA ticket
> with INFRA.
> ---
>
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by bvbharatk <gi...@git.apache.org>.
Github user bvbharatk commented on the pull request:
https://github.com/apache/cloudstack/pull/1357#issuecomment-199767590
### ACS CI BVT Run
**Sumarry:**
Build Number 118
Hypervisor xenserver
NetworkType Advanced
Passed=105
Failed=13
Skipped=4
**The follwing tests have known issues**
test_03_rvpc_privategw_static_routes
ContextSuite context=TestDeployVM>:setup
test_01_primary_storage_iscsi
test_04_change_offering_small
test_07_list_default_iso
test_04_extract_template
test_01_test_vm_volume_snapshot
test_04_extract_Iso
test_02_vpc_privategw_static_routes
test02_internallb_haproxy_stats_on_all_interfaces
test_vpc_remote_access_vpn
ContextSuite context=TestNiciraContoller>:setup
test_vpc_site2site_vpn
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80
test_dedicateGuestVlanRange
_Link to logs Folder (search by build_no):_ https://www.dropbox.com/sh/yj3wnzbceo9uef2/AAB6u-Iap-xztdm6jHX9SjPja?dl=0
**Failed tests:**
* integration.smoke.test_privategw_acl.TestPrivateGwACL
* test_01_vpc_privategw_acl Failing since 5 runs
**Skipped tests:**
test_vm_nic_adapter_vmxnet3
test_deploy_vgpu_enabled_vm
test_06_copy_template
test_06_copy_iso
**Passed test suits:**
integration.smoke.test_deploy_vm_with_userdata.TestDeployVmWithUserData
integration.smoke.test_affinity_groups_projects.TestDeployVmWithAffinityGroup
integration.smoke.test_portable_publicip.TestPortablePublicIPAcquire
integration.smoke.test_over_provisioning.TestUpdateOverProvision
integration.smoke.test_global_settings.TestUpdateConfigWithScope
integration.smoke.test_guest_vlan_range.TestDedicateGuestVlanRange
integration.smoke.test_scale_vm.TestScaleVm
integration.smoke.test_service_offerings.TestCreateServiceOffering
integration.smoke.test_loadbalance.TestLoadBalance
integration.smoke.test_routers.TestRouterServices
integration.smoke.test_reset_vm_on_reboot.TestResetVmOnReboot
integration.smoke.test_snapshots.TestSnapshotRootDisk
integration.smoke.test_deploy_vms_with_varied_deploymentplanners.TestDeployVmWithVariedPlanners
integration.smoke.test_network.TestDeleteAccount
integration.smoke.test_non_contigiousvlan.TestUpdatePhysicalNetwork
integration.smoke.test_deploy_vm_iso.TestDeployVMFromISO
integration.smoke.test_public_ip_range.TestDedicatePublicIPRange
integration.smoke.test_multipleips_per_nic.TestDeployVM
integration.smoke.test_regions.TestRegions
integration.smoke.test_affinity_groups.TestDeployVmWithAffinityGroup
integration.smoke.test_network_acl.TestNetworkACL
integration.smoke.test_pvlan.TestPVLAN
integration.smoke.test_volumes.TestCreateVolume
integration.smoke.test_ssvm.TestSSVMs
integration.smoke.test_nic.TestNic
integration.smoke.test_deploy_vm_root_resize.TestDeployVM
integration.smoke.test_resource_detail.TestResourceDetail
integration.smoke.test_secondary_storage.TestSecStorageServices
integration.smoke.test_vm_life_cycle.TestDeployVM
integration.smoke.test_disk_offerings.TestCreateDiskOffering
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by ustcweizhou <gi...@git.apache.org>.
Github user ustcweizhou commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1357#discussion_r52076608
--- Diff: server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---
@@ -4932,6 +4932,32 @@ public Domain getVlanDomain(long vlanId) {
return _networkOfferingDao.search(sc, searchFilter);
}
+ @Override
+ @DB
+ public boolean releaseDomainSpecificVirtualRanges(final long domainId) {
+ final List<DomainVlanMapVO> maps = _domainVlanMapDao.listDomainVlanMapsByDomain(domainId);
+ if (maps != null && !maps.isEmpty()) {
--- End diff --
@GabrielBrascher 'maps' is a List, not a Map
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by alexandrelimassantana <gi...@git.apache.org>.
Github user alexandrelimassantana commented on the pull request:
https://github.com/apache/cloudstack/pull/1357#issuecomment-217840055
Is there a test already to check if the ip ranges release method is called? If there is none, I think it should be added
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1357: CLOUDSTACK-8958: release dedicated ip range in domai...
Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the issue:
https://github.com/apache/cloudstack/pull/1357
@ustcweizhou can you rebase against 4.8/4.9, change the base branch to 4.8/4.9?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by koushik-das <gi...@git.apache.org>.
Github user koushik-das commented on the pull request:
https://github.com/apache/cloudstack/pull/1357#issuecomment-206245883
@bvbharatk Looks like test_01_vpc_privategw_acl has been failing for sometime based on the report. Should this be moved to the list of known test issues?
@ustcweizhou There is an open comment. Can you address it?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by bvbharatk <gi...@git.apache.org>.
Github user bvbharatk commented on the pull request:
https://github.com/apache/cloudstack/pull/1357#issuecomment-200251321
@DaanHoogland
Like kishan said we need to look at the failed tests and if needed check the reason for failure. Logs can be obtained using the link and the build number provided in the report.
Note that some the tests are flaky as in they pass intermittently mostly because of hardcoded values or because the test expects that some things like a particular vlan or some resource will always be available.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the pull request:
https://github.com/apache/cloudstack/pull/1357#issuecomment-216221247
Good idea in general.
@ustcweizhou please rebase against latest master
tag:needlove
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by bvbharatk <gi...@git.apache.org>.
Github user bvbharatk commented on the pull request:
https://github.com/apache/cloudstack/pull/1357#issuecomment-221985483
### ACS CI BVT Run
**Sumarry:**
Build Number 59
Hypervisor xenserver
NetworkType Advanced
Passed=71
Failed=2
Skipped=3
_Link to logs Folder (search by build_no):_ https://www.dropbox.com/sh/yj3wnzbceo9uef2/AAB6u-Iap-xztdm6jHX9SjPja?dl=0
**Failed tests:**
* test_deploy_vm_iso.py
* test_deploy_vm_from_iso Failing since 2 runs
* test_volumes.py
* test_06_download_detached_volume Failing since 2 runs
**Skipped tests:**
test_vm_nic_adapter_vmxnet3
test_static_role_account_acls
test_deploy_vgpu_enabled_vm
**Passed test suits:**
test_deploy_vm_with_userdata.py
test_affinity_groups_projects.py
test_portable_publicip.py
test_vpc_vpn.py
test_over_provisioning.py
test_global_settings.py
test_scale_vm.py
test_service_offerings.py
test_routers_iptables_default_policy.py
test_routers.py
test_reset_vm_on_reboot.py
test_snapshots.py
test_deploy_vms_with_varied_deploymentplanners.py
test_list_ids_parameter.py
test_public_ip_range.py
test_multipleips_per_nic.py
test_regions.py
test_affinity_groups.py
test_network_acl.py
test_pvlan.py
test_nic.py
test_deploy_vm_root_resize.py
test_resource_detail.py
test_secondary_storage.py
test_vm_life_cycle.py
test_disk_offerings.py
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by GabrielBrascher <gi...@git.apache.org>.
Github user GabrielBrascher commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1357#discussion_r52021538
--- Diff: server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---
@@ -4932,6 +4932,32 @@ public Domain getVlanDomain(long vlanId) {
return _networkOfferingDao.search(sc, searchFilter);
}
+ @Override
+ @DB
+ public boolean releaseDomainSpecificVirtualRanges(final long domainId) {
+ final List<DomainVlanMapVO> maps = _domainVlanMapDao.listDomainVlanMapsByDomain(domainId);
+ if (maps != null && !maps.isEmpty()) {
--- End diff --
@ustcweizhou Thanks for your changes, the code is ok, just one more thing.
Could you please change the condition (**maps != null && !maps.isEmpty()**) for (**MapUtils.isEmpty(maps)**)?
Thanks
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1357: CLOUDSTACK-8958: release dedicated ip range in domai...
Posted by ustcweizhou <gi...@git.apache.org>.
Github user ustcweizhou commented on the issue:
https://github.com/apache/cloudstack/pull/1357
rebased with latest master
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by GabrielBrascher <gi...@git.apache.org>.
Github user GabrielBrascher commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1357#discussion_r52095108
--- Diff: server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---
@@ -4932,6 +4932,32 @@ public Domain getVlanDomain(long vlanId) {
return _networkOfferingDao.search(sc, searchFilter);
}
+ @Override
+ @DB
+ public boolean releaseDomainSpecificVirtualRanges(final long domainId) {
+ final List<DomainVlanMapVO> maps = _domainVlanMapDao.listDomainVlanMapsByDomain(domainId);
+ if (maps != null && !maps.isEmpty()) {
--- End diff --
@ustcweizhou For a List you can use CollectionUtils.isEmpty (https://commons.apache.org/proper/commons-collections/apidocs/org/apache/commons/collections4/CollectionUtils.html#isEmpty%28java.util.Collection%29)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by kishankavala <gi...@git.apache.org>.
Github user kishankavala commented on the pull request:
https://github.com/apache/cloudstack/pull/1357#issuecomment-200185858
@DaanHoogland
Failed tests are the ones which we should be looking at. integration.smoke.test_privategw_acl.TestPrivateGwACL is the only failed test in this case.
Manual run of this particular test will help in assessing the quality of this PR.
@bvbharatk please correct me, if my understanding is not correct.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack issue #1357: [4.9] CLOUDSTACK-8958: release dedicated ip range in...
Posted by ustcweizhou <gi...@git.apache.org>.
Github user ustcweizhou commented on the issue:
https://github.com/apache/cloudstack/pull/1357
rebased with 4.9.3, and added unit tests (deleteDomain with/without cleanup).
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by GabrielBrascher <gi...@git.apache.org>.
Github user GabrielBrascher commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1357#discussion_r50616271
--- Diff: server/test/com/cloud/vpc/MockConfigurationManagerImpl.java ---
@@ -456,6 +456,15 @@ public void createDefaultSystemNetworks(long zoneId) throws ConcurrentOperationE
}
/* (non-Javadoc)
+ * @see com.cloud.configuration.ConfigurationManager#deleteDomainSpecificVirtualRanges(long)
+ */
+ @Override
--- End diff --
@ustcweizhou The method "com.cloud.configuration.ConfigurationManager.deleteDomainSpecificVirtualRanges(long)" does not exist. Could you please alter this?
I am wondering, why this is a "non-Javadoc"? In my point of view, it could be a Javadoc block.
There is another point citing an inexistent method (at "releaseAccountSpecificVirtualRanges" method which is referring to "com.cloud.configuration.ConfigurationManager.deleteAccountSpecificVirtualRanges(long)"). Although this comment is out of this PR scope, I think that it would be nice to take the opportunity.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: CLOUDSTACK-8958: release dedicated ip ran...
Posted by GabrielBrascher <gi...@git.apache.org>.
Github user GabrielBrascher commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1357#discussion_r52094345
--- Diff: server/src/com/cloud/configuration/ConfigurationManagerImpl.java ---
@@ -4932,6 +4932,32 @@ public Domain getVlanDomain(long vlanId) {
return _networkOfferingDao.search(sc, searchFilter);
}
+ @Override
+ @DB
+ public boolean releaseDomainSpecificVirtualRanges(final long domainId) {
+ final List<DomainVlanMapVO> maps = _domainVlanMapDao.listDomainVlanMapsByDomain(domainId);
+ if (maps != null && !maps.isEmpty()) {
--- End diff --
Sorry @ustcweizhou, my mistake.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---