CLOUDSTACK-8838 Interface pattern check by DaanHoogland · Pull Request #973 · apache/cloudstack

DaanHoogland · 2015-10-23T15:18:53Z

thsi closes #812 and #966 as well

… This will allow users to utilze teamd nic teaming devices named team*.

remibergsma · 2015-10-23T17:32:51Z

Nice work @dahn, thanks!

dmabry · 2015-10-23T17:37:30Z

Agreed. Thanks for taking care of this @DaanHoogland.

borisroman · 2015-10-23T17:57:37Z

@DaanHoogland IMHO I think the unit test is a bit inconclusive. It would pass if 8 out of 10 of the possible prefixes were removed....

And maybe remove the merge commits? :) 5 commits for these few lines is a bit much I guess?

Ping @remibergsma

remibergsma · 2015-10-23T18:52:29Z

@borisroman I see your point on the commits. It was done because this combines two existing PRs and @dahn kept the hashes and the authors the same.

Can you address the comment on the unit test @DaanHoogland ? I will run some functional tests.

remibergsma · 2015-10-23T18:52:45Z

Oh and push again so Jenkins can restart, please.

remibergsma · 2015-10-24T07:48:02Z

LGTM, based on a set of tests that I run on this branch:

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
----------------------------------------------------------------------
Ran 21 tests in 10368.345s

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 \
smoke/test_vpc_vpn.py \
smoke/test_service_offerings.py \
component/test_vpc_offerings.py \
component/test_vpc_routers.py

Result:

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 ... === TestName: test_08_migrate_vm | Status : SUCCESS ===
ok
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 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
----------------------------------------------------------------------
Ran 40 tests in 7653.337s

FAILED (errors=3)

The 3 errors are due to cleanup problems that are were broken on master when this was branched off. It was fixed in PR #967.

@DaanHoogland Please force push commits to have Jenkins run again.

remibergsma · 2015-10-24T08:56:56Z

@DaanHoogland Can you address @borisroman's comment about the unit tests and add all the cases maybe?

DaanHoogland · 2015-10-24T09:08:31Z

@remibergsma i have addressed @borisroman his comments, please see the code.

asfbot · 2015-10-24T09:27:04Z

Remi Bergsma on dev@cloudstack.apache.org replies:
Missed that! You're fast :-)

Thanks!
code.
ur
e
se

remibergsma · 2015-10-24T10:41:28Z

@borisroman Please update your review. Are you OK with it now?

remibergsma · 2015-10-24T10:43:50Z

@DaanHoogland Can you prepend the title with CLOUDSTACK-8838 please? I put a note on the original ticket that it was solved in a more generic way.

DaanHoogland · 2015-10-24T10:45:24Z

@remibergsma title prefix added to the PR, would you wnat it on the commit as well?

remibergsma · 2015-10-24T11:16:14Z

@DaanHoogland No, just the PR title. Thanks!

We should align on these things, but that we'll do once 4.6 is out.

borisroman · 2015-10-25T18:36:28Z

@remibergsma @DaanHoogland LGTM 👍

Thanks for adjusting the unit test.

Running com.cloud.hypervisor.kvm.resource.LibvirtComputingResourceTest
Tests run: 143, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.916 sec - in com.cloud.hypervisor.kvm.resource.LibvirtComputingResourceTest

CLOUDSTACK-8838 Interface pattern checkthsi closes #812 and #966 as well * pr/973: unit test for interface patterns in libvirt compute resource Added support for KVM teamd devices to LibvirtComputingResource.java. This will allow users to utilze teamd nic teaming devices named team*. CLOUDSTACK-8838: Allow ensX enoX enpX enxX format for nics in CentOS 7 Signed-off-by: Remi Bergsma <github@remi.nl>

giraffeforestg and others added 4 commits September 13, 2015 22:13

CLOUDSTACK-8838: Allow ensX enoX enpX enxX format for nics in CentOS 7

e8c5ed4

Added support for KVM teamd devices to LibvirtComputingResource.java.…

e1a401c

… This will allow users to utilze teamd nic teaming devices named team*.

Merge branch 'pr/812' into interfacePatternCheck

fea976a

Merge branch 'pr/966' into interfacePatternCheck

f1ea27e

unit test for interface patterns in libvirt compute resource

5a134a6

DaanHoogland force-pushed the interfacePatternCheck branch from 5e836b2 to 5a134a6 Compare October 23, 2015 22:58

DaanHoogland force-pushed the interfacePatternCheck branch from 5a134a6 to f1ea27e Compare October 24, 2015 09:07

DaanHoogland force-pushed the interfacePatternCheck branch from 5a134a6 to f1ea27e Compare October 24, 2015 09:08

DaanHoogland changed the title ~~Interface pattern check~~ CLOUDSTACK-8838 Interface pattern check Oct 24, 2015

asfgit merged commit 5a134a6 into apache:master Oct 25, 2015

DaanHoogland deleted the interfacePatternCheck branch August 16, 2023 11:31

Conversation

DaanHoogland commented Oct 23, 2015

Uh oh!

remibergsma commented Oct 23, 2015

Uh oh!

dmabry commented Oct 23, 2015

Uh oh!

borisroman commented Oct 23, 2015

Uh oh!

remibergsma commented Oct 23, 2015

Uh oh!

remibergsma commented Oct 23, 2015

Uh oh!

remibergsma commented Oct 24, 2015

Uh oh!

remibergsma commented Oct 24, 2015

Uh oh!

DaanHoogland commented Oct 24, 2015

Uh oh!

asfbot commented Oct 24, 2015

Uh oh!

remibergsma commented Oct 24, 2015

Uh oh!

remibergsma commented Oct 24, 2015

Uh oh!

DaanHoogland commented Oct 24, 2015

Uh oh!

remibergsma commented Oct 24, 2015

Uh oh!

borisroman commented Oct 25, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants