← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/api/openstack/compute/contrib/cloudpipe.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/compute/contrib/cloudpipe.py
16
16
 
17
17
import os
18
18
 
19
 
from nova.api.openstack import common
20
19
from nova.api.openstack import extensions
21
20
from nova.api.openstack import wsgi
22
21
from nova.api.openstack import xmlutil
23
22
from nova.auth import manager
24
23
from nova.cloudpipe import pipelib
25
24
from nova import compute
 
25
from nova.compute import utils as compute_utils
26
26
from nova.compute import vm_states
27
27
from nova import db
28
28
from nova import exception
29
29
from nova import flags
30
30
from nova import log as logging
31
31
from nova import network
 
32
from nova.openstack.common import timeutils
32
33
from nova import utils
33
34
 
34
35
 
90
91
            rv['state'] = 'pending'
91
92
            return rv
92
93
        rv['instance_id'] = instance['uuid']
93
 
        rv['created_at'] = utils.isotime(instance['created_at'])
94
 
        nw_info = common.get_nw_info_for_instance(elevated, instance)
 
94
        rv['created_at'] = timeutils.isotime(instance['created_at'])
 
95
        nw_info = compute_utils.get_nw_info_for_instance(instance)
95
96
        if not nw_info:
96
97
            return rv
97
98
        vif = nw_info[0]