[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16120863#comment-16120863 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit 542b7e660807b32f4a57e06a1040ace23bcdf3e8 in cloudstack's branch refs/heads/master from [~rohit.ya...@shapeblue.com] [ https://gitbox.apache.org/repos/asf?p=cloudstack.git;h=542b7e6 ] CLOUDSTACK-8958: Fix typos introduced Signed-off-by: Rohit Yadav> add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16120860#comment-16120860 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit 5645164dbb44f7f403f372fc8432b6d50a3bd730 in cloudstack's branch refs/heads/master from Wei Zhou [ https://gitbox.apache.org/repos/asf?p=cloudstack.git;h=5645164 ] CLOUDSTACK-8958: release dedicated ip range in domain removal > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16120858#comment-16120858 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit 542b7e660807b32f4a57e06a1040ace23bcdf3e8 in cloudstack's branch refs/heads/4.10 from [~rohit.ya...@shapeblue.com] [ https://gitbox.apache.org/repos/asf?p=cloudstack.git;h=542b7e6 ] CLOUDSTACK-8958: Fix typos introduced Signed-off-by: Rohit Yadav> add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16120854#comment-16120854 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit 5645164dbb44f7f403f372fc8432b6d50a3bd730 in cloudstack's branch refs/heads/4.10 from Wei Zhou [ https://gitbox.apache.org/repos/asf?p=cloudstack.git;h=5645164 ] CLOUDSTACK-8958: release dedicated ip range in domain removal > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16120815#comment-16120815 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit 542b7e660807b32f4a57e06a1040ace23bcdf3e8 in cloudstack's branch refs/heads/4.9 from [~rohit.ya...@shapeblue.com] [ https://gitbox.apache.org/repos/asf?p=cloudstack.git;h=542b7e6 ] CLOUDSTACK-8958: Fix typos introduced Signed-off-by: Rohit Yadav> add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16120810#comment-16120810 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit 5645164dbb44f7f403f372fc8432b6d50a3bd730 in cloudstack's branch refs/heads/4.9 from Wei Zhou [ https://gitbox.apache.org/repos/asf?p=cloudstack.git;h=5645164 ] CLOUDSTACK-8958: release dedicated ip range in domain removal > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15821425#comment-15821425 ] rashmidixit commented on CLOUDSTACK-8958: - 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. --- > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15821423#comment-15821423 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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). > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15781460#comment-15781460 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user ustcweizhou commented on the issue: https://github.com/apache/cloudstack/pull/1357 rebased with latest master > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15701516#comment-15701516 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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? > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15302863#comment-15302863 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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 > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15276238#comment-15276238 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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 > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15266494#comment-15266494 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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 > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15227998#comment-15227998 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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? > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15208082#comment-15208082 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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. > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15207887#comment-15207887 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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. > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15206197#comment-15206197 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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 > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15135061#comment-15135061 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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 maps = _domainVlanMapDao.listDomainVlanMapsByDomain(domainId); +if (maps != null && !maps.isEmpty()) { --- End diff -- @GabrielBrascher 'maps' is a List, not a Map > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15134257#comment-15134257 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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 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 > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15135433#comment-15135433 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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 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) > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15135410#comment-15135410 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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 maps = _domainVlanMapDao.listDomainVlanMapsByDomain(domainId); +if (maps != null && !maps.isEmpty()) { --- End diff -- Sorry @ustcweizhou, my mistake. > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15113589#comment-15113589 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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. > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15113583#comment-15113583 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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. > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15112028#comment-15112028 ] ASF GitHub Bot commented on CLOUDSTACK-8958: 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 ZhouDate: 2016-01-20T16:21:06Z CLOUDSTACK-8958: release dedicated ip range in domain removal > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15030848#comment-15030848 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit a1d2c531f65271f0301a26b4bd4ddb76f2f85ee5 in cloudstack's branch refs/heads/master from [~remibergsma] [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=a1d2c53 ] Merge pull request #1007 from ustcweizhou/dedicated-ip-for-domain [4.7] CLOUDSTACK-8958: add dedicated ips to domain (account for now)For now, we dedicate ip pool to account, however, other accounts in the same domain cannot fetch the ip from this ip pool. By dedicating ip pool to domain, accounts in the domain can fetch the public ip from same ip pool. * pr/1007: CLOUDSTACK-8958: throw an exception if project account cannot be found CLOUDSTACK-8958: add dedicated ips to domain (account for now) Signed-off-by: Remi Bergsma> add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15030849#comment-15030849 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit a1d2c531f65271f0301a26b4bd4ddb76f2f85ee5 in cloudstack's branch refs/heads/master from [~remibergsma] [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=a1d2c53 ] Merge pull request #1007 from ustcweizhou/dedicated-ip-for-domain [4.7] CLOUDSTACK-8958: add dedicated ips to domain (account for now)For now, we dedicate ip pool to account, however, other accounts in the same domain cannot fetch the ip from this ip pool. By dedicating ip pool to domain, accounts in the domain can fetch the public ip from same ip pool. * pr/1007: CLOUDSTACK-8958: throw an exception if project account cannot be found CLOUDSTACK-8958: add dedicated ips to domain (account for now) Signed-off-by: Remi Bergsma> add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15030845#comment-15030845 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit 37301ed4540450c29be4f975d58b38dbeec6c296 in cloudstack's branch refs/heads/master from Wei Zhou [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=37301ed ] CLOUDSTACK-8958: add dedicated ips to domain (account for now) > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15030846#comment-15030846 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit 89ce8bd9e289327f411790eb05a9fb49ef1f9a2f in cloudstack's branch refs/heads/master from Wei Zhou [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=89ce8bd ] CLOUDSTACK-8958: throw an exception if project account cannot be found > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15030850#comment-15030850 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user asfgit closed the pull request at: https://github.com/apache/cloudstack/pull/1007 > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15030847#comment-15030847 ] ASF subversion and git services commented on CLOUDSTACK-8958: - Commit a1d2c531f65271f0301a26b4bd4ddb76f2f85ee5 in cloudstack's branch refs/heads/master from [~remibergsma] [ https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;h=a1d2c53 ] Merge pull request #1007 from ustcweizhou/dedicated-ip-for-domain [4.7] CLOUDSTACK-8958: add dedicated ips to domain (account for now)For now, we dedicate ip pool to account, however, other accounts in the same domain cannot fetch the ip from this ip pool. By dedicating ip pool to domain, accounts in the domain can fetch the public ip from same ip pool. * pr/1007: CLOUDSTACK-8958: throw an exception if project account cannot be found CLOUDSTACK-8958: add dedicated ips to domain (account for now) Signed-off-by: Remi Bergsma> add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15030844#comment-15030844 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user remibergsma commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1007#discussion_r46089078 --- Diff: server/src/com/cloud/configuration/ConfigurationManagerImpl.java --- @@ -3310,13 +3331,19 @@ public Vlan dedicatePublicIpRange(final DedicatePublicIpRangeCmd cmd) throws Res vlanOwner = _accountMgr.getAccount(project.getProjectAccountId()); } +Domain domain = null; if (accountName != null && domainId != null) { vlanOwner = _accountDao.findActiveAccount(accountName, domainId); -} -if (vlanOwner == null) { -throw new InvalidParameterValueException("Unable to find account by name " + accountName); -} else if (vlanOwner.getId() == Account.ACCOUNT_ID_SYSTEM) { -throw new InvalidParameterValueException("Please specify a valid account. Cannot dedicate IP range to system account"); +if (vlanOwner == null) { --- End diff -- Looks like the project case is handled by 89ce8bd9e289327f411790eb05a9fb49ef1f9a2f. Since all tests pass, I will merge this now. Future adjustments can be made in a separate PR. > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15030151#comment-15030151 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user remibergsma commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1007#discussion_r46066286 --- Diff: server/src/com/cloud/configuration/ConfigurationManagerImpl.java --- @@ -3310,13 +3331,19 @@ public Vlan dedicatePublicIpRange(final DedicatePublicIpRangeCmd cmd) throws Res vlanOwner = _accountMgr.getAccount(project.getProjectAccountId()); } +Domain domain = null; if (accountName != null && domainId != null) { vlanOwner = _accountDao.findActiveAccount(accountName, domainId); -} -if (vlanOwner == null) { -throw new InvalidParameterValueException("Unable to find account by name " + accountName); -} else if (vlanOwner.getId() == Account.ACCOUNT_ID_SYSTEM) { -throw new InvalidParameterValueException("Please specify a valid account. Cannot dedicate IP range to system account"); +if (vlanOwner == null) { --- End diff -- @koushik-das You OK with the PR like it is now? Please review again, thanks! > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15022003#comment-15022003 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user remibergsma commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1007#discussion_r45595780 --- Diff: server/src/com/cloud/configuration/ConfigurationManagerImpl.java --- @@ -3310,13 +3331,19 @@ public Vlan dedicatePublicIpRange(final DedicatePublicIpRangeCmd cmd) throws Res vlanOwner = _accountMgr.getAccount(project.getProjectAccountId()); } +Domain domain = null; if (accountName != null && domainId != null) { vlanOwner = _accountDao.findActiveAccount(accountName, domainId); -} -if (vlanOwner == null) { -throw new InvalidParameterValueException("Unable to find account by name " + accountName); -} else if (vlanOwner.getId() == Account.ACCOUNT_ID_SYSTEM) { -throw new InvalidParameterValueException("Please specify a valid account. Cannot dedicate IP range to system account"); +if (vlanOwner == null) { --- End diff -- @ustcweizhou This PR is almost ready to be merged. Please respond to comments above. > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15022006#comment-15022006 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user ustcweizhou commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1007#discussion_r45596255 --- Diff: server/src/com/cloud/configuration/ConfigurationManagerImpl.java --- @@ -3310,13 +3331,19 @@ public Vlan dedicatePublicIpRange(final DedicatePublicIpRangeCmd cmd) throws Res vlanOwner = _accountMgr.getAccount(project.getProjectAccountId()); } +Domain domain = null; if (accountName != null && domainId != null) { vlanOwner = _accountDao.findActiveAccount(accountName, domainId); -} -if (vlanOwner == null) { -throw new InvalidParameterValueException("Unable to find account by name " + accountName); -} else if (vlanOwner.getId() == Account.ACCOUNT_ID_SYSTEM) { -throw new InvalidParameterValueException("Please specify a valid account. Cannot dedicate IP range to system account"); +if (vlanOwner == null) { --- End diff -- @remibergsma I added a second commit to fix it. However, it did not touch these codes, but codebefore these. > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15022002#comment-15022002 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user remibergsma commented on the pull request: https://github.com/apache/cloudstack/pull/1007#issuecomment-158914722 Repeated the tests due to new commits: LGTM based on these tests: ``` nosetests --with-marvin --marvin-config=${marvinCfg} -s -a tags=advanced,required_hardware=true \ component/test_vpc_redundant.py \ component/test_routers_iptables_default_policy.py \ component/test_routers_network_ops.py \ component/test_vpc_router_nics.py \ smoke/test_loadbalance.py \ smoke/test_internal_lb.py \ smoke/test_ssvm.py \ smoke/test_network.py ``` Result: ``` Test iptables default INPUT/FORWARD policies on VPC router ... === TestName: test_01_single_VPC_iptables_policies | Status : SUCCESS === ok Test redundant router internals ... === TestName: test_01_isolate_network_FW_PF_default_routes_egress_true | Status : SUCCESS === ok Test redundant router internals ... === TestName: test_02_isolate_network_FW_PF_default_routes_egress_false | Status : SUCCESS === ok Test redundant router internals ... === TestName: test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true | Status : SUCCESS === ok Test redundant router internals ... === TestName: test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false | Status : SUCCESS === ok Create a VPC with two networks with one VM in each network and test nics after destroy ... === TestName: test_01_VPC_nics_after_destroy | Status : SUCCESS === ok Create a VPC with two networks with one VM in each network and test default routes ... === TestName: test_02_VPC_default_routes | Status : SUCCESS === ok Check the password file in the Router VM ... === TestName: test_isolate_network_password_server | Status : SUCCESS === ok Check that the /etc/dhcphosts.txt doesn't contain duplicate IPs ... === TestName: test_router_dhcphosts | Status : SUCCESS === ok Test to create Load balancing rule with source NAT ... === TestName: test_01_create_lb_rule_src_nat | Status : SUCCESS === ok Test to create Load balancing rule with non source NAT ... === TestName: test_02_create_lb_rule_non_nat | Status : SUCCESS === ok Test for assign & removing load balancing rule ... === TestName: test_assign_and_removal_lb | Status : SUCCESS === ok Test to verify access to loadbalancer haproxy admin stats page ... === TestName: test02_internallb_haproxy_stats_on_all_interfaces | Status : SUCCESS === ok Test create, assign, remove of an Internal LB with roundrobin http traffic to 3 vm's ... === TestName: test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | Status : SUCCESS === ok Test SSVM Internals ... === TestName: test_03_ssvm_internals | Status : SUCCESS === ok Test CPVM Internals ... === TestName: test_04_cpvm_internals | Status : SUCCESS === ok Test stop SSVM ... === TestName: test_05_stop_ssvm | Status : SUCCESS === ok Test stop CPVM ... === TestName: test_06_stop_cpvm | Status : SUCCESS === ok Test reboot SSVM ... === TestName: test_07_reboot_ssvm | Status : SUCCESS === ok Test reboot CPVM ... === TestName: test_08_reboot_cpvm | Status : SUCCESS === ok Test destroy SSVM ... === TestName: test_09_destroy_ssvm | Status : SUCCESS === ok Test destroy CPVM ... === TestName: test_10_destroy_cpvm | Status : SUCCESS === ok Test Remote Access VPN in VPC ... === TestName: test_vpc_remote_access_vpn | Status : SUCCESS === ok Test VPN in VPC ... === TestName: test_vpc_site2site_vpn | Status : SUCCESS === ok Test for port forwarding on source NAT ... === TestName: test_01_port_fwd_on_src_nat | Status : SUCCESS === ok Test for port forwarding on non source NAT ... === TestName: test_02_port_fwd_on_non_src_nat | Status : SUCCESS === ok Test for reboot router ... === TestName: test_reboot_router | Status : SUCCESS === ok Test for Router rules for network rules on acquired public IP ... === TestName: test_network_rules_acquired_public_ip_1_static_nat_rule | Status : SUCCESS === ok Test for Router rules for network rules on acquired public IP ... === TestName: test_network_rules_acquired_public_ip_2_nat_rule | Status : SUCCESS === ok Test for Router rules for network rules on acquired public IP ... === TestName: test_network_rules_acquired_public_ip_3_Load_Balancer_Rule | Status : SUCCESS === ok -- Ran 33 tests in 168011.715s OK ``` And: ``` nosetests --with-marvin
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=14989330#comment-14989330 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user bhaisaab commented on the pull request: https://github.com/apache/cloudstack/pull/1007#issuecomment-153683174 LGTM > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=14988947#comment-14988947 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user koushik-das commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/1007#discussion_r43845446 --- Diff: server/src/com/cloud/configuration/ConfigurationManagerImpl.java --- @@ -3310,13 +3331,19 @@ public Vlan dedicatePublicIpRange(final DedicatePublicIpRangeCmd cmd) throws Res vlanOwner = _accountMgr.getAccount(project.getProjectAccountId()); } +Domain domain = null; if (accountName != null && domainId != null) { vlanOwner = _accountDao.findActiveAccount(accountName, domainId); -} -if (vlanOwner == null) { -throw new InvalidParameterValueException("Unable to find account by name " + accountName); -} else if (vlanOwner.getId() == Account.ACCOUNT_ID_SYSTEM) { -throw new InvalidParameterValueException("Please specify a valid account. Cannot dedicate IP range to system account"); +if (vlanOwner == null) { --- End diff -- vlanOwner check is now done only when account is specified. What about the project case which also can set the vlanOwner? > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=14985500#comment-14985500 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user borisroman commented on the pull request: https://github.com/apache/cloudstack/pull/1007#issuecomment-153077340 FYI: Running tests on this now > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=14986057#comment-14986057 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user borisroman commented on the pull request: https://github.com/apache/cloudstack/pull/1007#issuecomment-153157118 @remibergsma LGMT :+1: Reviewed the code and run the vm_lifecycle_test. ``` nosetests --with-marvin --marvin-config=/data/shared/marvin/mct-zone1-kvm1-basic.cfg -s -a tags=basic,required_hardware=false smoke/test_vm_life_cycle.py ``` ``` Marvin Init Successful === TestName: test_deploy_vm | Status : SUCCESS === === TestName: test_deploy_vm_multiple | Status : SUCCESS === === TestName: test_01_stop_vm | Status : SUCCESS === === TestName: test_02_start_vm | Status : SUCCESS === === TestName: test_03_reboot_vm | Status : SUCCESS === === TestName: test_06_destroy_vm | Status : SUCCESS === === TestName: test_07_restore_vm | Status : SUCCESS === === TestName: test_09_expunge_vm | Status : SUCCESS === ===final results are now copied to: /tmp//MarvinLogs/test_vm_life_cycle_NDBDEC=== ``` > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=14982086#comment-14982086 ] ASF GitHub Bot commented on CLOUDSTACK-8958: Github user remibergsma commented on the pull request: https://github.com/apache/cloudstack/pull/1007#issuecomment-152453373 LGTM, based on a set of tests that I run on this branch (which I rebased myself first): ``` nosetests --with-marvin --marvin-config=${marvinCfg} -s -a tags=advanced,required_hardware=true \ component/test_vpc_redundant.py \ component/test_routers_iptables_default_policy.py \ component/test_routers_network_ops.py \ component/test_vpc_router_nics.py \ smoke/test_loadbalance.py \ smoke/test_internal_lb.py \ smoke/test_ssvm.py \ smoke/test_network.py ``` Result: ``` Create a redundant VPC with two networks with two VMs in each network ... === TestName: test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL | Status : SUCCESS === ok Create a redundant VPC with two networks with two VMs in each network and check default routes ... === TestName: test_02_redundant_VPC_default_routes | Status : SUCCESS === ok Test iptables default INPUT/FORWARD policy on RouterVM ... === TestName: test_02_routervm_iptables_policies | Status : SUCCESS === ok Test iptables default INPUT/FORWARD policies on VPC router ... === TestName: test_01_single_VPC_iptables_policies | Status : SUCCESS === ok Stop existing router, add a PF rule and check we can access the VM ... === TestName: test_isolate_network_FW_PF_default_routes | Status : SUCCESS === ok Test redundant router internals ... === TestName: test_RVR_Network_FW_PF_SSH_default_routes | Status : SUCCESS === ok Create a VPC with two networks with one VM in each network and test nics after destroy ... === TestName: test_01_VPC_nics_after_destroy | Status : SUCCESS === ok Create a VPC with two networks with one VM in each network and test default routes ... === TestName: test_02_VPC_default_routes | Status : SUCCESS === ok Test to create Load balancing rule with source NAT ... === TestName: test_01_create_lb_rule_src_nat | Status : SUCCESS === ok Test to create Load balancing rule with non source NAT ... === TestName: test_02_create_lb_rule_non_nat | Status : SUCCESS === ok Test for assign & removing load balancing rule ... === TestName: test_assign_and_removal_lb | Status : SUCCESS === ok Test to verify access to loadbalancer haproxy admin stats page ... === TestName: test02_internallb_haproxy_stats_on_all_interfaces | Status : SUCCESS === ok Test create, assign, remove of an Internal LB with roundrobin http traffic to 3 vm's ... === TestName: test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80 | Status : SUCCESS === ok Test SSVM Internals ... === TestName: test_03_ssvm_internals | Status : SUCCESS === ok Test CPVM Internals ... === TestName: test_04_cpvm_internals | Status : SUCCESS === ok Test stop SSVM ... === TestName: test_05_stop_ssvm | Status : SUCCESS === ok Test stop CPVM ... === TestName: test_06_stop_cpvm | Status : SUCCESS === ok Test reboot SSVM ... === TestName: test_07_reboot_ssvm | Status : SUCCESS === ok Test reboot CPVM ... === TestName: test_08_reboot_cpvm | Status : SUCCESS === ok Test destroy SSVM ... === TestName: test_09_destroy_ssvm | Status : SUCCESS === ok Test destroy CPVM ... === TestName: test_10_destroy_cpvm | Status : SUCCESS === ok Test for port forwarding on source NAT ... === TestName: test_01_port_fwd_on_src_nat | Status : SUCCESS === ok Test for port forwarding on non source NAT ... === TestName: test_02_port_fwd_on_non_src_nat | Status : SUCCESS === ok Test for reboot router ... === TestName: test_reboot_router | Status : SUCCESS === ok Test for Router rules for network rules on acquired public IP ... === TestName: test_network_rules_acquired_public_ip_1_static_nat_rule | Status : SUCCESS === ok Test for Router rules for network rules on acquired public IP ... === TestName: test_network_rules_acquired_public_ip_2_nat_rule | Status : SUCCESS === ok Test for Router rules for network rules on acquired public IP ... === TestName: test_network_rules_acquired_public_ip_3_Load_Balancer_Rule | Status : SUCCESS === ok -- Ran 27 tests in 11840.093s OK ``` And: ``` nosetests --with-marvin --marvin-config=${marvinCfg} -s -a tags=advanced,required_hardware=false \ smoke/test_routers.py \ smoke/test_network_acl.py \ smoke/test_privategw_acl.py \ smoke/test_reset_vm_on_reboot.py \ smoke/test_vm_life_cycle.py \
[jira] [Commented] (CLOUDSTACK-8958) add dedicated ips to domain
[ https://issues.apache.org/jira/browse/CLOUDSTACK-8958?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=14980401#comment-14980401 ] ASF GitHub Bot commented on CLOUDSTACK-8958: GitHub user ustcweizhou opened a pull request: https://github.com/apache/cloudstack/pull/1007 CLOUDSTACK-8958: add dedicated ips to domain (account for now) For now, we dedicate ip pool to account, however, other accounts in the same domain cannot fetch the ip from this ip pool. By dedicating ip pool to domain, accounts in the domain can fetch the public ip from same ip pool. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ustcweizhou/cloudstack dedicated-ip-for-domain Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/1007.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 #1007 commit cf39ff300e476a565c73ddf159ff836d52b6ae44 Author: Wei ZhouDate: 2015-08-10T13:05:04Z CLOUDSTACK-8958: add dedicated ips to domain (account for now) > add dedicated ips to domain > --- > > Key: CLOUDSTACK-8958 > URL: https://issues.apache.org/jira/browse/CLOUDSTACK-8958 > Project: CloudStack > Issue Type: Improvement > Security Level: Public(Anyone can view this level - this is the > default.) >Reporter: Wei Zhou >Assignee: Wei Zhou > > add dedicated ips to domain > ips are dedicated to Account for now, so other customers and projects in the > same domain will use the system ip. this is not what we need. -- This message was sent by Atlassian JIRA (v6.3.4#6332)