← Back to branch summary

~ubuntu-branches/ubuntu/raring/quantum/raring-proposed

« back to all changes in this revision

Viewing changes to quantum/plugins/cisco/tests/unit/v2/ucs/test_ucs_inventory_v2.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Yolanda Robla, James Page, Maru Newby
  • Date: 2013-01-11 09:14:35 UTC
  • mfrom: (2.1.17)
  • Revision ID: package-import@ubuntu.com-20130111091435-vaup7dwmtmajy5oe
Tags: 2013.1~g2-0ubuntu1
https://launchpad.net/bugs/1085038
https://launchpad.net/bugs/1076747
[ Chuck Short ]
* New upstream version. 
* debian/patches/fix-quantum-configuration.patch: Refreshed.

[ Yolanda Robla ]
* debian/quantum-l3-agent.quantum-metadata-agent.upstart: Add
  upstart configuration for Metadata Agent.
* debian/quantum-l3-agent.install: Added quantum-ns-metadata-proxy,
  quantum-metadata-agent and metadata_agent.ini.
* debian/patches/fix-quantum-configuration.patch: Update rootwrap
  configuration in metadata_agent.ini file.
* debian/changelog: Updated package version
* d/p/fix-quantum-configuration.patch: refresh patches

[ James Page ]
* d/*.install: Install entry points from bin directory instead
  of easy-install ones generated during the package build process
  (LP: #1085038).
* d/control: Drop BD on python-dev-all; its not required.
* d/rules: Install multiple upstart configurations for quantum-l3-agent.
* d/control: Tidy package descriptions.
* d/*.postrm: Drop as debhelper will generate update-rc.d calls in
  maintainer scripts if required.
* d/quantum-common.postinst: Tweak permissions setting so that /etc/quantum
  is not owned/writable by the quantum user, ensure that /etc/quantum/rootwrap*
  is owned by root:root.
* d/*agent*.postinst: Dropped as permissions now correctly set in
  quantum-common.
* d/patches/fix-quantum-configuration.patch: Re-add dropped fixes rootwrap and
  sqlite defaults for all plugins.
* d/control: Added new BD on alembic (>= 0.4.1~), version python-mock >= 1.0b1.

[ Maru Newby ]
* debian/control: Remove unnecessary openvswitch-vswitch dependency
  from quantum-plugin-openvswitch (LP: #1076747).

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/plugins/cisco/tests/unit/v2/ucs/test_ucs_inventory_v2.py
1
1
# vim: tabstop=4 shiftwidth=4 softtabstop=4
2
 
#
 
2
 
3
3
# Copyright 2012 Cisco Systems, Inc.  All rights reserved.
4
4
#
5
5
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
19
19
 
20
20
import logging
21
21
import unittest
22
 
import uuid
23
22
 
24
23
from quantum.common import exceptions as exc
 
24
from quantum.openstack.common import uuidutils
25
25
from quantum.plugins.cisco.common import cisco_constants as const
26
26
from quantum.plugins.cisco.common import cisco_credentials_v2 as creds
27
27
from quantum.plugins.cisco.db import network_db_v2 as cdb
71
71
    def _test_with_port_creation(self, cmd, params=None):
72
72
        """Tests commands that requires a port to exist"""
73
73
        LOG.debug("test_%s - START", cmd)
74
 
        net_uuid = str(uuid.uuid4())
 
74
        net_uuid = uuidutils.generate_uuid()
75
75
        device_params = self._ucs_inventory.create_port(tenant, net_uuid,
76
76
                                                        port_state,
77
77
                                                        state=port_state)