← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/tests/fake_network.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/fake_network.py
15
15
# License for the specific language governing permissions and limitations
16
16
# under the License.
17
17
 
 
18
import nova.compute.utils
18
19
import nova.context
19
20
from nova import db
20
21
from nova import exception
21
22
from nova import flags
22
 
from nova import utils
23
 
import nova.compute.utils
24
23
from nova.network import manager as network_manager
25
24
from nova.network.quantum import nova_ipam_lib
26
25
from nova.tests import fake_network_cache_model
 
26
from nova import utils
27
27
 
28
28
 
29
29
HOST = "testhost"
120
120
        def network_get(self, context, network_id):
121
121
            return {'cidr_v6': '2001:db8:69:%x::/64' % network_id}
122
122
 
 
123
        def network_get_by_uuid(self, context, network_uuid):
 
124
            raise exception.NetworkNotFoundForUUID()
 
125
 
123
126
        def network_get_all(self, context):
124
127
            raise exception.NoNetworksFound()
125
128