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

[Matt Spaulding]

The following commit has been merged in the master branch:
commit b0c7f278e6cad98fea6eb584b018f9c668798455
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Thu May 2 10:38:42 2013 -0700

    TOOLS-317 Fix euca-bundle-instance not working
    
    * Fixed naming typo
    * Updated to use params

diff --git a/euca2ools/commands/euca/bundleinstance.py b/euca2ools/commands/euca/bundleinstance.py
index 1f13927..84bf6b9 100644
--- a/euca2ools/commands/euca/bundleinstance.py
+++ b/euca2ools/commands/euca/bundleinstance.py
@@ -30,13 +30,12 @@
 
 import base64
 from datetime import datetime, timedelta
-from euca2ools.commands.euca import EucalyptusRequest
 import hashlib
 import hmac
 import json
 from requestbuilder import Arg
 from requestbuilder.exceptions import ArgumentError
-import textwrap
+from euca2ools.commands.euca import EucalyptusRequest
 
 
 class BundleInstance(EucalyptusRequest):
@@ -81,12 +80,12 @@ class BundleInstance(EucalyptusRequest):
                   'expiration': expire_time.isoformat()}
         policy_json = json.dumps(policy)
         self.log.info('generated default policy: %s', policy_json)
-        self.args['Storage.S3.UploadPolicy'] = base64.b64encode(policy_json)
+        self.params['Storage.S3.UploadPolicy'] = base64.b64encode(policy_json)
 
     def sign_policy(self):
         my_hmac = hmac.new(self.args['owner_sak'], digestmod=hashlib.sha1)
-        my_hmac.update(self.args['Storage.S3.UploadPolicy'])
-        self.args['Storage.S3.UploadPolicySignature'] = \
+        my_hmac.update(self.params.get('Storage.S3.UploadPolicy'))
+        self.params['Storage.S3.UploadPolicySignature'] = \
                 base64.b64encode(my_hmac.digest())
 
     def configure(self):
@@ -103,7 +102,7 @@ class BundleInstance(EucalyptusRequest):
     def preprocess(self):
         if not self.args.get('Storage.S3.UploadPolicy'):
             self.generate_default_policy()
-        if not self.args.get('Storage.S3.UploadPplicySignature'):
+        if not self.args.get('Storage.S3.UploadPolicySignature'):
             self.sign_policy()
 
     def print_result(self, result):

-- 
managing cloud instances for Eucalyptus