Eucalyptus

Merge lp:~smoser/eucalyptus/euca2ools-1.0.fixes into lp:eucalyptus/euca2ools-1.0

  1. euca2ools-1.0.fixes
  2. Merge into euca2ools-1.0
Proposed by Scott Moser
Status: Merged
Merged at revision: not available
Proposed branch: lp:~smoser/eucalyptus/euca2ools-1.0.fixes
Merge into: lp:eucalyptus/euca2ools-1.0
Diff against target: 1182 lines (+160/-154)
43 files modified
bin/euca-add-group (+3/-3)
bin/euca-add-keypair (+3/-3)
bin/euca-allocate-address (+3/-3)
bin/euca-associate-address (+3/-3)
bin/euca-attach-volume (+3/-3)
bin/euca-authorize (+4/-2)
bin/euca-bundle-image (+3/-3)
bin/euca-bundle-vol (+3/-3)
bin/euca-confirm-product-instance (+3/-3)
bin/euca-create-snapshot (+3/-3)
bin/euca-create-volume (+3/-2)
bin/euca-delete-bundle (+3/-3)
bin/euca-delete-group (+3/-3)
bin/euca-delete-keypair (+3/-3)
bin/euca-delete-snapshot (+3/-3)
bin/euca-delete-volume (+3/-3)
bin/euca-deregister (+3/-3)
bin/euca-describe-addresses (+3/-3)
bin/euca-describe-availability-zones (+3/-3)
bin/euca-describe-groups (+3/-3)
bin/euca-describe-image-attribute (+3/-3)
bin/euca-describe-images (+3/-2)
bin/euca-describe-instances (+3/-3)
bin/euca-describe-keypairs (+3/-3)
bin/euca-describe-regions (+3/-3)
bin/euca-describe-snapshots (+3/-3)
bin/euca-describe-volumes (+3/-3)
bin/euca-detach-volume (+3/-3)
bin/euca-disassociate-address (+3/-3)
bin/euca-download-bundle (+3/-3)
bin/euca-get-console-output (+3/-3)
bin/euca-modify-image-attribute (+3/-3)
bin/euca-reboot-instances (+3/-3)
bin/euca-register (+3/-3)
bin/euca-release-address (+3/-3)
bin/euca-reset-image-attribute (+3/-3)
bin/euca-revoke (+3/-3)
bin/euca-run-instances (+3/-3)
bin/euca-terminate-instances (+3/-3)
bin/euca-unbundle (+3/-3)
bin/euca-upload-bundle (+3/-3)
bin/euca-version (+3/-3)
euca2ools/euca2ools/__init__.py (+33/-31)
To merge this branch: bzr merge lp:~smoser/eucalyptus/euca2ools-1.0.fixes
Reviewer Review Type Date Requested Status
Eucalyptus Maintainers Pending
Review via email: mp+20230@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

This branch fixes 2 small-ish problems with euca2ools.
- bug 526591
- Exception resulting in usage() would exit status=0 in most cases.
  In some, exceptions were ignored all together because usage did not sys.exit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/euca-add-group'
--- bin/euca-add-group 2010-02-21 03:44:16 +0000
+++ bin/euca-add-group 2010-02-26 15:47:11 +0000
@@ -50,10 +50,10 @@
50"""50"""
5151
5252
53def usage():53def usage(status=1):
54 print usage_string54 print usage_string
55 Util().usage()55 Util().usage()
56 sys.exit()56 sys.exit(status)
5757
58def version():58def version():
59 print Util().version()59 print Util().version()
@@ -78,7 +78,7 @@
78 if name in ('-d', '--description'):78 if name in ('-d', '--description'):
79 group_description = value79 group_description = value
80 elif name in ('-h', '--help'):80 elif name in ('-h', '--help'):
81 usage()81 usage(0)
82 elif name == '--version':82 elif name == '--version':
83 version()83 version()
84 84
8585
=== modified file 'bin/euca-add-keypair'
--- bin/euca-add-keypair 2010-02-21 03:44:16 +0000
+++ bin/euca-add-keypair 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -76,7 +76,7 @@
7676
77 for name, value in euca.opts:77 for name, value in euca.opts:
78 if name in ('-h', '--help'):78 if name in ('-h', '--help'):
79 usage()79 usage(0)
80 elif name == '--version':80 elif name == '--version':
81 version()81 version()
82 82
8383
=== modified file 'bin/euca-allocate-address'
--- bin/euca-allocate-address 2010-02-21 03:44:16 +0000
+++ bin/euca-allocate-address 2010-02-26 15:47:11 +0000
@@ -45,10 +45,10 @@
45"""45"""
4646
4747
48def usage():48def usage(status=1):
49 print usage_string49 print usage_string
50 Util().usage()50 Util().usage()
51 sys.exit()51 sys.exit(status)
52 52
53def version():53def version():
54 print Util().version()54 print Util().version()
@@ -64,7 +64,7 @@
64 64
65 for name, value in euca.opts:65 for name, value in euca.opts:
66 if name in ('-h', '--help'):66 if name in ('-h', '--help'):
67 usage()67 usage(0)
68 elif name == '--version':68 elif name == '--version':
69 version()69 version()
70 70
7171
=== modified file 'bin/euca-associate-address'
--- bin/euca-associate-address 2010-02-21 03:44:16 +0000
+++ bin/euca-associate-address 2010-02-26 15:47:11 +0000
@@ -52,10 +52,10 @@
52"""52"""
5353
5454
55def usage():55def usage(status=1):
56 print usage_string56 print usage_string
57 Util().usage()57 Util().usage()
58 sys.exit()58 sys.exit(status)
5959
60def version():60def version():
61 print Util().version()61 print Util().version()
@@ -76,7 +76,7 @@
76 if name in ('-i', '--instance'):76 if name in ('-i', '--instance'):
77 instance_id = value77 instance_id = value
78 elif name in ('-h', '--help'):78 elif name in ('-h', '--help'):
79 usage()79 usage(0)
80 elif name == '--version':80 elif name == '--version':
81 version()81 version()
82 82
8383
=== modified file 'bin/euca-attach-volume'
--- bin/euca-attach-volume 2010-02-21 03:44:16 +0000
+++ bin/euca-attach-volume 2010-02-26 15:47:11 +0000
@@ -54,10 +54,10 @@
54"""54"""
5555
5656
57def usage():57def usage(status=1):
58 print usage_string58 print usage_string
59 Util().usage()59 Util().usage()
60 sys.exit()60 sys.exit(status)
6161
62def version():62def version():
63 print Util().version()63 print Util().version()
@@ -82,7 +82,7 @@
82 elif name in ('-d', '--device'):82 elif name in ('-d', '--device'):
83 device = value 83 device = value
84 elif name in ('-h', '--help'):84 elif name in ('-h', '--help'):
85 usage()85 usage(0)
86 elif name == '--version':86 elif name == '--version':
87 version()87 version()
88 88
8989
=== modified file 'bin/euca-authorize'
--- bin/euca-authorize 2010-02-16 20:46:57 +0000
+++ bin/euca-authorize 2010-02-26 15:47:11 +0000
@@ -64,9 +64,11 @@
64"""64"""
6565
6666
67def usage():67def usage(status=1):
68 print usage_string68 print usage_string
69 Util().usage(compat=True)69 Util().usage(compat=True)
70 sys.exit(status)
71
7072
71def version():73def version():
72 print Util().version()74 print Util().version()
@@ -116,7 +118,7 @@
116 print "port must be an integer."118 print "port must be an integer."
117 sys.exit(1)119 sys.exit(1)
118 elif name in ('-h', '--help'):120 elif name in ('-h', '--help'):
119 usage()121 usage(0)
120 elif name == '--version':122 elif name == '--version':
121 version()123 version()
122124
123125
=== modified file 'bin/euca-bundle-image'
--- bin/euca-bundle-image 2010-02-21 03:44:16 +0000
+++ bin/euca-bundle-image 2010-02-26 15:47:11 +0000
@@ -74,10 +74,10 @@
74"""74"""
7575
7676
77def usage():77def usage(status=1):
78 print usage_string78 print usage_string
79 Util().usage()79 Util().usage()
80 sys.exit()80 sys.exit(status)
8181
82def version():82def version():
83 print Util().version()83 print Util().version()
@@ -142,7 +142,7 @@
142 142
143 for name, value in euca.opts:143 for name, value in euca.opts:
144 if name in ('-h', '--help'):144 if name in ('-h', '--help'):
145 usage()145 usage(0)
146 elif name in ('-i', '--image'):146 elif name in ('-i', '--image'):
147 image_path = value147 image_path = value
148 elif name in ('-c', '--cert'):148 elif name in ('-c', '--cert'):
149149
=== modified file 'bin/euca-bundle-vol'
--- bin/euca-bundle-vol 2010-02-21 03:44:16 +0000
+++ bin/euca-bundle-vol 2010-02-26 15:47:11 +0000
@@ -89,9 +89,9 @@
89MAX_IMAGE_SIZE = 1024 * 1089MAX_IMAGE_SIZE = 1024 * 10
9090
9191
92def usage():92def usage(status=1):
93 print usage_string93 print usage_string
94 sys.exit()94 sys.exit(status)
9595
96def version():96def version():
97 print Util().version()97 print Util().version()
@@ -218,7 +218,7 @@
218 218
219 for name, value in euca.opts:219 for name, value in euca.opts:
220 if name in ('-h', '--help'):220 if name in ('-h', '--help'):
221 usage()221 usage(0)
222 elif name in ('-c', '--cert'):222 elif name in ('-c', '--cert'):
223 cert_path = value223 cert_path = value
224 elif name in ('-k', '--privatekey'):224 elif name in ('-k', '--privatekey'):
225225
=== modified file 'bin/euca-confirm-product-instance'
--- bin/euca-confirm-product-instance 2010-02-21 03:44:16 +0000
+++ bin/euca-confirm-product-instance 2010-02-26 15:47:11 +0000
@@ -51,10 +51,10 @@
51"""51"""
5252
5353
54def usage():54def usage(status=1):
55 print usage_string55 print usage_string
56 Util().usage()56 Util().usage()
57 sys.exit()57 sys.exit(status)
5858
59def version():59def version():
60 print Util().version()60 print Util().version()
@@ -76,7 +76,7 @@
76 if name in ('-i', '--instance'):76 if name in ('-i', '--instance'):
77 instance_id = value77 instance_id = value
78 elif name in ('-h', '--help'):78 elif name in ('-h', '--help'):
79 usage()79 usage(0)
80 elif name == '--version':80 elif name == '--version':
81 version()81 version()
82 82
8383
=== modified file 'bin/euca-create-snapshot'
--- bin/euca-create-snapshot 2010-02-21 03:44:16 +0000
+++ bin/euca-create-snapshot 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -76,7 +76,7 @@
7676
77 for name, value in euca.opts:77 for name, value in euca.opts:
78 if name in ('-h', '--help'):78 if name in ('-h', '--help'):
79 usage()79 usage(0)
80 elif name == '--version':80 elif name == '--version':
81 version()81 version()
82 82
8383
=== modified file 'bin/euca-create-volume'
--- bin/euca-create-volume 2010-02-16 20:46:57 +0000
+++ bin/euca-create-volume 2010-02-26 15:47:11 +0000
@@ -54,9 +54,10 @@
54"""54"""
5555
5656
57def usage():57def usage(status=1):
58 print usage_string58 print usage_string
59 Util().usage(compat=True)59 Util().usage(compat=True)
60 sys.exit(status)
6061
61def version():62def version():
62 print Util().version()63 print Util().version()
@@ -98,7 +99,7 @@
98 elif name == '--snapshot':99 elif name == '--snapshot':
99 snapshot_id = value 100 snapshot_id = value
100 elif name in ('-h', '--help'):101 elif name in ('-h', '--help'):
101 usage()102 usage(0)
102 elif name == '--version':103 elif name == '--version':
103 version()104 version()
104105
105106
=== modified file 'bin/euca-delete-bundle'
--- bin/euca-delete-bundle 2010-02-21 03:44:16 +0000
+++ bin/euca-delete-bundle 2010-02-26 15:47:11 +0000
@@ -66,10 +66,10 @@
66"""66"""
6767
6868
69def usage():69def usage(status=1):
70 print usage_string70 print usage_string
71 Util().usage()71 Util().usage()
72 sys.exit()72 sys.exit(status)
7373
74def version():74def version():
75 print Util().version()75 print Util().version()
@@ -197,7 +197,7 @@
197197
198 for name, value in euca.opts:198 for name, value in euca.opts:
199 if name in ('-h', '--help'):199 if name in ('-h', '--help'):
200 usage()200 usage(0)
201 elif name in ('-b', '--bucket'):201 elif name in ('-b', '--bucket'):
202 bucket = value202 bucket = value
203 elif name in ('-m', '--manifest'):203 elif name in ('-m', '--manifest'):
204204
=== modified file 'bin/euca-delete-group'
--- bin/euca-delete-group 2010-02-21 03:44:16 +0000
+++ bin/euca-delete-group 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -70,7 +70,7 @@
7070
71 for name, value in euca.opts:71 for name, value in euca.opts:
72 if name in ('-h', '--help'):72 if name in ('-h', '--help'):
73 usage()73 usage(0)
74 elif name == '--version':74 elif name == '--version':
75 version()75 version()
76 76
7777
=== modified file 'bin/euca-delete-keypair'
--- bin/euca-delete-keypair 2010-02-21 03:44:16 +0000
+++ bin/euca-delete-keypair 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -74,7 +74,7 @@
7474
75 for name, value in euca.opts:75 for name, value in euca.opts:
76 if name in ('-h', '--help'):76 if name in ('-h', '--help'):
77 usage()77 usage(0)
78 elif name == '--version':78 elif name == '--version':
79 version()79 version()
80 80
8181
=== modified file 'bin/euca-delete-snapshot'
--- bin/euca-delete-snapshot 2010-02-21 03:44:16 +0000
+++ bin/euca-delete-snapshot 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -70,7 +70,7 @@
7070
71 for name, value in euca.opts:71 for name, value in euca.opts:
72 if name in ('-h', '--help'):72 if name in ('-h', '--help'):
73 usage()73 usage(0)
74 elif name == '--version':74 elif name == '--version':
75 version()75 version()
76 76
7777
=== modified file 'bin/euca-delete-volume'
--- bin/euca-delete-volume 2010-02-21 03:44:16 +0000
+++ bin/euca-delete-volume 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -71,7 +71,7 @@
7171
72 for name, value in euca.opts:72 for name, value in euca.opts:
73 if name in ('-h', '--help'):73 if name in ('-h', '--help'):
74 usage()74 usage(0)
75 elif name == '--version':75 elif name == '--version':
76 version()76 version()
77 77
7878
=== modified file 'bin/euca-deregister'
--- bin/euca-deregister 2010-02-21 03:44:16 +0000
+++ bin/euca-deregister 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -69,7 +69,7 @@
6969
70 for name, value in euca.opts:70 for name, value in euca.opts:
71 if name in ('-h', '--help'):71 if name in ('-h', '--help'):
72 usage()72 usage(0)
73 elif name == '--version':73 elif name == '--version':
74 version()74 version()
75 elif name == '--debug':75 elif name == '--debug':
7676
=== modified file 'bin/euca-describe-addresses'
--- bin/euca-describe-addresses 2010-02-21 03:44:16 +0000
+++ bin/euca-describe-addresses 2010-02-26 15:47:11 +0000
@@ -47,10 +47,10 @@
47"""47"""
4848
4949
50def usage():50def usage(status=1):
51 print usage_string51 print usage_string
52 Util().usage()52 Util().usage()
53 sys.exit()53 sys.exit(status)
5454
55def version():55def version():
56 print Util().version()56 print Util().version()
@@ -77,7 +77,7 @@
7777
78 for name, value in euca.opts:78 for name, value in euca.opts:
79 if name in ('-h', '--help'):79 if name in ('-h', '--help'):
80 usage()80 usage(0)
81 elif name == '--version':81 elif name == '--version':
82 version()82 version()
8383
8484
=== modified file 'bin/euca-describe-availability-zones'
--- bin/euca-describe-availability-zones 2010-02-21 03:44:16 +0000
+++ bin/euca-describe-availability-zones 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -77,7 +77,7 @@
77 if name == '--region':77 if name == '--region':
78 region = value78 region = value
79 elif name in ('-h', '--help'):79 elif name in ('-h', '--help'):
80 usage()80 usage(0)
81 elif name == '--version':81 elif name == '--version':
82 version()82 version()
8383
8484
=== modified file 'bin/euca-describe-groups'
--- bin/euca-describe-groups 2010-02-21 03:44:16 +0000
+++ bin/euca-describe-groups 2010-02-26 15:47:11 +0000
@@ -47,10 +47,10 @@
47"""47"""
4848
4949
50def usage():50def usage(status=1):
51 print usage_string51 print usage_string
52 Util().usage()52 Util().usage()
53 sys.exit()53 sys.exit(status)
5454
55def version():55def version():
56 print Util().version()56 print Util().version()
@@ -90,7 +90,7 @@
90 90
91 for name, value in euca.opts:91 for name, value in euca.opts:
92 if name in ('-h', '--help'):92 if name in ('-h', '--help'):
93 usage()93 usage(0)
94 elif name == '--version':94 elif name == '--version':
95 version()95 version()
9696
9797
=== modified file 'bin/euca-describe-image-attribute'
--- bin/euca-describe-image-attribute 2010-02-21 03:44:16 +0000
+++ bin/euca-describe-image-attribute 2010-02-26 15:47:11 +0000
@@ -57,10 +57,10 @@
57"""57"""
5858
5959
60def usage():60def usage(status=1):
61 print usage_string61 print usage_string
62 Util().usage()62 Util().usage()
63 sys.exit()63 sys.exit(status)
6464
65def version():65def version():
66 print Util().version()66 print Util().version()
@@ -116,7 +116,7 @@
116 if not image_attribute:116 if not image_attribute:
117 image_attribute = 'ramdisk'117 image_attribute = 'ramdisk'
118 elif name in ('-h', '--help'):118 elif name in ('-h', '--help'):
119 usage()119 usage(0)
120 elif name == '--version':120 elif name == '--version':
121 version()121 version()
122 122
123123
=== modified file 'bin/euca-describe-images'
--- bin/euca-describe-images 2010-02-25 00:49:25 +0000
+++ bin/euca-describe-images 2010-02-26 15:47:11 +0000
@@ -53,9 +53,10 @@
53"""53"""
5454
5555
56def usage():56def usage(status=1):
57 print usage_string57 print usage_string
58 Util().usage(compat=True)58 Util().usage(compat=True)
59 sys.exit(status)
5960
60def version():61def version():
61 print Util().version()62 print Util().version()
@@ -98,7 +99,7 @@
9899
99 for name, value in euca.opts:100 for name, value in euca.opts:
100 if name in ('-h', '--help'):101 if name in ('-h', '--help'):
101 usage()102 usage(0)
102 elif name == '-x':103 elif name == '-x':
103 if defaults:104 if defaults:
104 executable_by = []105 executable_by = []
105106
=== modified file 'bin/euca-describe-instances'
--- bin/euca-describe-instances 2010-02-21 03:44:16 +0000
+++ bin/euca-describe-instances 2010-02-26 15:47:11 +0000
@@ -48,10 +48,10 @@
48"""48"""
4949
5050
51def usage():51def usage(status=1):
52 print usage_string52 print usage_string
53 Util().usage()53 Util().usage()
54 sys.exit()54 sys.exit(status)
5555
56def version():56def version():
57 print Util().version()57 print Util().version()
@@ -114,7 +114,7 @@
114 114
115 for name, value in euca.opts:115 for name, value in euca.opts:
116 if name in ('-h', '--help'):116 if name in ('-h', '--help'):
117 usage()117 usage(0)
118 elif name == '--version':118 elif name == '--version':
119 version()119 version()
120120
121121
=== modified file 'bin/euca-describe-keypairs'
--- bin/euca-describe-keypairs 2010-02-21 03:44:16 +0000
+++ bin/euca-describe-keypairs 2010-02-26 15:47:11 +0000
@@ -48,10 +48,10 @@
48"""48"""
4949
5050
51def usage():51def usage(status=1):
52 print usage_string52 print usage_string
53 Util().usage()53 Util().usage()
54 sys.exit()54 sys.exit(status)
5555
56def version():56def version():
57 print Util().version()57 print Util().version()
@@ -79,7 +79,7 @@
7979
80 for name, value in euca.opts:80 for name, value in euca.opts:
81 if name in ('-h', '--help'):81 if name in ('-h', '--help'):
82 usage()82 usage(0)
83 elif name == '--version':83 elif name == '--version':
84 version()84 version()
85 85
8686
=== modified file 'bin/euca-describe-regions'
--- bin/euca-describe-regions 2010-02-21 03:44:16 +0000
+++ bin/euca-describe-regions 2010-02-26 15:47:11 +0000
@@ -48,10 +48,10 @@
48"""48"""
4949
5050
51def usage():51def usage(status=1):
52 print usage_string52 print usage_string
53 Util().usage()53 Util().usage()
54 sys.exit()54 sys.exit(status)
5555
56def version():56def version():
57 print Util().version()57 print Util().version()
@@ -78,7 +78,7 @@
78 78
79 for name, value in euca.opts:79 for name, value in euca.opts:
80 if name in ('-h', '--help'):80 if name in ('-h', '--help'):
81 usage()81 usage(0)
82 elif name == '--version':82 elif name == '--version':
83 version()83 version()
8484
8585
=== modified file 'bin/euca-describe-snapshots'
--- bin/euca-describe-snapshots 2010-02-21 03:44:16 +0000
+++ bin/euca-describe-snapshots 2010-02-26 15:47:11 +0000
@@ -48,10 +48,10 @@
48"""48"""
4949
5050
51def usage():51def usage(status=1):
52 print usage_string52 print usage_string
53 Util().usage()53 Util().usage()
54 sys.exit()54 sys.exit(status)
5555
56def version():56def version():
57 print Util().version()57 print Util().version()
@@ -79,7 +79,7 @@
79 79
80 for name, value in euca.opts:80 for name, value in euca.opts:
81 if name in ('-h', '--help'):81 if name in ('-h', '--help'):
82 usage()82 usage(0)
83 elif name == '--version':83 elif name == '--version':
84 version()84 version()
85 85
8686
=== modified file 'bin/euca-describe-volumes'
--- bin/euca-describe-volumes 2010-02-21 03:44:16 +0000
+++ bin/euca-describe-volumes 2010-02-26 15:47:11 +0000
@@ -48,10 +48,10 @@
48"""48"""
4949
5050
51def usage():51def usage(status=1):
52 print usage_string52 print usage_string
53 Util().usage()53 Util().usage()
54 sys.exit()54 sys.exit(status)
5555
56def version():56def version():
57 print Util().version()57 print Util().version()
@@ -94,7 +94,7 @@
94 94
95 for name, value in euca.opts:95 for name, value in euca.opts:
96 if name in ('-h', '--help'):96 if name in ('-h', '--help'):
97 usage()97 usage(0)
98 elif name == '--version':98 elif name == '--version':
99 version()99 version()
100 100
101101
=== modified file 'bin/euca-detach-volume'
--- bin/euca-detach-volume 2010-02-21 03:44:16 +0000
+++ bin/euca-detach-volume 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -84,7 +84,7 @@
84 elif name in ('-d', '--device'):84 elif name in ('-d', '--device'):
85 device = value 85 device = value
86 elif name in ('-h', '--help'):86 elif name in ('-h', '--help'):
87 usage()87 usage(0)
88 elif name == '--version':88 elif name == '--version':
89 version()89 version()
9090
9191
=== modified file 'bin/euca-disassociate-address'
--- bin/euca-disassociate-address 2010-02-21 03:44:16 +0000
+++ bin/euca-disassociate-address 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -70,7 +70,7 @@
7070
71 for name, value in euca.opts:71 for name, value in euca.opts:
72 if name in ('-h', '--help'):72 if name in ('-h', '--help'):
73 usage()73 usage(0)
74 elif name == '--version':74 elif name == '--version':
75 version()75 version()
7676
7777
=== modified file 'bin/euca-download-bundle'
--- bin/euca-download-bundle 2010-02-21 03:44:16 +0000
+++ bin/euca-download-bundle 2010-02-26 15:47:11 +0000
@@ -58,10 +58,10 @@
58"""58"""
5959
6060
61def usage():61def usage(status=1):
62 print usage_string62 print usage_string
63 Util().usage()63 Util().usage()
64 sys.exit()64 sys.exit(status)
6565
66def version():66def version():
67 print Util().version()67 print Util().version()
@@ -141,7 +141,7 @@
141141
142 for name, value in euca.opts:142 for name, value in euca.opts:
143 if name in ('-h', '--help'):143 if name in ('-h', '--help'):
144 usage()144 usage(0)
145 elif name in ('-d', '--directory'):145 elif name in ('-d', '--directory'):
146 directory = value146 directory = value
147 elif name in ('-b', '--bucket'):147 elif name in ('-b', '--bucket'):
148148
=== modified file 'bin/euca-get-console-output'
--- bin/euca-get-console-output 2010-02-21 03:44:16 +0000
+++ bin/euca-get-console-output 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -74,7 +74,7 @@
7474
75 for name, value in euca.opts:75 for name, value in euca.opts:
76 if name in ('-h', '--help'):76 if name in ('-h', '--help'):
77 usage()77 usage(0)
78 elif name == '--version':78 elif name == '--version':
79 version()79 version()
80 elif name == '--debug':80 elif name == '--debug':
8181
=== modified file 'bin/euca-modify-image-attribute'
--- bin/euca-modify-image-attribute 2010-02-16 20:46:57 +0000
+++ bin/euca-modify-image-attribute 2010-02-26 15:47:11 +0000
@@ -58,13 +58,13 @@
58"""58"""
5959
6060
61def usage():61def usage(status=1):
62 print usage_string62 print usage_string
63 Util().usage(compat=True)63 Util().usage(compat=True)
6464
65def version():65def version():
66 print Util().version()66 print Util().version()
67 sys.exit()67 sys.exit(status)
6868
69def main():69def main():
70 euca = None70 euca = None
@@ -99,7 +99,7 @@
99 entity = value 99 entity = value
100 operation_type = 'remove'100 operation_type = 'remove'
101 elif name in ('-h', '--help'):101 elif name in ('-h', '--help'):
102 usage()102 usage(0)
103 elif name == '--version':103 elif name == '--version':
104 version()104 version()
105 105
106106
=== modified file 'bin/euca-reboot-instances'
--- bin/euca-reboot-instances 2010-02-21 03:44:16 +0000
+++ bin/euca-reboot-instances 2010-02-26 15:47:11 +0000
@@ -48,10 +48,10 @@
48"""48"""
4949
5050
51def usage():51def usage(status=1):
52 print usage_string52 print usage_string
53 Util().usage()53 Util().usage()
54 sys.exit()54 sys.exit(status)
5555
56def version():56def version():
57 print Util().version()57 print Util().version()
@@ -67,7 +67,7 @@
67 67
68 for name, value in euca.opts:68 for name, value in euca.opts:
69 if name in ('-h', '--help'):69 if name in ('-h', '--help'):
70 usage()70 usage(0)
71 elif name == '--version':71 elif name == '--version':
72 version()72 version()
7373
7474
=== modified file 'bin/euca-register'
--- bin/euca-register 2010-02-21 03:44:16 +0000
+++ bin/euca-register 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -70,7 +70,7 @@
7070
71 for name, value in euca.opts:71 for name, value in euca.opts:
72 if name in ('-h', '--help'):72 if name in ('-h', '--help'):
73 usage()73 usage(0)
74 elif name == '--version':74 elif name == '--version':
75 version()75 version()
7676
7777
=== modified file 'bin/euca-release-address'
--- bin/euca-release-address 2010-02-21 03:44:16 +0000
+++ bin/euca-release-address 2010-02-26 15:47:11 +0000
@@ -49,10 +49,10 @@
49"""49"""
5050
5151
52def usage():52def usage(status=1):
53 print usage_string53 print usage_string
54 Util().usage()54 Util().usage()
55 sys.exit()55 sys.exit(status)
5656
57def version():57def version():
58 print Util().version()58 print Util().version()
@@ -70,7 +70,7 @@
7070
71 for name, value in euca.opts:71 for name, value in euca.opts:
72 if name in ('-h', '--help'):72 if name in ('-h', '--help'):
73 usage()73 usage(0)
74 elif name == '--version':74 elif name == '--version':
75 version()75 version()
7676
7777
=== modified file 'bin/euca-reset-image-attribute'
--- bin/euca-reset-image-attribute 2010-02-21 03:44:16 +0000
+++ bin/euca-reset-image-attribute 2010-02-26 15:47:11 +0000
@@ -52,10 +52,10 @@
52"""52"""
5353
5454
55def usage():55def usage(status=1):
56 print usage_string56 print usage_string
57 Util().usage()57 Util().usage()
58 sys.exit()58 sys.exit(status)
5959
60def version():60def version():
61 print Util().version()61 print Util().version()
@@ -78,7 +78,7 @@
78 if not image_attribute:78 if not image_attribute:
79 image_attribute = 'launchPermission'79 image_attribute = 'launchPermission'
80 elif name in ('-h', '--help'):80 elif name in ('-h', '--help'):
81 usage()81 usage(0)
82 elif name == '--version':82 elif name == '--version':
83 version()83 version()
8484
8585
=== modified file 'bin/euca-revoke'
--- bin/euca-revoke 2010-02-16 20:46:57 +0000
+++ bin/euca-revoke 2010-02-26 15:47:11 +0000
@@ -64,13 +64,13 @@
64"""64"""
6565
6666
67def usage():67def usage(status=1):
68 print usage_string68 print usage_string
69 Util().usage(compat=True)69 Util().usage(compat=True)
7070
71def version():71def version():
72 print Util().version()72 print Util().version()
73 sys.exit()73 sys.exit(status)
7474
75def main():75def main():
76 euca = None76 euca = None
@@ -117,7 +117,7 @@
117 print "port must be an integer."117 print "port must be an integer."
118 sys.exit(1)118 sys.exit(1)
119 elif name in ('-h', '--help'):119 elif name in ('-h', '--help'):
120 usage()120 usage(0)
121 elif name == '--version':121 elif name == '--version':
122 version()122 version()
123123
124124
=== modified file 'bin/euca-run-instances'
--- bin/euca-run-instances 2010-02-21 03:44:16 +0000
+++ bin/euca-run-instances 2010-02-26 15:47:11 +0000
@@ -71,10 +71,10 @@
71"""71"""
7272
7373
74def usage():74def usage(status=1):
75 print usage_string75 print usage_string
76 Util().usage()76 Util().usage()
77 sys.exit()77 sys.exit(status)
7878
79def version():79def version():
80 print Util().version()80 print Util().version()
@@ -152,7 +152,7 @@
152 elif name in ('-z', '--availability-zone'):152 elif name in ('-z', '--availability-zone'):
153 zone = value153 zone = value
154 elif name in ('-h', '--help'):154 elif name in ('-h', '--help'):
155 usage()155 usage(0)
156 elif name == '--version':156 elif name == '--version':
157 version()157 version()
158158
159159
=== modified file 'bin/euca-terminate-instances'
--- bin/euca-terminate-instances 2010-02-21 03:44:16 +0000
+++ bin/euca-terminate-instances 2010-02-26 15:47:11 +0000
@@ -50,10 +50,10 @@
50"""50"""
5151
5252
53def usage():53def usage(status=1):
54 print usage_string54 print usage_string
55 Util().usage()55 Util().usage()
56 sys.exit()56 sys.exit(status)
5757
58def version():58def version():
59 print Util().version()59 print Util().version()
@@ -73,7 +73,7 @@
73 73
74 for name, value in euca.opts:74 for name, value in euca.opts:
75 if name in ('-h', '--help'):75 if name in ('-h', '--help'):
76 usage()76 usage(0)
77 elif name == '--version':77 elif name == '--version':
78 version()78 version()
7979
8080
=== modified file 'bin/euca-unbundle'
--- bin/euca-unbundle 2010-02-21 03:44:16 +0000
+++ bin/euca-unbundle 2010-02-26 15:47:11 +0000
@@ -69,10 +69,10 @@
69IMAGE_IO_CHUNK = 8 * 102469IMAGE_IO_CHUNK = 8 * 1024
70IMAGE_SPLIT_CHUNK = IMAGE_IO_CHUNK * 1024;70IMAGE_SPLIT_CHUNK = IMAGE_IO_CHUNK * 1024;
7171
72def usage():72def usage(status=1):
73 print usage_string73 print usage_string
74 Util().usage()74 Util().usage()
75 sys.exit()75 sys.exit(status)
7676
77def version():77def version():
78 print Util().version()78 print Util().version()
@@ -98,7 +98,7 @@
98 98
99 for name, value in euca.opts:99 for name, value in euca.opts:
100 if name in ('-h', '--help'):100 if name in ('-h', '--help'):
101 usage()101 usage(0)
102 elif name in ('-k', '--privatekey'):102 elif name in ('-k', '--privatekey'):
103 private_key_path = value103 private_key_path = value
104 elif name in ('-m', '--manifest'):104 elif name in ('-m', '--manifest'):
105105
=== modified file 'bin/euca-upload-bundle'
--- bin/euca-upload-bundle 2010-02-21 03:44:16 +0000
+++ bin/euca-upload-bundle 2010-02-26 15:47:11 +0000
@@ -67,10 +67,10 @@
67"""67"""
6868
6969
70def usage():70def usage(status=1):
71 print usage_string71 print usage_string
72 Util().usage()72 Util().usage()
73 sys.exit()73 sys.exit(status)
7474
75def version():75def version():
76 print Util().version()76 print Util().version()
@@ -178,7 +178,7 @@
178178
179 for name, value in euca.opts:179 for name, value in euca.opts:
180 if name in ('-h', '--help'):180 if name in ('-h', '--help'):
181 usage()181 usage(0)
182 elif name in ('-b', '--bucket'):182 elif name in ('-b', '--bucket'):
183 bucket = value183 bucket = value
184 elif name in ('-m', '--manifest'):184 elif name in ('-m', '--manifest'):
185185
=== modified file 'bin/euca-version'
--- bin/euca-version 2010-02-16 20:46:57 +0000
+++ bin/euca-version 2010-02-26 15:47:11 +0000
@@ -46,9 +46,9 @@
46"""46"""
4747
4848
49def usage():49def usage(status=1):
50 print usage_string50 print usage_string
51 sys.exit()51 sys.exit(status)
5252
53def version():53def version():
54 print Util().version()54 print Util().version()
@@ -67,7 +67,7 @@
67 67
68 for name, value in euca.opts:68 for name, value in euca.opts:
69 if name in ('-h', '--help'):69 if name in ('-h', '--help'):
70 usage()70 usage(0)
7171
72 display_tools_version()72 display_tools_version()
7373
7474
=== modified file 'euca2ools/euca2ools/__init__.py'
--- euca2ools/euca2ools/__init__.py 2010-02-21 03:44:16 +0000
+++ euca2ools/euca2ools/__init__.py 2010-02-26 15:47:11 +0000
@@ -346,47 +346,25 @@
346 SYSTEM_EUCARC_PATH = os.path.join("/etc", "euca2ools", "eucarc")346 SYSTEM_EUCARC_PATH = os.path.join("/etc", "euca2ools", "eucarc")
347 347
348 def setup_environ(self):348 def setup_environ(self):
349 envlist = ( 'EC2_ACCESS_KEY', 'EC2_SECRET_KEY', 'S3_URL', 'EC2_URL',
350 'EC2_CERT', 'EC2_PRIVATE_KEY', 'EUCALYPTUS_CERT',
351 'EC2_USER_ID' )
349 self.environ = {}352 self.environ = {}
350 user_eucarc = None353 user_eucarc = None
351 if 'HOME' in os.environ:354 if 'HOME' in os.environ:
352 user_eucarc = os.path.join(os.getenv('HOME'), ".eucarc")355 user_eucarc = os.path.join(os.getenv('HOME'), ".eucarc")
353 base_path = None
354 read_config = False356 read_config = False
355 if self.config_file_path and os.path.exists(self.config_file_path):357 if self.config_file_path and os.path.exists(self.config_file_path):
356 base_path = os.path.dirname(self.config_file_path)358 read_config = self.config_file_path
357 eucarc = open(self.config_file_path, "r")
358 read_config = True
359 elif user_eucarc is not None and os.path.exists(user_eucarc):359 elif user_eucarc is not None and os.path.exists(user_eucarc):
360 base_path = os.path.dirname(user_eucarc)360 read_config = user_eucarc
361 eucarc = open(user_eucarc, "r")
362 read_config = True
363 elif os.path.exists(self.SYSTEM_EUCARC_PATH):361 elif os.path.exists(self.SYSTEM_EUCARC_PATH):
364 base_path = os.path.dirname(self.SYSTEM_EUCARC_PATH)362 read_config = self.SYSTEM_EUCARC_PATH
365 eucarc = open(self.SYSTEM_EUCARC_PATH, "r")
366 read_config = True
367 if read_config: 363 if read_config:
368 lines = eucarc.readlines()364 parse_config(read_config, self.environ, envlist)
369 comment = re.compile('^#')
370 for line in lines:
371 line = line.strip('export')
372 line = line.replace('\'', '')
373 line = line.strip()
374 line = line.replace('${EUCA_KEY_DIR}', base_path)
375 if not comment.match(line):
376 parts = line.split('=', 1)
377 if len(parts) == 2:
378 self.environ[parts[0]] = parts[1]
379 eucarc.close()
380
381 else:365 else:
382 self.environ['EC2_ACCESS_KEY'] = os.getenv('EC2_ACCESS_KEY')366 for v in envlist:
383 self.environ['EC2_SECRET_KEY'] = os.getenv('EC2_SECRET_KEY')367 self.environ[v]=os.getenv(v)
384 self.environ['S3_URL'] = os.getenv('S3_URL')
385 self.environ['EC2_URL'] = os.getenv('EC2_URL')
386 self.environ['EC2_CERT'] = os.getenv('EC2_CERT')
387 self.environ['EC2_PRIVATE_KEY'] = os.getenv('EC2_PRIVATE_KEY')
388 self.environ['EUCALYPTUS_CERT'] = os.getenv('EUCALYPTUS_CERT')
389 self.environ['EC2_USER_ID'] = os.getenv('EC2_USER_ID')
390368
391 def get_environ(self, name):369 def get_environ(self, name):
392 if self.environ.has_key(name):370 if self.environ.has_key(name):
@@ -1094,3 +1072,27 @@
1094 except Exception:1072 except Exception:
1095 print msg1073 print msg
1096 sys.exit(1)1074 sys.exit(1)
1075
1076# read the config file 'config', update 'dict', setting
1077# the value from the config file for each element in array 'keylist'
1078# "config" is a bash syntax file defining bash variables
1079def parse_config(config, dict, keylist):
1080 fmt = ""
1081 str=""
1082 for v in keylist:
1083 str='%s "${%s}" ' % (str, v)
1084 fmt=fmt + "%s%s" % ("%s", "\\0")
1085
1086 cmd = [ "bash", "-ec",
1087 ". '%s' >/dev/null; printf '%s' %s" \
1088 % ( config, fmt, str ) ]
1089
1090 handle = Popen(cmd, stderr=PIPE, stdout=PIPE)
1091 ( stdout, stderr) = handle.communicate()
1092 if handle.returncode != 0:
1093 raise Exception("Parsing config file %s failed:\n\t%s" %(config, stderr))
1094
1095 values = stdout.split("\0")
1096 for i in range(len(values) - 1):
1097 if values[i] != "":
1098 dict[keylist[i]]=values[i]

Subscribers

People subscribed via source and target branches