← Back to branch summary

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

« back to all changes in this revision

Viewing changes to quantum/plugins/cisco/db/models.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/db/models.py
1
1
# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
2
 
2
3
# Copyright 2011 Nicira Networks, Inc.
3
4
# All Rights Reserved.
4
5
#
17
18
# @author: Brad Hall, Nicira Networks, Inc.
18
19
# @author: Dan Wendlandt, Nicira Networks, Inc.
19
20
 
20
 
import uuid
21
 
 
22
21
from sqlalchemy import Column, String, ForeignKey
23
22
from sqlalchemy.ext.declarative import declarative_base
24
23
from sqlalchemy.orm import relation, object_mapper
25
24
 
 
25
from quantum.openstack.common import uuidutils
 
26
 
 
27
 
26
28
BASE = declarative_base()
27
29
 
28
30
 
74
76
    state = Column(String(8))
75
77
 
76
78
    def __init__(self, network_id):
77
 
        self.uuid = str(uuid.uuid4())
 
79
        self.uuid = uuidutils.generate_uuid()
78
80
        self.network_id = network_id
79
81
        self.state = "DOWN"
80
82
 
93
95
    ports = relation(Port, order_by=Port.uuid, backref="network")
94
96
 
95
97
    def __init__(self, tenant_id, name):
96
 
        self.uuid = str(uuid.uuid4())
 
98
        self.uuid = uuidutils.generate_uuid()
97
99
        self.tenant_id = tenant_id
98
100
        self.name = name
99
101