x
/
ec2-driver
Code Issues Proposed changes

Cam & Ed | Fix cloudwatch import, skip attach volume test with moto

This commit is contained in:
Ed Thome 2014-10-22 19:32:31 +00:00
parent 0a43cf2b3d
commit be513ea8ce
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ec2driver.py
View File

@ -17,15 +17,15 @@
from threading import Lock
import base64
import time
from ec2driver_config import *
from boto import ec2
import boto.ec2.cloudwatch
from boto import exception as boto_exc
from boto.exception import EC2ResponseError
from credentials import get_nova_creds
from boto.regioninfo import RegionInfo
from oslo.config import cfg
from novaclient.v1_1 import client
from ec2driver_config import *
from nova import block_device
from nova.compute import power_state
@ -38,10 +38,9 @@ from nova.openstack.common import log as logging
from nova.openstack.common import loopingcall
from nova.virt import driver
from nova.virt import virtapi
from nova.compute import flavors
from novaclient.v1_1 import client
from credentials import get_nova_creds
LOG = logging.getLogger(__name__)
ec2driver_opts = [

4
tests/test_ec2driver.py
View File

@ -173,8 +173,10 @@ class TestEC2Driver(EC2TestBase):
self.assertEqual(diagnostics['instance.instance_type'], 't2.micro')
self.assertEqual(diagnostics['instance._state'], 'running(16)')
@unittest.skipIf(os.environ.get('MOCK_EC2'), 'Not supported by moto')
def test_attach_volume(self):
volume = self.nova_volume.volumes.create(1, snapshot_id=None, display_name='test', display_description=None, volume_type=None, availability_zone=None, imageRef=None)
volume = self.nova_volume.volumes.create(1, snapshot_id=None, display_name='test', display_description=None,
volume_type=None, availability_zone=None, imageRef=None)
self.volumes.append(volume)
instance, instance_ref = self.spawn_ec2_instance()
self.nova.volumes.create_server_volume(instance_ref, volume.id, "/dev/sdb")