← Back to branch summary

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

« back to all changes in this revision

Viewing changes to quantum/plugins/metaplugin/meta_db_v2.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-09-21 13:01:18 UTC
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20120921130118-6x31znohp1psfc74
Tags: upstream-2012.2~rc2
Import upstream version 2012.2~rc2

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/plugins/metaplugin/meta_db_v2.py
21
21
from quantum.plugins.metaplugin import meta_models_v2
22
22
 
23
23
 
24
 
def get_flavor_by_network(net_id):
25
 
    session = db.get_session()
 
24
def get_flavor_by_network(session, net_id):
26
25
    try:
27
26
        binding = (session.query(meta_models_v2.NetworkFlavor).
28
27
                   filter_by(network_id=net_id).
32
31
    return binding.flavor
33
32
 
34
33
 
35
 
def add_network_flavor_binding(flavor, net_id):
36
 
    session = db.get_session()
 
34
def add_network_flavor_binding(session, flavor, net_id):
37
35
    binding = meta_models_v2.NetworkFlavor(flavor=flavor, network_id=net_id)
38
36
    session.add(binding)
39
 
    session.flush()
40
37
    return binding
41
38
 
42
39
 
43
 
def get_flavor_by_router(router_id):
44
 
    session = db.get_session()
 
40
def get_flavor_by_router(session, router_id):
45
41
    try:
46
42
        binding = (session.query(meta_models_v2.RouterFlavor).
47
43
                   filter_by(router_id=router_id).
51
47
    return binding.flavor
52
48
 
53
49
 
54
 
def add_router_flavor_binding(flavor, router_id):
55
 
    session = db.get_session()
 
50
def add_router_flavor_binding(session, flavor, router_id):
56
51
    binding = meta_models_v2.RouterFlavor(flavor=flavor, router_id=router_id)
57
52
    session.add(binding)
58
 
    session.flush()
59
53
    return binding