Merge "Remove `target_*` fields"

specs/mitaka/approved/image-import/image-import-refactor.rst

@@ -234,7 +234,7 @@ end-user with sufficient information to perform an image import.
     :linenos:
     :language: json
 
-.. note :: Why different ``source_*`` and ``target_*`` formats?
+.. note :: Should we allow users for sending `target_*` fields?
 
    Suppose the end-user needs the image to be in a different format to use a
    particular flavor or availability zone. We could handle this by introducing
@@ -284,10 +284,10 @@ The response is the following JSON schema.
     :linenos:
     :language: json
 
-Note that the values for ``source_disk_format``, ``source_container_format``,
-``target_disk_format``, and ``target_container_format`` will be pulled from
-configuration options used to supply values for the *value discovery* call.
-This will allow an end-user to do accurate schema-validation on the request.
+Note that the values for ``source_disk_format`` and ``source_container_format``
+will be pulled from configuration options used to supply values for the *value
+discovery* call. This will allow an end-user to do accurate schema-validation on
+the request.
 
 .. note :: I haven't addressed Stuart's question "Do we need to have both
    'global' and disk format specific parameters?"  The question appears on the

specs/mitaka/approved/image-import/import-request-example-gd.json

@@ -4,7 +4,5 @@
     },
     "source_disk_format": "raw",
     "source_container_format": "bare",
-    "target_disk_format": "vhd",
-    "target_container_format": "ova",
     "os_type": "linux"
 }

specs/mitaka/approved/image-import/import-request-example-sl.json

@@ -5,7 +5,5 @@
     },
     "source_disk_format": "raw",
     "source_container_format": "bare",
-    "target_disk_format": "vhd",
-    "target_container_format": "ova",
     "os_type": "linux"
 }

specs/mitaka/approved/image-import/import-schema.json

@@ -8,8 +8,6 @@
         "method",
         "source_disk_format",
         "source_container_format",
-        "target_disk_format",
-        "target_container_format"
     ],
     "properties": {
         "method": {
@@ -27,14 +25,6 @@
             "enum": [ "bare", "ovf" ],
             "description": "The container format of the data to be imported.  If no container, use 'bare'."
         },
-        "target_container_format": {
-            "enum": [ "ova" ],
-            "description": "The container format of the image that will be stored in Glance."
-        },
-        "target_disk_format": {
-            "enum": [ "vhd" ],
-            "description": "The disk format of the image that will be stored in Glance."
-        },
         "os_type": {
             "enum": [ "linux", "windows" ],
             "description": "The type of the operating system contained in the image."