[pkg-eucalyptus-commits] [euca2ools] 14/41: Fix NIC association printing

[Charles Plessy]

This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to branch master
in repository euca2ools.

commit bcedad54fbdb7876070fc71946fa60cffa0cb460
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Jul 12 14:17:38 2013 -0700

    Fix NIC association printing
    
    Fixes TOOLS-353
---
 euca2ools/commands/euca/__init__.py          |    3 ++-
 euca2ools/commands/euca/describeinstances.py |    2 +-
 euca2ools/commands/euca/runinstances.py      |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index d4ba10a..c7db28e 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -301,7 +301,8 @@ class EucalyptusRequest(AWSQueryRequest, TabifyingMixin):
                 'deleteOnTermination')]
             print self.tabify(['NICATTACHMENT'] + attachment_info)
         privaddresses = nic.get('privateIpAddressesSet', [])
-        for association in nic.get('association', []):
+        if nic.get('association'):
+            association = nic['association']
             # The EC2 tools apparently print private IP info in the
             # association even though that info doesn't appear there
             # in the response, so we have to look it up elsewhere.
diff --git a/euca2ools/commands/euca/describeinstances.py b/euca2ools/commands/euca/describeinstances.py
index b22e212..ec2e470 100644
--- a/euca2ools/commands/euca/describeinstances.py
+++ b/euca2ools/commands/euca/describeinstances.py
@@ -183,7 +183,7 @@ class DescribeInstances(EucalyptusRequest):
                       help='[VPC only] ID of the VPC the instance is in')]
     LIST_TAGS = ['reservationSet', 'instancesSet', 'groupSet', 'tagSet',
                  'blockDeviceMapping', 'productCodes', 'networkInterfaceSet',
-                 'association', 'privateIpAddressesSet']
+                 'privateIpAddressesSet']
 
     def print_result(self, result):
         for reservation in result.get('reservationSet'):
diff --git a/euca2ools/commands/euca/runinstances.py b/euca2ools/commands/euca/runinstances.py
index 28c117f..98cb3ff 100644
--- a/euca2ools/commands/euca/runinstances.py
+++ b/euca2ools/commands/euca/runinstances.py
@@ -136,7 +136,7 @@ class RunInstances(EucalyptusRequest):
 
     LIST_TAGS = ['reservationSet', 'instancesSet', 'groupSet', 'tagSet',
                  'blockDeviceMapping', 'productCodes', 'networkInterfaceSet',
-                 'association', 'privateIpAddressesSet']
+                 'privateIpAddressesSet']
 
     # noinspection PyExceptionInherit
     def configure(self):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-eucalyptus/euca2ools.git