GitHub user wilderrodrigues opened a pull request: https://github.com/apache/cloudstack/pull/118
Feature/persisten systemvm redundant vpc rebase Hi @bhaisaab [Rohit], That's the PR for the Persistent SystemVM config + Redundant VPC work we have been doing for a while. Today I rebased from master, in order to get Funs OV3 work, and tested the whole branch with the set of marvin tests I have. Could you please have a look at this branch and check if that's fine to be merged towards Master? The tests results follow below. Thanks in advance. Cheers, Wilder ========================================================================================================================================================= Test Create Account and user for that account ... === TestName: test_01_create_account | Status : SUCCESS === ok Test Sub domain allowed to launch VM when a Domain level zone is created ... === TestName: test_01_add_vm_to_subdomain | Status : SUCCESS === ok Test delete domain without force option ... === TestName: test_DeleteDomain | Status : SUCCESS === ok Test delete domain with force option ... === TestName: test_forceDeleteDomain | Status : SUCCESS === ok Test update admin details ... === TestName: test_updateAdminDetails | Status : SUCCESS === ok Test update domain admin details ... === TestName: test_updateDomainAdminDetails | Status : SUCCESS === ok Test user update API ... === TestName: test_updateUserDetails | Status : SUCCESS === ok Test login API with domain ... === TestName: test_LoginApiDomain | Status : SUCCESS === ok Test if Login API does not return UUID's ... === TestName: test_LoginApiUuidResponse | Status : SUCCESS === ok ---------------------------------------------------------------------- Ran 9 tests in 1311.256s OK /tmp//MarvinLogs/test_accounts_UJFDB3/results.txt ========================================================================================================================================================= 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 ---------------------------------------------------------------------- Ran 10 tests in 873.671s OK (SKIP=1) /tmp//MarvinLogs/test_vm_life_cycle_FT0VUY/results.txt ========================================================================================================================================================= test_privategw_acl (integration.acs.tests.test_privategw_acl.TestPrivateGwACL) ... === TestName: test_privategw_acl | Status : SUCCESS === ok ---------------------------------------------------------------------- Ran 1 test in 86.001s OK /tmp//MarvinLogs/test_privategw_acl_OAEQIW/results.txt ========================================================================================================================================================= Test reset virtual machine on reboot ... === TestName: test_01_reset_vm_on_reboot | Status : SUCCESS === ok ---------------------------------------------------------------------- Ran 1 test in 217.738s OK /tmp//MarvinLogs/test_reset_vm_on_reboot_IR5ZLY/results.txt ========================================================================================================================================================= Test router internal advanced zone ... SKIP: Marvin configuration has no host credentials to check router services 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 ---------------------------------------------------------------------- Ran 7 tests in 455.654s OK (SKIP=1) /tmp//MarvinLogs/test_routers_LTXVCY/results.txt ========================================================================================================================================================= 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.acs.tests.test_vpc_offerings.TestVPCOffering) ... === TestName: test_09_create_redundant_vpc_offering | Status : SUCCESS === ok ---------------------------------------------------------------------- Ran 8 tests in 684.518s OK /tmp//MarvinLogs/test_vpc_offerings_7AQKRG/results.txt ========================================================================================================================================================= 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 8 tests in 838.694s OK /tmp//MarvinLogs/test_vpc_routers_ESJZ88/results.txt ========================================================================================================================================================= 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 ---------------------------------------------------------------------- Ran 2 tests in 412.303s OK /tmp//MarvinLogs/test_vpc_vpn_AZ8F3C/results.txt ========================================================================================================================================================= 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 6 tests in 657.504s OK /tmp//MarvinLogs/test_redundant_vpc_FLIL4M/results.txt ========================================================================================================================================================= You can merge this pull request into a Git repository by running: $ git pull https://github.com/schubergphilis/cloudstack feature/persisten-systemvm-redundant-vpc-REBASE Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cloudstack/pull/118.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 #118 ---- commit 583f17761950856877e44e38b93b2b8ea4bc8f71 Author: Hugo Trippaers <htrippa...@schubergphilis.com> Date: 2014-07-30T08:41:56Z Disable cmdline check until it's fixed commit 0bf7d5472225eda06bda69ac862744f1ae3bff93 Author: Ian Southam <isout...@schubergphilis.com> Date: 2014-07-30T11:16:27Z 1. Completed provider for ip rules (fwmark) 2. Added merge routine for guestnetwork config messages 3. Updated test script commit 9355dd7133e53eadb4dbf3bddc2cfc7e81bfd68e Author: Ian Southam <isout...@schubergphilis.com> Date: 2014-07-30T12:10:03Z Corrected a hole in my logic commit 7b8050c056b3ac666a51098848d2f0983c1aa7d7 Author: Hugo Trippaers <htrippa...@schubergphilis.com> Date: 2014-07-30T12:13:24Z Rewrite networkacl model to have separate entries for each rule commit 43fd2122985f029f6a8550f8c48a0cda5b1dec73 Author: Hugo Trippaers <htrippa...@schubergphilis.com> Date: 2014-07-30T14:04:35Z Add some debug logging to keep track of timing commit 25b8510c43c010e11401e29673b8d837845afc78 Author: Hugo Trippaers <htrippa...@schubergphilis.com> Date: 2014-07-30T14:05:41Z Change vmdata to the new config system commit 274b7463654b9eab4d2e7d9bd28f8b885d058456 Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-07-30T15:38:39Z A working test-kitchen setup for testing systemvm boxes. commit 3077eb925b5089256df4f1af837bba3f17480a13 Author: Ian Southam <isout...@schubergphilis.com> Date: 2014-07-30T15:46:06Z Include the guestnetwork code This takes the guestnetwork object and also creates an ip object commit 3811b8dc9033fe935a43847c98542bb311898326 Author: Ian Southam <isout...@schubergphilis.com> Date: 2014-07-30T16:03:35Z Split Databag in to separate class as I would now need this commit edfa79b77035fb3fa047c57e27fd914e4f809667 Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-07-31T11:40:41Z junit report output for vagrant systemvm tests commit 58537c76fa2cd43c8925855eef628fda2e09318e Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-07-31T14:00:15Z Use bundler to exec test-kitchen commit 04ad01a06498d8e65218e90eb604bad765b6c2e0 Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-07-31T14:04:29Z Commit missing .kitchen.yml commit 8fb1deb33e8745ddc72ffe7d579ac12e9dd12978 Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-08-01T12:16:26Z Massively simpler serverspec invocation Give up on using test-kitchen, busser, and more of its complexity and simply run serverspec directly, via SSH. commit 731a3bf9c36f42405c8b5ce40ba3669fe5e4bf4f Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-08-01T12:43:35Z Missing gem for vagrant magic commit 66b5260c9031a55ca3902ab64cc972a58217ae28 Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-08-01T13:27:06Z Documentation and license headers for new systemvm testing tools. commit c7c1f3202e0efdfb893d96f7c4288253715bc8dd Author: Ian Southam <isout...@schubergphilis.com> Date: 2014-08-01T14:44:49Z Plan B Replace chef with a python script configure.py will read the bags and (hopefully) create the desired state At this stage this is ipassociation This code should work for both VR and VPCrs TODO: iptables ip route throw (present in VR but not in VPCr Determine default route Unit tests commit ca4887d9cc5c61e9abc89c2a9db0166a3ba215b1 Author: Ian Southam <isout...@schubergphilis.com> Date: 2014-08-01T14:55:08Z Test data for ipassociation These files emulate commands coming from cloudstack itself commit 2a94ca69ce869194f750fe3a4644af5d615b38ce Author: Ian Southam <isout...@schubergphilis.com> Date: 2014-08-04T12:06:05Z Added some lost lines back using Hugo witchcraft commit 9b2a73370b7eb1a93c34670d1736f02853f266ab Author: Hugo Trippaers <htrippa...@schubergphilis.com> Date: 2014-08-04T12:15:38Z Put a netmask in the netmask field commit 666dc16e58a1ad57483b3ba68efe92bd4ed9fadd Author: Ian Southam <isout...@schubergphilis.com> Date: 2014-08-04T16:39:21Z Moved bag location to /et/cloudstack Updated test script to also process command line Added connmark stuff to merge commit 2188d8d633813d670a39b0914aec6f1e44285b81 Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-08-06T11:18:50Z Pure python tests for systemvm This approach is instead of serverspec, but filling the same purpose. It's main advantage is that it uses nose and python, just like the existing marvin-based integration test suite. commit e405e9479751d6bf767232746a963f7cd94f0214 Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-08-06T11:47:13Z Replace serverspec with nose in systemvm test.sh Also remove the serverspec-specific files. commit f593255371d9057d2127c37e8dbc65ffd9238cfe Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-08-06T11:58:27Z Attempt to get these tests working on python 2.6 commit 95e5f867f99529e3208b1ee22cd3e7817d2e51a3 Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-08-06T12:01:08Z Second Attempt to get these tests working on python 2.6. commit 05702ecd1a642ffc1d44201af7f24d6b69f8bbf6 Author: Ian Southam <isout...@schubergphilis.com> Date: 2014-08-06T13:34:15Z Added guest network configuration Added iptables config (adds but no deletes yet) Apache config (VPC GN) DNSMasq config (VPX GN) commit 348167db51e12f4a6eb7213a3464e3ae153761b5 Author: Ian Southam <isout...@schubergphilis.com> Date: 2014-08-06T15:03:40Z This was a good one Any cd command will cause rvm to override the trap handler in the shell These means that vagrant_destroy will not get called at the end because in the node function it cds Run the nose tests in a subshell commit bda4c0d2c99fa17813838837e0c9a7d4c6a1b597 Author: Hugo Trippaers <htrippa...@schubergphilis.com> Date: 2014-08-07T07:11:12Z Move some static strings to constants and remove some duplicate code commit 3ab83fdba7e99760ebb08ce46c9467ac99f6bbaf Author: Hugo Trippaers <htrippa...@schubergphilis.com> Date: 2014-08-07T09:17:26Z New style save password command commit 6244265de012dcf6e278d4f813f5cff48530bed9 Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-08-07T09:45:36Z Fancy line editor for Ian commit 6ffb063863687c426b4b41557b50dd1b455b29be Author: Leo Simons <lsim...@schubergphilis.com> Date: 2014-08-07T11:39:31Z Don't fail if you've logged into an older systemvm manually, before. ---- --- 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. ---