-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/23856/#review52867
-----------------------------------------------------------
Except for the comment I provided, Patch looks good to me.
I am not able to apply this patch cleanly. Can you please recreate the patch
against latest master?
Applying: Fix vpc distributed routing tests: - Use local setup in the tests -
Enable Ovs network provider during setup - Remove space in supported services
config
/Users/talluri/asf/cloudstack/.git/rebase-apply/patch:71: trailing whitespace.
/Users/talluri/asf/cloudstack/.git/rebase-apply/patch:191: trailing whitespace.
/Users/talluri/asf/cloudstack/.git/rebase-apply/patch:196: trailing whitespace.
/Users/talluri/asf/cloudstack/.git/rebase-apply/patch:202: trailing whitespace.
error: test/integration/component/test_vpc_distributed_routing_offering.py:
does not match index
error: tools/marvin/marvin/lib/common.py: does not match index
Patch failed at 0001 Fix vpc distributed routing tests: - Use local setup in
the tests - Enable Ovs network provider during setup - Remove space in
supported services config
The copy of the patch that failed is found in:
/Users/talluri/asf/cloudstack/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
tools/marvin/marvin/lib/common.py
<https://reviews.apache.org/r/23856/#comment92025>
What if it is an empty list? better to check for empty list.
you can make use of
validateList() from tools/marvin/marvin/lib/utils.py.
- SrikanteswaraRao Talluri
On July 24, 2014, 1:46 p.m., Miguel Ferreira wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/23856/
> -----------------------------------------------------------
>
> (Updated July 24, 2014, 1:46 p.m.)
>
>
> Review request for cloudstack, daan Hoogland, Murali Reddy, Hugo Trippaers,
> and SrikanteswaraRao Talluri.
>
>
> Repository: cloudstack-git
>
>
> Description
> -------
>
> 1) The first test in the class is failing on asserting that distributed
> routing is enabled:
> That was because it is using the global services configuration instead of the
> local one (where the distributed routing is enabled).
> I've changed that and also added two new lines in between every python method
> to make the class more readable.
>
> See stack trace:
> Traceback (most recent call last):
> File
> "/usr/local/Cellar/python/2.7.8/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py",
> line 329, in run
> testMethod()
> File
> "/Users/mferreira/development/workspace/cloudstack-sbp-vpc-tests/src/vpc-tests/all/test_vpc_distributed_routing_offering.py",
> line 292, in
> test_01_create_vpc_offering_with_distributedrouter_service_capability
> self.validate_vpc_offering(vpc_off)
> File
> "/Users/mferreira/development/workspace/cloudstack-sbp-vpc-tests/src/vpc-tests/all/test_vpc_distributed_routing_offering.py",
> line 245, in validate_vpc_offering
> "VPC offering is not set up for Distributed routing"
> File
> "/usr/local/Cellar/python/2.7.8/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py",
> line 513, in assertEqual
> assertion_func(first, second, msg=msg)
> File
> "/usr/local/Cellar/python/2.7.8/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py",
> line 506, in _baseAssertEqual
> raise self.failureException(msg)
> AssertionError: VPC offering is not set up for Distributed routing
> -------------------- >> begin captured stdout << ---------------------
> === TestName:
> test_01_create_vpc_offering_with_distributedrouter_service_capability |
> Status : FAILED ===
>
>
> 2) The second test was failing because the connectivity service was not being
> enabled in te offering due to a typo.
>
> See stack trace:
> Traceback (most recent call last):
> File
> "/usr/local/Cellar/python/2.7.8/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/case.py",
> line 329, in run
> testMethod()
> File
> "/Users/mferreira/development/workspace/cloudstack-sbp-vpc-tests/src/vpc-tests/all/test_vpc_distributed_routing_offering.py",
> line 369, in test_03_deploy_vms_in_vpc_with_distributedrouter
> conservemode=False
> File
> "/Users/mferreira/development/git/cloudstack-sbp/tools/marvin/marvin/lib/base.py",
> line 2028, in create
> return NetworkOffering(apiclient.createNetworkOffering(cmd).__dict__)
> File
> "/Users/mferreira/development/git/cloudstack-sbp/tools/marvin/marvin/cloudstackAPI/cloudstackAPIClient.py",
> line 1778, in createNetworkOffering
> response = self.connection.marvinRequest(command, response_type=response,
> method=method)
> File
> "/Users/mferreira/development/git/cloudstack-sbp/tools/marvin/marvin/cloudstackConnection.py",
> line 382, in marvinRequest
> raise e
> CloudstackAPIException: Execute cmd: createnetworkoffering failed, due to:
> errorCode: 431, errorText:Invalid service Connectivity
>
>
> 3) The tests require that the Ovs network provider be enabled, but it is
> disabled by default when created. I've added a method to the setup that makes
> sure Ovs is enabled, or throws an exception if it is not present.
>
>
> Diffs
> -----
>
> test/integration/component/test_vpc_distributed_routing_offering.py cc9a191
> tools/marvin/marvin/lib/common.py 187ede6
>
> Diff: https://reviews.apache.org/r/23856/diff/
>
>
> Testing
> -------
>
> Both test #1 and #2 in that class succeed.
>
>
> Thanks,
>
> Miguel Ferreira
>
>
