Pass Flavor and source info under metadata dict

(cherry picked from commit 01fbe07)
(cherry picked from commit 3794c88)
(cherry picked from commit c88978b)
(cherry picked from commit a2f5163)
(cherry picked from commit 17445b7)
(cherry picked from commit 6533b22)
(cherry picked from commit 0595325)

Author: priteau

cloudkittydashboard/static/cloudkitty/js/cloudkitty.controller.js

@@ -21,17 +21,19 @@
       var disk_total = $scope.model.newInstanceSpec.flavor.ephemeral + $scope.model.newInstanceSpec.flavor.disk;
 
       var desc_form = {
-        'flavor_name': $scope.model.newInstanceSpec.flavor.name,
-        'flavor_id': $scope.model.newInstanceSpec.flavor.id,
+        'metadata': {
+            'flavor_name': $scope.model.newInstanceSpec.flavor.name,
+            'flavor_id': $scope.model.newInstanceSpec.flavor.id,
+            'source_type': $scope.model.newInstanceSpec.source_type.type,
+            'source_val': $scope.model.newInstanceSpec.source[0].id,
+            'image_id': $scope.model.newInstanceSpec.source[0].id,
+        },
         'vcpus': $scope.model.newInstanceSpec.flavor.vcpus,
         'disk': $scope.model.newInstanceSpec.flavor.disk,
         'ephemeral': $scope.model.newInstanceSpec.flavor.ephemeral,
         'disk_total': disk_total,
         'disk_total_display': disk_total,
         'ram': $scope.model.newInstanceSpec.flavor.ram,
-        'source_type': $scope.model.newInstanceSpec.source_type.type,
-        'source_val': $scope.model.newInstanceSpec.source[0].id,
-        'image_id': $scope.model.newInstanceSpec.source[0].id,
       }
 
       var form_data = [{"desc": desc_form, "volume": $scope.model.newInstanceSpec.instance_count}];

cloudkittydashboard/static/cloudkitty/js/pricing.js

@@ -65,9 +65,11 @@ pricing = {
 
             // make the json data form
             desc_form = {
-                'flavor': flavor,
-                'source_type': source_type,
-                'source_val': source_val, // images : horizon.Quota.findImageById(source_val);
+                'metadata': {
+                    'flavor': flavor,
+                    'source_type': source_type,
+                    'source_val': source_val, // images : horizon.Quota.findImageById(source_val);
+                },
                 'vcpus': vcpus,
                 'disk': disk,
                 'ephemeral': ephemeral,