Makes --kernel and --ramdisk required arguments for glance-upload since Nova currently requires them.

The `null_kernel` concept in Nova is slated to be removed, so this is really just a stop gap measure.

bin/glance-upload

@@ -19,19 +19,29 @@
 """
 Upload an image into Glance
 
-Usage:
+Usage
+=====
 
-Raw:
+    Machine - Kernel outside of the image
+    -------------------------------------
 
-    glance-upload <filename> <name>
+        glance-upload --type=kernel <filename> <name>
+        glance-upload --type=ramdisk <filename> <name>
+        glance-upload --type=machine --kernel=KERNEL_ID --ramdisk=RAMDISK_ID \
+                         <filename> <name>
 
-Kernel-outside:
+    Raw - Kernel inside, raw image data
+    -----------------------------------
 
-    glance-upload --type=kernel <filename> <name>
-    glance-upload --type=ramdisk <filename> <name>
-    glance-upload --type=machine --kernel=KERNEL_ID --ramdisk=RAMDISK_ID \
-                     <filename> <name>
+        glance-upload --type=raw --kernel=nokernel --ramdisk=noramdisk \
+                         <filename> <name>
 
+
+    VHD - Kernel inside, data encoded with VHD format
+    -------------------------------------------------
+
+        glance-upload --type=vhd --kernel=nokernel --ramdisk=noramdisk \
+                         <filename> <name>
 """
 
 # FIXME(sirp): This can be merged into glance-admin when that becomes
@@ -70,14 +80,14 @@ def parse_args():
 
 def main():
     args = parse_args()
-    meta = {'name': args.name, 'type': args.type, 'is_public': True}
+    meta = {'name': args.name, 'type': args.type, 'is_public': True,
+            'properties': {}}
 
-    if args.type == 'machine':
-        if args.kernel and args.ramdisk:
-            meta['properties'] = {'kernel_id': args.kernel,
-                                  'ramdisk_id': args.ramdisk}
-        else:
-            die("kernel and ramdisk required for machine image")
+    if args.kernel:
+        meta['properties']['kernel_id'] = args.kernel
+
+    if args.ramdisk:
+        meta['properties']['ramdisk_id'] = args.ramdisk
 
     client = Client(args.host, args.port)
     with open(args.filename) as f:

tests/unit/test_misc.py

@@ -154,7 +154,8 @@ sql_idle_timeout = 3600
                             "in output: %s" % out)
 
             cmd = "./bin/glance-upload --port=%(api_port)d "\
-                  "--type=invalid %(conf_file_name)s 'my image'" % locals()
+                  "--type=invalid %(conf_file_name)s "\
+                  "'my image'" % locals()
 
             # Normally, we would simply self.assertRaises() here, but
             # we also want to check that the Invalid image type is in