← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to contrib/boto_v6/ec2/instance.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman, Yolanda Robla, James Page
  • Date: 2013-01-11 13:06:56 UTC
  • mfrom: (1.1.67)
  • Revision ID: package-import@ubuntu.com-20130111130656-7n7fkevy03stm3mv
Tags: 2013.1~g2-0ubuntu1
https://launchpad.net/bugs/1086833
[ Chuck Short ]
* New upstream release.
* debian/patches/ubuntu-show-tests.patch: Dropped no longer needed.
* debian/nova-xcp-plugins.install: Fix xcp-plugins empty packages
* debian/control: Drop python-nose in favor or testrepository
* debian/control: Add python-coverage as a build dep.
* debian/rules, debian/control: Run pep8 tests.
* debian/*.init: Remove they are not needed and take up space
* debian/control, debian/nova-cells.{install, logrotate, upstart}: Add
  cells support.
* debian/patches/fix-ubuntu-tests.patch: temporarily disable failing tests.
* debian/control, debian/nova-baremetal.{install, logrotate, upstart}: Add
  nova baremetal support.
* debian/control: Remove python-support.

[ Adam Gandelman ]
* debian/*.manpages: Install Sphinx-generated manpages instead of
  our own.
* debian/nova-compute-*.conf: Specify the newly required compute_driver
  flag in addition to libvirt_type.
* debian/control:  Specify required python-webob and python-stevedore
  versions.

[ Yolanda Robla ]
* debian/*.upstart: Use start-stop-daemon instead of su for chuid
  (LP: #1086833).
* debian/rules: Remove override of dh_installinit for discriminating
  between Debian and Ubuntu.
* debian/nova-common.docs: Installing changelogs from rules
* debian/rules: Replacing perms in /etc/nova/logging.conf for 0644
* debian/control: adduser dependency on nova-compute.
* debian/control: added section oldlibs and priority extra on
  nova-ajax-console-proxy.
* debian/nova-xvpvncproxy.postrm: removing because of duplicates.

[ James Page ]
* d/control: Add ~ to python-sqlalchemy-ext versioned dependencies to
  make backporting easier.
* d/control: Updated nova-volume description and depdendencies to
  mark it as a transitional package, moved to oldlibs/extra.
* d/p/fix-libvirt-tests.patch: Dropped; accepted upstream.
* d/control: Added python-stevedore to BD's.
* d/*.postrm: Dropped postrm's that just run update-rc.d; this is not
  required when deploying upstart configurations only.
* d/nova-scheduler.manpages: Add man page for nova-rpc-zmq-receiver.
* d/rules: Install upstream changelog with a policy compliant name.
* d/control: Mark nova-compute-xcp as virtual package.
* d/control: nova-api-os-volume; Depend on cinder-api and mark as
  transitional package.
* d/nova-api-os-volume.lintian-overrides: Dropped - no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/boto_v6/ec2/instance.py
3
3
 
4
4
@author: Nachi Ueno <ueno.nachi@lab.ntt.co.jp>
5
5
'''
6
 
from boto.ec2 import instance
7
 
from boto import resultset
8
 
 
9
 
 
10
 
class ReservationV6(instance.Reservation):
 
6
from boto.ec2.instance import Group
 
7
from boto.ec2.instance import Instance
 
8
from boto.ec2.instance import Reservation
 
9
from boto.resultset import ResultSet
 
10
 
 
11
 
 
12
class ReservationV6(Reservation):
11
13
    def startElement(self, name, attrs, connection):
12
14
        if name == 'instancesSet':
13
 
            self.instances = resultset.ResultSet([('item', InstanceV6)])
 
15
            self.instances = ResultSet([('item', InstanceV6)])
14
16
            return self.instances
15
17
        elif name == 'groupSet':
16
 
            self.groups = resultset.ResultSet([('item', instance.Group)])
 
18
            self.groups = ResultSet([('item', Group)])
17
19
            return self.groups
18
20
        else:
19
21
            return None
20
22
 
21
23
 
22
 
class InstanceV6(instance.Instance):
 
24
class InstanceV6(Instance):
23
25
    def __init__(self, connection=None):
24
 
        instance.Instance.__init__(self, connection)
 
26
        Instance.__init__(self, connection)
25
27
        self.dns_name_v6 = None
26
28
 
27
29
    def endElement(self, name, value, connection):
28
 
        instance.Instance.endElement(self, name, value, connection)
 
30
        Instance.endElement(self, name, value, connection)
29
31
        if name == 'dnsNameV6':
30
32
            self.dns_name_v6 = value
31
33