~ubuntu-branches/ubuntu/vivid/neutron/vivid-proposed

« back to all changes in this revision

Viewing changes to neutron/tests/api/test_v2_rest.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-03-30 11:17:19 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20150330111719-h0gx7233p4jkkgfh
Tags: 1:2015.1~b3-0ubuntu1
* New upstream milestone release:
  - d/control: Align version requirements with upstream.
  - d/control: Add new dependency on oslo-log.
  - d/p/*: Rebase.
  - d/control,d/neutron-plugin-hyperv*: Dropped, decomposed into
    separate project upstream.
  - d/control,d/neutron-plugin-openflow*: Dropped, decomposed into
    separate project upstream.
  - d/neutron-common.install: Add neutron-rootwrap-daemon and 
    neutron-keepalived-state-change binaries.
  - d/rules: Ignore neutron-hyperv-agent when installing; only for Windows.
  - d/neutron-plugin-cisco.install: Drop neutron-cisco-cfg-agent as
    decomposed into separate project upstream.
  - d/neutron-plugin-vmware.install: Drop neutron-check-nsx-config and
    neutron-nsx-manage as decomposed into separate project upstream.
  - d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent.
* d/pydist-overrides: Add overrides for oslo packages.
* d/control: Fixup type in package description (LP: #1263539).
* d/p/fixup-driver-test-execution.patch: Cherry pick fix from upstream VCS
  to support unit test exection in out-of-tree vendor drivers.
* d/neutron-common.postinst: Allow general access to /etc/neutron but limit
  access to root/neutron to /etc/neutron/neutron.conf to support execution
  of unit tests in decomposed vendor drivers.
* d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent
  package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
and configures the api tests with scenarios targeting the Neutron API.
19
19
"""
20
20
 
21
 
from tempest import exceptions
22
 
from tempest import test as t_test
 
21
from tempest_lib import exceptions
23
22
import testscenarios
24
23
 
25
24
from neutron.tests.api import base_v2
26
 
 
 
25
from neutron.tests.tempest import test as t_test
27
26
 
28
27
# Required to generate tests from scenarios.  Not compatible with nose.
29
28
load_tests = testscenarios.load_tests_apply_scenarios
34
33
    @property
35
34
    def client(self):
36
35
        if not hasattr(self, '_client'):
37
 
            manager = t_test.BaseTestCase.get_client_manager(interface='json')
 
36
            manager = t_test.BaseTestCase.get_client_manager()
38
37
            self._client = manager.network_client
39
38
        return self._client
40
39