[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 380d79c7bcdd41d859bd3e8d2552c58b5d5cd11c
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Feb 26 14:38:14 2013 -0800

    Move argtypes to euca2ools.commands

diff --git a/euca2ools/commands/euca/argtypes.py b/euca2ools/commands/argtypes.py
similarity index 98%
rename from euca2ools/commands/euca/argtypes.py
rename to euca2ools/commands/argtypes.py
index e940eab..9e6bc50 100644
--- a/euca2ools/commands/euca/argtypes.py
+++ b/euca2ools/commands/argtypes.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 2012, Eucalyptus Systems, Inc.
+# Copyright (c) 2012-2013, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -33,7 +33,7 @@ import base64
 from requestbuilder import EMPTY
 import sys
 
-def block_device_mapping(map_as_str):
+def ec2_block_device_mapping(map_as_str):
     '''
     Parse a block device mapping from an image registration command line.
     '''
diff --git a/euca2ools/commands/euca/createtags.py b/euca2ools/commands/euca/createtags.py
index b68f910..83d4681 100644
--- a/euca2ools/commands/euca/createtags.py
+++ b/euca2ools/commands/euca/createtags.py
@@ -30,7 +30,7 @@
 
 from requestbuilder import Arg
 from . import EucalyptusRequest
-from .argtypes import binary_tag_def
+from ..argtypes import binary_tag_def
 
 class CreateTags(EucalyptusRequest):
     API_VERSION = '2010-08-31'
diff --git a/euca2ools/commands/euca/deletetags.py b/euca2ools/commands/euca/deletetags.py
index 1f96ae1..e2bcf00 100644
--- a/euca2ools/commands/euca/deletetags.py
+++ b/euca2ools/commands/euca/deletetags.py
@@ -30,7 +30,7 @@
 
 from requestbuilder import Arg
 from . import EucalyptusRequest
-from .argtypes import ternary_tag_def
+from ..argtypes import ternary_tag_def
 
 class DeleteTags(EucalyptusRequest):
     API_VERSION = '2010-08-31'
diff --git a/euca2ools/commands/euca/getpassword.py b/euca2ools/commands/euca/getpassword.py
index 2d353f5..4e863ef 100644
--- a/euca2ools/commands/euca/getpassword.py
+++ b/euca2ools/commands/euca/getpassword.py
@@ -31,7 +31,7 @@
 import base64
 from M2Crypto import RSA
 from requestbuilder import Arg
-from .argtypes import file_contents
+from ..argtypes import file_contents
 from .getpassworddata import GetPasswordData
 
 class GetPassword(GetPasswordData):
diff --git a/euca2ools/commands/euca/importkeypair.py b/euca2ools/commands/euca/importkeypair.py
index b422f3b..faa5299 100644
--- a/euca2ools/commands/euca/importkeypair.py
+++ b/euca2ools/commands/euca/importkeypair.py
@@ -31,7 +31,7 @@
 import base64
 from requestbuilder import Arg
 from . import EucalyptusRequest
-from .argtypes import file_contents
+from ..argtypes import file_contents
 
 class ImportKeyPair(EucalyptusRequest):
     API_VERSION = '2010-08-31'
diff --git a/euca2ools/commands/euca/registerimage.py b/euca2ools/commands/euca/registerimage.py
index 8efe1ea..8f4fa50 100644
--- a/euca2ools/commands/euca/registerimage.py
+++ b/euca2ools/commands/euca/registerimage.py
@@ -30,7 +30,7 @@
 
 from requestbuilder import Arg
 from . import EucalyptusRequest
-from .argtypes import block_device_mapping
+from ..argtypes import ec2_block_device_mapping
 
 class RegisterImage(EucalyptusRequest):
     DESCRIPTION = 'Register a new image'
diff --git a/euca2ools/commands/euca/runinstances.py b/euca2ools/commands/euca/runinstances.py
index 2ef1f59..a0ef543 100644
--- a/euca2ools/commands/euca/runinstances.py
+++ b/euca2ools/commands/euca/runinstances.py
@@ -34,7 +34,7 @@ import os.path
 from requestbuilder import Arg, MutuallyExclusiveArgList
 import sys
 from . import EucalyptusRequest
-from .argtypes import b64encoded_file_contents, block_device_mapping
+from ..argtypes import b64encoded_file_contents, ec2_block_device_mapping
 
 class RunInstances(EucalyptusRequest):
     DESCRIPTION = 'Launch instances of a machine image'

-- 
managing cloud instances for Eucalyptus