Skip to content

[4.10] CLOUDSTACK-7985: assignVM in Advanced zone with Security Groups - #844

Merged
asfgit merged 3 commits into
apache:masterfrom
ustcweizhou:assignvm-master
Feb 9, 2017
Merged

[4.10] CLOUDSTACK-7985: assignVM in Advanced zone with Security Groups#844
asfgit merged 3 commits into
apache:masterfrom
ustcweizhou:assignvm-master

Conversation

@ustcweizhou

Copy link
Copy Markdown
Contributor

This commit contains the following changes:
(1) implementation of assignVM in Advanced zone with Security Groups
(2) keep the default nic on shared network when assignVM
(3) allow migrate vm from/to project;
(4) UI change for selecting account/project/network

@asfbot

Copy link
Copy Markdown

cloudstack-pull-rats #636 SUCCESS
This pull request looks good

@asfbot

Copy link
Copy Markdown

cloudstack-pull-analysis #575 UNSTABLE
Looks like there's a problem with this pull request

@miguelaferreira

Copy link
Copy Markdown
Contributor

Apache Jenkins build reports 5 failing tests (https://builds.apache.org/job/cloudstack-pull-analysis/575/testReport/)

screen shot 2015-09-16 at 20 24 56

I'm seeing the same tests failing in other PRs, and given that recently master has been broken quite often, it might be that the failing tests have nothing to do with this PR.

@DaanHoogland

Copy link
Copy Markdown
Contributor

@ustcweizhou@miguelaferreira@karuturi@remibergsma so no merges till this is fixed?

@wilderrodrigues

Copy link
Copy Markdown
Contributor

@ustcweizhou ,

Which tests did you execute?

I would say: no merge until it's fixed, tested by @ustcweizhou and he let us know how we should be able to test.

Cheers,
Wilder

@DaanHoogland

Copy link
Copy Markdown
Contributor

@wilderrodrigues that is not fair, it is not @ustcweizhou 's bug that needs fixing!

@miguelaferreira

Copy link
Copy Markdown
Contributor

@DaanHoogland@wilderrodrigues@ustcweizhou I agree with Daan, the problem is most likely elsewhere. But I also agree with Wilder, first we need to figure out where the problem is, fix it, rebase all PRs to branch off after the fix and then continue the normal process. We can't be merging things hoping all will be well.

@ustcweizhou could you please try rebasing on master to see if the build for this PR still fails? it would be something like this:

git pull --rebase upstream master

Where upstream is the https://github.com/apache/cloudstack remote

@asfbot

Copy link
Copy Markdown

cloudstack-pull-rats #644 SUCCESS
This pull request looks good

@miguelaferreira

Copy link
Copy Markdown
Contributor

Thanks for rebasing @ustcweizhou

The pull-analysis is now running.
https://builds.apache.org/job/cloudstack-pull-analysis/583/
Lets keep an eye on it, hopefully the problem will be gone.

@ustcweizhou

Copy link
Copy Markdown
ContributorAuthor

@DaanHoogland@miguelaferreira@wilderrodrigues
I have rebase with the lastest master, and force push to github.
let's see if it will be fixed.

@miguelaferreira

Copy link
Copy Markdown
Contributor

The build job already passed the point it had failed before (fingers-crossed)

@asfbot

Copy link
Copy Markdown

cloudstack-pull-analysis #583 SUCCESS
This pull request looks good

@wilderrodrigues

Copy link
Copy Markdown
Contributor

Hi @ustcweizhou ,

I will 👎 this PR until we get to know which integration tests you executed, against which environment and the steps so we can do the same.

Cheers,
Wilder

@ustcweizhou

Copy link
Copy Markdown
ContributorAuthor

@wilderrodrigues

test cases

 1. advanced zone
(1) a shared network for domain domain1.
account1: in domain 1, one isolated network
acocunt2: in domain 1, two isolated networks
project1: in domain 1, no network
account3: in domain 2, one isolated network.
(2) assign vm1 (account1, isolated network) to account2. expectation: fail, new owner is account2, but no network attached to the vm after assignment.
assign vm2 (accoung2, isolated network) to account1. expectation: succeed. new owner is account1, one isolated network attached to vm.
assign vm3 (account1, shared network) to account2. expectation: succeed. new owner is account2, shared network attached to vm.
assign vm4 (account1, shared network) to account3. expectation: succeed. new owner is account3, one isolated network attached to vm.
assign vm5 (account1, shared network) to project1. expectation: succeed. new owner is project1, one isolated network created and attached to vm
2. advanced zone with security groups
(1) a shared network 1 for domain domain1.
a shared network 2 for domain domain2.
account1: in domain 1
account2: in domain 1
account3: in domain 2
(2) assign vm1 ((account1, shared network) to account2. expectation: succeed. new owner is account2, shared network 1 attached to vm, security group applied.
assign vm1 ((account1, shared network) to account3. expectation: succeed. new owner is account3, shared network 2 attached to vm, security group applied.

@ustcweizhou

Copy link
Copy Markdown
ContributorAuthor

guys, anyone has update ?

@wilderrodrigues

Copy link
Copy Markdown
Contributor

Hi @ustcweizhou

Thanks for the details. Are there some integration tests that we could use to cover the cases you described?

I can runt the following tests to make sure it doesn't break existing features:

echo "Running tests with required_hardware=true"
nosetests --with-marvin --marvin-config=[MARVIN_CONFIG_HERE] -s -a tags=advanced,required_hardware=true \
component/test_vpc_redundant.py \
component/test_routers_iptables_default_policy.py \
component/test_vpc_router_nics.py
echo "Running tests with required_hardware=false"
nosetests --with-marvin --marvin-config=[MARVIN_CONFIG_HERE] -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 \
smoke/test_vpc_vpn.py \
smoke/test_service_offerings.py \
component/test_vpc_offerings.py \
component/test_vpc_routers.py

But I'm not sure if those tests will cover all of your changes.

Cheers,
Wilder

@wilderrodrigues

Copy link
Copy Markdown
Contributor

Hi @ustcweizhou@DaanHoogland@remibergsma@karuturi@miguelaferreira

I executed the tests on my side. Despite some exceptions with network cleanup and the VPC tests that will pass only after PR #908 gets merged, everything went fine.

This PR L1/2GTM (Look 1/2 Good to Me) taking into account that it doesn't break existing features. I need more time to tests the security groups bit - or @ustcweizhou can test it manually, or perhaps someone else can do help on that.

Results:

Create a redundant vpc with two networks with two vms in each network ... === TestName: test_01a_create_redundant_VPC | Status : FAILED ===
FAIL
=== TestName: test_01a_create_redundant_VPC | Status : EXCEPTION ===
ERROR
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
=== TestName: test_01_single_VPC_iptables_policies | Status : EXCEPTION ===
ERROR
Create a vpc with two networks with two vms in each network ... === TestName: test_01_VPC_nics_after_destroy | Status : SUCCESS ===
ok
=== TestName: test_01_VPC_nics_after_destroy | Status : EXCEPTION ===
ERROR
Test router internal advanced zone ... === TestName: test_02_router_internal_adv | Status : SUCCESS ===
ok
Test restart network ... === TestName: test_03_restart_network_cleanup | Status : SUCCESS ===
ok
Test router basic setup ... === TestName: test_05_router_basic | Status : SUCCESS ===
ok
Test router advanced setup ... === TestName: test_06_router_advanced | Status : SUCCESS ===
ok
Test stop router ... === TestName: test_07_stop_router | Status : SUCCESS ===
ok
Test start router ... === TestName: test_08_start_router | Status : SUCCESS ===
ok
Test reboot router ... === TestName: test_09_reboot_router | Status : SUCCESS ===
ok
test_privategw_acl (integration.smoke.test_privategw_acl.TestPrivateGwACL) ... === TestName: test_privategw_acl | Status : SUCCESS ===
ok
Test reset virtual machine on reboot ... === TestName: test_01_reset_vm_on_reboot | Status : SUCCESS ===
ok
Test advanced zone virtual router ... === TestName: test_advZoneVirtualRouter | Status : SUCCESS ===
ok
Test Deploy Virtual Machine ... === TestName: test_deploy_vm | Status : SUCCESS ===
ok
Test Multiple Deploy Virtual Machine ... === TestName: test_deploy_vm_multiple | Status : SUCCESS ===
ok
Test Stop Virtual Machine ... === TestName: test_01_stop_vm | Status : SUCCESS ===
ok
Test Start Virtual Machine ... === TestName: test_02_start_vm | Status : SUCCESS ===
ok
Test Reboot Virtual Machine ... === TestName: test_03_reboot_vm | Status : SUCCESS ===
ok
Test destroy Virtual Machine ... === TestName: test_06_destroy_vm | Status : SUCCESS ===
ok
Test recover Virtual Machine ... === TestName: test_07_restore_vm | Status : SUCCESS ===
ok
Test migrate VM ... SKIP: At least two hosts should be present in the zone for migration
Test destroy(expunge) Virtual Machine ... === TestName: test_09_expunge_vm | Status : SUCCESS ===
ok
Test 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 to create service offering ... === TestName: test_01_create_service_offering | Status : SUCCESS ===
ok
Test to update existing service offering ... === TestName: test_02_edit_service_offering | Status : SUCCESS ===
ok
Test to delete service offering ... === TestName: test_03_delete_service_offering | Status : SUCCESS ===
ok
Test create VPC offering ... === TestName: test_01_create_vpc_offering | Status : SUCCESS ===
ok
Test VPC offering without load balancing service ... === TestName: test_03_vpc_off_without_lb | Status : EXCEPTION ===
ERROR
Test VPC offering without static NAT service ... === TestName: test_04_vpc_off_without_static_nat | Status : EXCEPTION ===
ERROR
Test VPC offering without port forwarding service ... === TestName: test_05_vpc_off_without_pf | Status : EXCEPTION ===
ERROR
Test VPC offering with invalid services ... === TestName: test_06_vpc_off_invalid_services | Status : SUCCESS ===
ok
Test update VPC offering ... === TestName: test_07_update_vpc_off | Status : SUCCESS ===
ok
Test list VPC offering ... === TestName: test_08_list_vpc_off | Status : SUCCESS ===
ok
test_09_create_redundant_vpc_offering (integration.component.test_vpc_offerings.TestVPCOffering) ... === TestName: test_09_create_redundant_vpc_offering | Status : SUCCESS ===
ok
Test start/stop of router after addition of one guest network ... === TestName: test_01_start_stop_router_after_addition_of_one_guest_network | Status : SUCCESS ===
ok
Test reboot of router after addition of one guest network ... === TestName: test_02_reboot_router_after_addition_of_one_guest_network | Status : SUCCESS ===
ok
Test to change service offering of router after addition of one guest network ... === TestName: test_04_chg_srv_off_router_after_addition_of_one_guest_network | Status : SUCCESS ===
ok
Test destroy of router after addition of one guest network ... === TestName: test_05_destroy_router_after_addition_of_one_guest_network | Status : SUCCESS ===
ok
Test to stop and start router after creation of VPC ... === TestName: test_01_stop_start_router_after_creating_vpc | Status : SUCCESS ===
ok
Test to reboot the router after creating a VPC ... === TestName: test_02_reboot_router_after_creating_vpc | Status : SUCCESS ===
ok
Tests to change service offering of the Router after ... === TestName: test_04_change_service_offerring_vpc | Status : SUCCESS ===
ok
Test to destroy the router after creating a VPC ... === TestName: test_05_destroy_router_after_creating_vpc | Status : SUCCESS ===
ok

@ustcweizhou

Copy link
Copy Markdown
ContributorAuthor

@wilderrodrigues thanks for you testing. I believe this PR will not impact the current network/vr/storage.
It will only change the owner of a vm, and add the vm to a network /security group if applicable.

@miguelaferreira

Copy link
Copy Markdown
Contributor

@ustcweizhou may I ask you if you believe that the change in this PR will not impact the areas you mention because you've tested it (even if manually)? Or because you assume that this change is isolated from hose areas of the system?

We have had production issues in the recent past due to "isolated" changes to plugins for hypervisors we don't even use. Therefore, the urge for testing!

@ustcweizhou

Copy link
Copy Markdown
ContributorAuthor

@miguelaferreira I have tested the test cases listed above. I think it is isolated from other areas.

I agree more and careful testing are better. Can you show more details in your issues so maybe we can get some lessons from them?

@miguelaferreira

Copy link
Copy Markdown
Contributor

@ustcweizhou It is not clear to me if you tested the same things @wilderrodrigues did, or if you tested "the security groups bit". Would you be so kind as to make that explicit.

Regarding the remark I made about seemingly isolated code: the PR that fixed the issue we had in production is #761. If you are interested, please have a look at the problem description and solution (arguably no the best!) in the PR comments.

@ustcweizhou

Copy link
Copy Markdown
ContributorAuthor

@miguelaferreira

  1. no, I did not test the same as @wilderrodrigues .
  2. I've tested advanced zone (without security groups), it works fine. For Advanced zone with security group, I used this code in 4.2.1 for long time, then I ported to mainstream.sorry I did not test it in advanced zone with SG. However, compared to the implementation for Basic zone, I think this code is good.
  3. Different from PR Have HyperV behave in 4.4 and return null instead of false #761 which might be called by other functions, this PR is just an implementation for AssignVM in advanced zone with SG. The worst problem I can see is that this functionality does not work, but it will never impact other functionalities.

@miguelaferreira

Copy link
Copy Markdown
Contributor

Thanks for clarifying @ustcweizhou
I guess that we then need to wait for when @wilderrodrigues will have time to test the SGs.

@ustcweizhou

Copy link
Copy Markdown
ContributorAuthor

no problem for me.
it is always good to get feedback from community. @miguelaferreira
I have some features/improvements to be ported from old CS to mainstream.
Looking forward to getting more feedback from you guys in the future.

@DaanHoogland

Copy link
Copy Markdown
Contributor

@miguelaferreira@remibergsma are you satisfied with this PR, now?

@miguelaferreira

Copy link
Copy Markdown
Contributor

@DaanHoogland I think the status is still the same as of 7 days ago. Or am I missing something?

@DaanHoogland

Copy link
Copy Markdown
Contributor

So that means the SG tests are missing still. Ok, I will add it to my testing backlog.

@DaanHoogland

Copy link
Copy Markdown
Contributor

did the regular regression suite in my sbp provided bubble and all passed.

network:

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
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 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 29 tests in 13041.270s
OK

and vpc:

Test router internal advanced zone ... === TestName: test_02_router_internal_adv | Status : SUCCESS ===
ok
Test restart network ... === TestName: test_03_restart_network_cleanup | Status : SUCCESS ===
ok
Test router basic setup ... === TestName: test_05_router_basic | Status : SUCCESS ===
ok
Test router advanced setup ... === TestName: test_06_router_advanced | Status : SUCCESS ===
ok
Test stop router ... === TestName: test_07_stop_router | Status : SUCCESS ===
ok
Test start router ... === TestName: test_08_start_router | Status : SUCCESS ===
ok
Test reboot router ... === TestName: test_09_reboot_router | Status : SUCCESS ===
ok
test_privategw_acl (integration.smoke.test_privategw_acl.TestPrivateGwACL) ... === TestName: test_privategw_acl | Status : SUCCESS ===
ok
Test reset virtual machine on reboot ... === TestName: test_01_reset_vm_on_reboot | Status : SUCCESS ===
ok
Test advanced zone virtual router ... === TestName: test_advZoneVirtualRouter | Status : SUCCESS ===
ok
Test Deploy Virtual Machine ... === TestName: test_deploy_vm | Status : SUCCESS ===
ok
Test Multiple Deploy Virtual Machine ... === TestName: test_deploy_vm_multiple | Status : SUCCESS ===
ok
Test Stop Virtual Machine ... === TestName: test_01_stop_vm | Status : SUCCESS ===
ok
Test Start Virtual Machine ... === TestName: test_02_start_vm | Status : SUCCESS ===
ok
Test Reboot Virtual Machine ... === TestName: test_03_reboot_vm | Status : SUCCESS ===
ok
Test destroy Virtual Machine ... === TestName: test_06_destroy_vm | Status : SUCCESS ===
ok
Test recover Virtual Machine ... === TestName: test_07_restore_vm | Status : SUCCESS ===
ok
Test migrate VM ... SKIP: At least two hosts should be present in the zone for migration
Test destroy(expunge) Virtual Machine ... === TestName: test_09_expunge_vm | 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 to create service offering ... === TestName: test_01_create_service_offering | Status : SUCCESS ===
ok
Test to update existing service offering ... === TestName: test_02_edit_service_offering | Status : SUCCESS ===
ok
Test to delete service offering ... === TestName: test_03_delete_service_offering | Status : SUCCESS ===
ok
Test for delete account ... === TestName: test_delete_account | Status : SUCCESS ===
ok
Test for Associate/Disassociate public IP address for admin account ... === TestName: test_public_ip_admin_account | Status : SUCCESS ===
ok
Test for Associate/Disassociate public IP address for user account ... === TestName: test_public_ip_user_account | Status : SUCCESS ===
ok
Test for release public IP address ... === TestName: test_releaseIP | Status : SUCCESS ===
ok
Test create VPC offering ... === TestName: test_01_create_vpc_offering | Status : SUCCESS ===
ok
Test VPC offering without load balancing service ... === TestName: test_03_vpc_off_without_lb | Status : SUCCESS ===
ok
Test VPC offering without static NAT service ... === TestName: test_04_vpc_off_without_static_nat | Status : SUCCESS ===
ok
Test VPC offering without port forwarding service ... === TestName: test_05_vpc_off_without_pf | Status : SUCCESS ===
ok
Test VPC offering with invalid services ... === TestName: test_06_vpc_off_invalid_services | Status : SUCCESS ===
ok
Test update VPC offering ... === TestName: test_07_update_vpc_off | Status : SUCCESS ===
ok
Test list VPC offering ... === TestName: test_08_list_vpc_off | Status : SUCCESS ===
ok
test_09_create_redundant_vpc_offering (integration.component.test_vpc_offerings.TestVPCOffering) ... === TestName: test_09_create_redundant_vpc_offering | Status : SUCCESS ===
ok
Test start/stop of router after addition of one guest network ... === TestName: test_01_start_stop_router_after_addition_of_one_guest_network | Status : SUCCESS ===
ok
Test reboot of router after addition of one guest network ... === TestName: test_02_reboot_router_after_addition_of_one_guest_network | Status : SUCCESS ===
ok
Test to change service offering of router after addition of one guest network ... === TestName: test_04_chg_srv_off_router_after_addition_of_one_guest_network | Status : SUCCESS ===
ok
Test destroy of router after addition of one guest network ... === TestName: test_05_destroy_router_after_addition_of_one_guest_network | Status : SUCCESS ===
ok
Test to stop and start router after creation of VPC ... === TestName: test_01_stop_start_router_after_creating_vpc | Status : SUCCESS ===
ok
Test to reboot the router after creating a VPC ... === TestName: test_02_reboot_router_after_creating_vpc | Status : SUCCESS ===
ok
Tests to change service offering of the Router after ... === TestName: test_04_change_service_offerring_vpc | Status : SUCCESS ===
ok
Test to destroy the router after creating a VPC ... === TestName: test_05_destroy_router_after_creating_vpc | Status : SUCCESS ===
ok
----------------------------------------------------------------------
Ran 44 tests in 8842.630s
OK (SKIP=1)

the skip is because for migration at least 2 hosts are needed

LGTM (limitation of warranty: security groups are not covered by the standard regression tests) I will run these test in an advanced zone with sg enabled as well, time permitting. next specific tests are to be coded for ensuring sg. For now Wei's personal testing should do.

@ustcweizhou
ustcweizhouforce-pushed the assignvm-master branch 2 times, most recently from e523ffd to 1fd66d6CompareNovember 16, 2015 09:15
@yadvr

Copy link
Copy Markdown
Member

@ustcweizhou Can you please meld the commits into a single commit, and incorporate any remaining changes asked in the review?

Ping, can we have a re-review

@ustcweizhou

Copy link
Copy Markdown
ContributorAuthor

rebased, and fixed an issue in assignvm to project.

message.alert.state.detected=Alert state detected
message.allow.vpn.access=Please enter a username and password of the user that you want to allow VPN access.
message.apply.snapshot.policy=You have successfully updated your current snapshot policy.
message.assign.instance.another=Please specify the account type, domain, account name and network (optional) of the new account. <br> If the default nic of the vm is on a shared network, CloudStack will check if the network can be used by the new account if you do not specify one network. <br> If the default nic of the vm is on a isolated network, and the new account has more one isolated networks, you should specify one.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @ustcweizhou, just pointing a small typo: "on a isolated network" => "on an isolated network". Thanks.

@yadvr

yadvr commented May 2, 2016

Copy link
Copy Markdown
Member

@ustcweizhou please rebase against latest master and push -f, update on status of your PR

@bvbharatk

Copy link
Copy Markdown
Contributor

ACS CI BVT Run

Sumarry:
Build Number 117
Hypervisor xenserver
NetworkType Advanced
Passed=73
Failed=0
Skipped=3

Link to logs Folder (search by build_no):https://www.dropbox.com/sh/yj3wnzbceo9uef2/AAB6u-Iap-xztdm6jHX9SjPja?dl=0

Failed tests:

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_login.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_volumes.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

@ustcweizhou

Copy link
Copy Markdown
ContributorAuthor

rebased with latest master

@ustcweizhouustcweizhou changed the title CLOUDSTACK-7985: assignVM in Advanced zone with Security Groups[4.10] CLOUDSTACK-7985: assignVM in Advanced zone with Security GroupsDec 27, 2016
@DaanHoogland

Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@DaanHoogland a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-475

@DaanHoogland

Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-807)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34311 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr844-t807-kvm-centos7.zip
Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermitten failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
Test completed. 47 look ok, 2 have error(s)

TestResultTime (s)Test File
test_02_redundant_VPC_default_routesFailure869.41test_vpc_redundant.py
test_04_rvpc_privategw_static_routesFailure340.78test_privategw_acl.py
test_01_vpc_site2site_vpnSuccess155.48test_vpc_vpn.py
test_01_vpc_remote_access_vpnSuccess66.21test_vpc_vpn.py
test_01_redundant_vpc_site2site_vpnSuccess250.93test_vpc_vpn.py
test_02_VPC_default_routesSuccess277.36test_vpc_router_nics.py
test_01_VPC_nics_after_destroySuccess520.18test_vpc_router_nics.py
test_05_rvpc_multi_tiersSuccess518.31test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nicsSuccess1416.80test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routersSuccess548.16test_vpc_redundant.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACLSuccess1285.50test_vpc_redundant.py
test_09_delete_detached_volumeSuccess156.67test_volumes.py
test_08_resize_volumeSuccess156.42test_volumes.py
test_07_resize_failSuccess161.53test_volumes.py
test_06_download_detached_volumeSuccess156.38test_volumes.py
test_05_detach_volumeSuccess155.81test_volumes.py
test_04_delete_attached_volumeSuccess151.29test_volumes.py
test_03_download_attached_volumeSuccess156.36test_volumes.py
test_02_attach_volumeSuccess89.64test_volumes.py
test_01_create_volumeSuccess712.28test_volumes.py
test_03_delete_vm_snapshotsSuccess275.25test_vm_snapshots.py
test_02_revert_vm_snapshotsSuccess95.73test_vm_snapshots.py
test_01_create_vm_snapshotsSuccess158.70test_vm_snapshots.py
test_deploy_vm_multipleSuccess242.59test_vm_life_cycle.py
test_deploy_vmSuccess0.03test_vm_life_cycle.py
test_advZoneVirtualRouterSuccess0.02test_vm_life_cycle.py
test_10_attachAndDetach_isoSuccess26.69test_vm_life_cycle.py
test_09_expunge_vmSuccess125.26test_vm_life_cycle.py
test_08_migrate_vmSuccess40.98test_vm_life_cycle.py
test_07_restore_vmSuccess0.14test_vm_life_cycle.py
test_06_destroy_vmSuccess130.88test_vm_life_cycle.py
test_03_reboot_vmSuccess125.85test_vm_life_cycle.py
test_02_start_vmSuccess10.18test_vm_life_cycle.py
test_01_stop_vmSuccess40.34test_vm_life_cycle.py
test_CreateTemplateWithDuplicateNameSuccess50.93test_templates.py
test_08_list_system_templatesSuccess0.03test_templates.py
test_07_list_public_templatesSuccess0.04test_templates.py
test_05_template_permissionsSuccess0.06test_templates.py
test_04_extract_templateSuccess5.16test_templates.py
test_03_delete_templateSuccess5.11test_templates.py
test_02_edit_templateSuccess90.18test_templates.py
test_01_create_templateSuccess20.31test_templates.py
test_10_destroy_cpvmSuccess161.62test_ssvm.py
test_09_destroy_ssvmSuccess133.57test_ssvm.py
test_08_reboot_cpvmSuccess131.59test_ssvm.py
test_07_reboot_ssvmSuccess133.50test_ssvm.py
test_06_stop_cpvmSuccess131.78test_ssvm.py
test_05_stop_ssvmSuccess133.68test_ssvm.py
test_04_cpvm_internalsSuccess1.15test_ssvm.py
test_03_ssvm_internalsSuccess3.27test_ssvm.py
test_02_list_cpvm_vmSuccess0.13test_ssvm.py
test_01_list_sec_storage_vmSuccess0.14test_ssvm.py
test_01_snapshot_root_diskSuccess11.27test_snapshots.py
test_04_change_offering_smallSuccess239.73test_service_offerings.py
test_03_delete_service_offeringSuccess0.05test_service_offerings.py
test_02_edit_service_offeringSuccess0.08test_service_offerings.py
test_01_create_service_offeringSuccess0.14test_service_offerings.py
test_02_sys_template_readySuccess0.14test_secondary_storage.py
test_01_sys_vm_startSuccess0.20test_secondary_storage.py
test_09_reboot_routerSuccess35.34test_routers.py
test_08_start_routerSuccess30.28test_routers.py
test_07_stop_routerSuccess10.19test_routers.py
test_06_router_advancedSuccess0.06test_routers.py
test_05_router_basicSuccess0.04test_routers.py
test_04_restart_network_wo_cleanupSuccess5.70test_routers.py
test_03_restart_network_cleanupSuccess60.56test_routers.py
test_02_router_internal_advSuccess1.06test_routers.py
test_01_router_internal_basicSuccess0.58test_routers.py
test_router_dns_guestipquerySuccess76.81test_router_dns.py
test_router_dns_externalipquerySuccess0.09test_router_dns.py
test_router_dhcphostsSuccess277.14test_router_dhcphosts.py
test_router_dhcp_optsSuccess21.79test_router_dhcphosts.py
test_01_updatevolumedetailSuccess0.08test_resource_detail.py
test_01_reset_vm_on_rebootSuccess131.00test_reset_vm_on_reboot.py
test_createRegionSuccess0.04test_regions.py
test_create_pvlan_networkSuccess5.22test_pvlan.py
test_dedicatePublicIpRangeSuccess0.42test_public_ip_range.py
test_03_vpc_privategw_restart_vpc_cleanupSuccess490.42test_privategw_acl.py
test_02_vpc_privategw_static_routesSuccess355.52test_privategw_acl.py
test_01_vpc_privategw_aclSuccess92.22test_privategw_acl.py
test_01_primary_storage_nfsSuccess35.96test_primary_storage.py
test_createPortablePublicIPRangeSuccess15.20test_portable_publicip.py
test_createPortablePublicIPAcquireSuccess15.50test_portable_publicip.py
test_isolate_network_password_serverSuccess89.35test_password_server.py
test_UpdateStorageOverProvisioningFactorSuccess0.15test_over_provisioning.py
test_oobm_zchange_passwordSuccess30.89test_outofbandmanagement.py
test_oobm_multiple_mgmt_server_ownershipSuccess16.33test_outofbandmanagement.py
test_oobm_issue_power_statusSuccess10.26test_outofbandmanagement.py
test_oobm_issue_power_softSuccess15.34test_outofbandmanagement.py
test_oobm_issue_power_resetSuccess15.52test_outofbandmanagement.py
test_oobm_issue_power_onSuccess15.33test_outofbandmanagement.py
test_oobm_issue_power_offSuccess15.37test_outofbandmanagement.py
test_oobm_issue_power_cycleSuccess15.33test_outofbandmanagement.py
test_oobm_enabledisable_across_clusterzonesSuccess82.83test_outofbandmanagement.py
test_oobm_enable_feature_validSuccess5.17test_outofbandmanagement.py
test_oobm_enable_feature_invalidSuccess0.10test_outofbandmanagement.py
test_oobm_disable_feature_validSuccess5.21test_outofbandmanagement.py
test_oobm_disable_feature_invalidSuccess0.13test_outofbandmanagement.py
test_oobm_configure_invalid_driverSuccess0.12test_outofbandmanagement.py
test_oobm_configure_default_driverSuccess0.09test_outofbandmanagement.py
test_oobm_background_powerstate_syncSuccess23.43test_outofbandmanagement.py
test_extendPhysicalNetworkVlanSuccess15.34test_non_contigiousvlan.py
test_01_nicSuccess434.58test_nic.py
test_releaseIPSuccess257.98test_network.py
test_reboot_routerSuccess393.45test_network.py
test_public_ip_user_accountSuccess10.29test_network.py
test_public_ip_admin_accountSuccess40.29test_network.py
test_network_rules_acquired_public_ip_3_Load_Balancer_RuleSuccess67.03test_network.py
test_network_rules_acquired_public_ip_2_nat_ruleSuccess61.83test_network.py
test_network_rules_acquired_public_ip_1_static_nat_ruleSuccess124.22test_network.py
test_delete_accountSuccess272.95test_network.py
test_02_port_fwd_on_non_src_natSuccess55.69test_network.py
test_01_port_fwd_on_src_natSuccess111.78test_network.py
test_nic_secondaryip_add_removeSuccess202.56test_multipleips_per_nic.py
login_test_saml_userSuccess19.26test_login.py
test_assign_and_removal_lbSuccess133.45test_loadbalance.py
test_02_create_lb_rule_non_natSuccess187.27test_loadbalance.py
test_01_create_lb_rule_src_natSuccess217.81test_loadbalance.py
test_03_list_snapshotsSuccess0.07test_list_ids_parameter.py
test_02_list_templatesSuccess0.04test_list_ids_parameter.py
test_01_list_volumesSuccess0.03test_list_ids_parameter.py
test_07_list_default_isoSuccess0.07test_iso.py
test_05_iso_permissionsSuccess0.07test_iso.py
test_04_extract_IsoSuccess5.18test_iso.py
test_03_delete_isoSuccess95.20test_iso.py
test_02_edit_isoSuccess0.06test_iso.py
test_01_create_isoSuccess21.00test_iso.py
test_04_rvpc_internallb_haproxy_stats_on_all_interfacesSuccess194.05test_internal_lb.py
test_03_vpc_internallb_haproxy_stats_on_all_interfacesSuccess148.85test_internal_lb.py
test_02_internallb_roundrobin_1RVPC_3VM_HTTP_port80Success509.97test_internal_lb.py
test_01_internallb_roundrobin_1VPC_3VM_HTTP_port80Success425.94test_internal_lb.py
test_dedicateGuestVlanRangeSuccess10.28test_guest_vlan_range.py
test_UpdateConfigParamWithScopeSuccess0.15test_global_settings.py
test_rolepermission_lifecycle_updateSuccess6.20test_dynamicroles.py
test_rolepermission_lifecycle_listSuccess6.00test_dynamicroles.py
test_rolepermission_lifecycle_deleteSuccess6.20test_dynamicroles.py
test_rolepermission_lifecycle_createSuccess5.92test_dynamicroles.py
test_rolepermission_lifecycle_concurrent_updatesSuccess6.04test_dynamicroles.py
test_role_lifecycle_update_role_inuseSuccess6.02test_dynamicroles.py
test_role_lifecycle_updateSuccess11.02test_dynamicroles.py
test_role_lifecycle_listSuccess5.95test_dynamicroles.py
test_role_lifecycle_deleteSuccess10.97test_dynamicroles.py
test_role_lifecycle_createSuccess5.92test_dynamicroles.py
test_role_inuse_deletionSuccess5.88test_dynamicroles.py
test_role_account_acls_multiple_mgmt_serversSuccess8.13test_dynamicroles.py
test_role_account_aclsSuccess8.38test_dynamicroles.py
test_default_role_deletionSuccess6.00test_dynamicroles.py
test_04_create_fat_type_disk_offeringSuccess0.08test_disk_offerings.py
test_03_delete_disk_offeringSuccess0.04test_disk_offerings.py
test_02_edit_disk_offeringSuccess0.06test_disk_offerings.py
test_02_create_sparse_type_disk_offeringSuccess0.07test_disk_offerings.py
test_01_create_disk_offeringSuccess0.08test_disk_offerings.py
test_deployvm_userdispersingSuccess20.62test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userconcentratedSuccess20.63test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_firstfitSuccess65.75test_deploy_vms_with_varied_deploymentplanners.py
test_deployvm_userdata_postSuccess10.40test_deploy_vm_with_userdata.py
test_deployvm_userdataSuccess55.98test_deploy_vm_with_userdata.py
test_02_deploy_vm_root_resizeSuccess5.99test_deploy_vm_root_resize.py
test_01_deploy_vm_root_resizeSuccess6.00test_deploy_vm_root_resize.py
test_00_deploy_vm_root_resizeSuccess207.49test_deploy_vm_root_resize.py
test_deploy_vm_from_isoSuccess212.50test_deploy_vm_iso.py
test_DeployVmAntiAffinityGroupSuccess86.22test_affinity_groups.py
test_01_test_vm_volume_snapshotSkipped0.00test_vm_snapshots.py
test_06_copy_templateSkipped0.00test_templates.py
test_static_role_account_aclsSkipped0.03test_staticroles.py
test_11_ss_nfs_version_on_ssvmSkipped0.02test_ssvm.py
test_01_scale_vmSkipped0.00test_scale_vm.py
test_01_primary_storage_iscsiSkipped0.04test_primary_storage.py
test_nested_virtualization_vmwareSkipped0.00test_nested_virtualization.py
test_06_copy_isoSkipped0.00test_iso.py
test_deploy_vgpu_enabled_vmSkipped0.03test_deploy_vgpu_enabled_vm.py
test_3d_gpu_supportSkipped0.04test_deploy_vgpu_enabled_vm.py

@karuturi

Copy link
Copy Markdown
Member

merging

@asfgit
asfgit merged commit ab0d04d into apache:masterFeb 9, 2017
asfgit pushed a commit that referenced this pull request Feb 9, 2017
[4.10] CLOUDSTACK-7985: assignVM in Advanced zone with Security GroupsThis commit contains the following changes:
(1) implementation of assignVM in Advanced zone with Security Groups
(2) keep the default nic on shared network when assignVM
(3) allow migrate vm from/to project;
(4) UI change for selecting account/project/network
* pr/844:
CLOUDSTACK-7985: assignVM in Advanced zone with Security Groups
CLOUDSTACK-7985: keep the default nic on shared network when assignVM
CLOUDSTACK-7985: (1) allow migrate vm from/to project; (2) UI change for selecting account/project/network
Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

11 participants

@ustcweizhou@asfbot@miguelaferreira@DaanHoogland@wilderrodrigues@yadvr@bvbharatk@blueorangutan@karuturi@GabrielBrascher@asfgit