diff options
| author | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-03-18 14:34:37 -0700 |
|---|---|---|
| committer | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-03-18 14:34:37 -0700 |
| commit | d6589138bd06e19851594e62fc515b964596bf61 (patch) | |
| tree | 73119c602645058c67316393a67c7a644820fdfc | |
| parent | 51ed0ccf8d841443561a476a03c3446844e1a0a8 (diff) | |
| download | nova-d6589138bd06e19851594e62fc515b964596bf61.tar.gz nova-d6589138bd06e19851594e62fc515b964596bf61.tar.xz nova-d6589138bd06e19851594e62fc515b964596bf61.zip | |
Fixed netadmin smoketests for ipv6
| -rw-r--r-- | contrib/boto_v6/ec2/connection.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/boto_v6/ec2/connection.py b/contrib/boto_v6/ec2/connection.py index faecae95e..868c93c11 100644 --- a/contrib/boto_v6/ec2/connection.py +++ b/contrib/boto_v6/ec2/connection.py @@ -4,8 +4,10 @@ Created on 2010/12/20 @author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp> ''' import boto +import base64 import boto.ec2 from boto_v6.ec2.instance import ReservationV6 +from boto.ec2.securitygroup import SecurityGroup class EC2ConnectionV6(boto.ec2.EC2Connection): @@ -101,7 +103,7 @@ class EC2ConnectionV6(boto.ec2.EC2Connection): with the Image. :rtype: Reservation - :return: The :class:`boto.ec2.instance.Reservation` + :return: The :class:`boto.ec2.instance.ReservationV6` associated with the request for machines """ params = {'ImageId': image_id, |