← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ironic/vivid-updates

« back to all changes in this revision

Viewing changes to ironic/tests/test_network.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2015-03-30 11:14:57 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20150330111457-kr4ju3guf22m4vbz
Tags: 2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1358820
https://launchpad.net/bugs/1429962
* New upstream release.
  + d/control: 
    - Align with upstream dependencies.
    - Add dh-python to build-dependencies.
    - Add psmisc as a dependency. (LP: #1358820)
  + d/p/fix-requirements.patch: Rediffed.
  + d/ironic-conductor.init.in: Fixed typos in LSB headers,
    thanks to JJ Asghar. (LP: #1429962)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ironic/tests/test_network.py
13
13
#    License for the specific language governing permissions and limitations
14
14
#    under the License.
15
15
 
 
16
from oslo_utils import uuidutils
 
17
 
16
18
from ironic.common import network
17
 
from ironic.common import utils
18
19
from ironic.conductor import task_manager
19
20
from ironic.tests.conductor import utils as mgr_utils
20
21
from ironic.tests.db import base as db_base
38
39
    def test_get_node_vif_ids_one_port(self):
39
40
        port1 = db_utils.create_test_port(node_id=self.node.id,
40
41
                                       address='aa:bb:cc',
41
 
                                       uuid=utils.generate_uuid(),
 
42
                                       uuid=uuidutils.generate_uuid(),
42
43
                                       extra={'vif_port_id': 'test-vif-A'},
43
44
                                       driver='fake')
44
45
        expected = {port1.uuid: 'test-vif-A'}
49
50
    def test_get_node_vif_ids_two_ports(self):
50
51
        port1 = db_utils.create_test_port(node_id=self.node.id,
51
52
                                       address='aa:bb:cc',
52
 
                                       uuid=utils.generate_uuid(),
 
53
                                       uuid=uuidutils.generate_uuid(),
53
54
                                       extra={'vif_port_id': 'test-vif-A'},
54
55
                                       driver='fake')
55
56
        port2 = db_utils.create_test_port(node_id=self.node.id,
56
57
                                       address='dd:ee:ff',
57
 
                                       uuid=utils.generate_uuid(),
 
58
                                       uuid=uuidutils.generate_uuid(),
58
59
                                       extra={'vif_port_id': 'test-vif-B'},
59
60
                                       driver='fake')
60
61
        expected = {port1.uuid: 'test-vif-A', port2.uuid: 'test-vif-B'}