From 2d85cb2c38cc0aa077277a811c8d756bbdfc4f10 Mon Sep 17 00:00:00 2001
From: Giampaolo Lauria <lauria@us.ibm.com>
Date: Mon, 10 Dec 2012 16:47:48 -0500
Subject: Modified sample tests to FlavorExtraData API.

Added subs wherever applicable.
Added checks for correct return codes after REST ops
Modified sample tests to FlavorManage API to differentiate them
from the ones in FlavorExtraData.

Partially implements blueprint nova-api-samples
Fixes bug 1070162

Change-Id: I57c6611f379bef2ff586551b5501c4f7654e4374
---
 .../OS-FLV-EXT-DATA/flavors-extra-data-post-req.json         | 12 ++++++------
 .../OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml          |  4 ++--
 .../OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml         |  2 +-
 doc/api_samples/os-flavor-manage/flavor-create-post-req.json |  4 ----
 doc/api_samples/os-flavor-manage/flavor-create-post-req.xml  |  2 --
 5 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'doc')

diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json
index 0a88eb248..787f5f3b7 100644
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json
+++ b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.json
@@ -1,12 +1,12 @@
 {
     "flavor": {
-        "OS-FLV-EXT-DATA:ephemeral": 30,
-        "disk": 10,
-        "id": "666",
         "name": "flavortest",
         "ram": 1024,
+        "vcpus": 2,
+        "disk": 10,
+        "id": "666",
         "rxtx_factor": 2.0,
-        "swap": 5,
-        "vcpus": 2
+        "OS-FLV-EXT-DATA:ephemeral": 30,
+        "swap": 5
     }
-}
+}
\ No newline at end of file
diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml
index cc2d05eed..99aec19ed 100644
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml
+++ b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-req.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flavor xmlns="http://docs.openstack.org/compute/api/v1.1"
     xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1"
-    name="testflavor1"
+    name="flavortest"
     ram="1024"
     vcpus="2"
     disk="10"
     id="666"
     swap="5"
     rxtx_factor="2.0"
-    OS-FLV-EXT-DATA:ephemeral="30" />
+    OS-FLV-EXT-DATA:ephemeral="30" />
\ No newline at end of file
diff --git a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml
index c877553a1..7da3e2379 100644
--- a/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml
+++ b/doc/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-post-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="testflavor1" id="666" OS-FLV-EXT-DATA:ephemeral="30">
+<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="flavortest" id="666" OS-FLV-EXT-DATA:ephemeral="30">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/666" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/666" rel="bookmark"/>
 </flavor>
\ No newline at end of file
diff --git a/doc/api_samples/os-flavor-manage/flavor-create-post-req.json b/doc/api_samples/os-flavor-manage/flavor-create-post-req.json
index 9c5661cdb..8a3830f09 100644
--- a/doc/api_samples/os-flavor-manage/flavor-create-post-req.json
+++ b/doc/api_samples/os-flavor-manage/flavor-create-post-req.json
@@ -5,9 +5,5 @@
         "vcpus": 2,
         "disk": 10,
         "id": "10",
-        "os-flavor-access:is_public": true,
-        "rxtx_factor": 1,
-        "OS-FLV-EXT-DATA:ephemeral": 0,
-        "swap": 0
     }
 }
diff --git a/doc/api_samples/os-flavor-manage/flavor-create-post-req.xml b/doc/api_samples/os-flavor-manage/flavor-create-post-req.xml
index 2018acb0f..b90c108d0 100644
--- a/doc/api_samples/os-flavor-manage/flavor-create-post-req.xml
+++ b/doc/api_samples/os-flavor-manage/flavor-create-post-req.xml
@@ -5,6 +5,4 @@
     <vcpus>2</vcpus>
     <disk>10</disk>
     <id>10</id>
-    <rxtx_factor>1</rxtx_factor>
-    <swap>0</swap>
 </flavor>
-- 
cgit