← Back to branch summary

~ubuntu-branches/ubuntu/vivid/neutron/vivid-updates

« back to all changes in this revision

Viewing changes to neutron/tests/unit/agent/l3/test_ha_router.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
https://launchpad.net/bugs/1263539
* 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:
neutron/tests/unit/agent/l3/test_ha_router.py
 
1
# Copyright (c) 2015 Openstack Foundation
 
2
#
 
3
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
 
4
#    not use this file except in compliance with the License. You may obtain
 
5
#    a copy of the License at
 
6
#
 
7
#         http://www.apache.org/licenses/LICENSE-2.0
 
8
#
 
9
#    Unless required by applicable law or agreed to in writing, software
 
10
#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 
11
#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 
12
#    License for the specific language governing permissions and limitations
 
13
#    under the License.
 
14
 
 
15
import mock
 
16
 
 
17
from neutron.agent.l3 import ha_router
 
18
from neutron.openstack.common import uuidutils
 
19
from neutron.tests import base
 
20
 
 
21
_uuid = uuidutils.generate_uuid
 
22
 
 
23
 
 
24
class TestBasicRouterOperations(base.BaseTestCase):
 
25
    def setUp(self):
 
26
        super(TestBasicRouterOperations, self).setUp()
 
27
 
 
28
    def _create_router(self, router=None, **kwargs):
 
29
        if not router:
 
30
            router = mock.MagicMock()
 
31
        self.agent_conf = mock.Mock()
 
32
        # NOTE The use_namespaces config will soon be deprecated
 
33
        self.agent_conf.use_namespaces = True
 
34
        self.router_id = _uuid()
 
35
        return ha_router.HaRouter(self.router_id,
 
36
                                  router,
 
37
                                  self.agent_conf,
 
38
                                  mock.sentinel.driver,
 
39
                                  **kwargs)
 
40
 
 
41
    def test_get_router_cidrs_returns_ha_cidrs(self):
 
42
        ri = self._create_router()
 
43
        device = mock.MagicMock()
 
44
        device.name.return_value = 'eth2'
 
45
        addresses = ['15.1.2.2/24', '15.1.2.3/32']
 
46
        ri._ha_get_existing_cidrs = mock.MagicMock(return_value=addresses)
 
47
        self.assertEqual(set(addresses), ri.get_router_cidrs(device))