X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/12da78d57fc8f5ec544d52890c500298a78cbd53..dcf9274b9589ba4380412e49c8cbc2dccabd4b83:/image_creator/dialog_main.py

diff --git a/image_creator/dialog_main.py b/image_creator/dialog_main.py
index 8734345..2079269 100644
--- a/image_creator/dialog_main.py
+++ b/image_creator/dialog_main.py
@@ -270,7 +270,7 @@ def upload_image(session):
         if len(filename) == 0:
             d.msgbox("Filename cannot be empty", width=MSGBOX_WIDTH)
             continue
-
+        session['upload'] = filename
         break
 
     gauge = GaugeOutput(d, "Image Upload", "Uploading...")
@@ -286,7 +286,7 @@ def upload_image(session):
             try:
                 # Upload image file
                 with open(session['snapshot'], 'rb') as f:
-                    session["upload"] = kamaki.upload(f, size, filename,
+                    session["pithos_uri"] = kamaki.upload(f, size, filename,
                                                     "Calculating block hashes",
                                                     "Uploading missing blocks")
                 # Upload metadata file
@@ -307,8 +307,8 @@ def upload_image(session):
             except ClientError as e:
                 d.msgbox("Error in pithos+ client: %s" % e.message,
                          title="Pithos+ Client Error", width=MSGBOX_WIDTH)
-                if 'upload' in session:
-                    del session['upload']
+                if 'pithos_uri' in session:
+                    del session['pithos_uri']
                 return False
         finally:
             out.remove(gauge)
@@ -337,7 +337,7 @@ def register_image(session):
                  width=MSGBOX_WIDTH)
         return False
 
-    if "upload" not in session:
+    if "pithos_uri" not in session:
         d.msgbox("You need to upload the image to pithos+ before you can "
                  "register it to cyclades", width=MSGBOX_WIDTH)
         return False
@@ -360,15 +360,15 @@ def register_image(session):
         for key in session['task_metadata']:
             metadata[key] = 'yes'
 
-    gauge = GaugeOutput(d, "Image Registration", "Registrating image...")
+    gauge = GaugeOutput(d, "Image Registration", "Registering image...")
     try:
         out = dev.out
         out.add(gauge)
         try:
-            out.output("Registring image to cyclades...")
+            out.output("Registering image with Cyclades...")
             try:
                 kamaki = Kamaki(session['account'], session['token'], out)
-                kamaki.register(name, session['upload'], metadata)
+                kamaki.register(name, session['pithos_uri'], metadata)
                 out.success('done')
             except ClientError as e:
                 d.msgbox("Error in pithos+ client: %s" % e.message)
@@ -378,7 +378,7 @@ def register_image(session):
     finally:
         gauge.cleanup()
 
-    d.msgbox("Image `%s' was successfully registered to cyclades as `%s'" %
+    d.msgbox("Image `%s' was successfully registered with Cyclades as `%s'" %
              (session['upload'], name), width=MSGBOX_WIDTH)
     return True
 
@@ -660,9 +660,9 @@ def sysprep(session):
             index += 1
 
         (code, tags) = d.checklist(
-            "Please choose which system preperation tasks you would like to "
+            "Please choose which system preparation tasks you would like to "
             "run on the image. Press <Help> to see details about the system "
-            "preperation tasks.", title="Run system preperation tasks",
+            "preparation tasks.", title="Run system preparation tasks",
             choices=choices, width=70, ok_label="Run", help_button=1)
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
@@ -746,7 +746,7 @@ def shrink(session):
 def customization_menu(session):
     d = session['dialog']
 
-    choices = [("Sysprep", "Run various image preperation tasks"),
+    choices = [("Sysprep", "Run various image preparation tasks"),
                ("Shrink", "Shrink image"),
                ("View/Modify", "View/Modify image properties"),
                ("Delete", "Delete image properties"),