From 1713281304db5e8977f6534005b48f0dc250dc93 Mon Sep 17 00:00:00 2001
From: Stanislaw Szydlo <stanislaw.szydlo@ericpol.com>
Date: Fri, 21 Aug 2015 14:46:35 +0200
Subject: [PATCH] Inconsistent flavor type fix in 'Getting started' chapter for
 firstapp.

In 'Flavors and images' section, different flavor was suggested in text
and different used in command. Bug fixed for libcloud, dotnet and pkgcloud SDKs.

Change-Id: I69cb5e92eee56190f32a11f75325daf05d37462c
Closes-Bug: #1463546
---
 firstapp/samples/dotnet/getting_started.cs   |  2 +-
 firstapp/samples/libcloud/getting_started.py |  2 +-
 firstapp/samples/pkgcloud/getting_started.js |  2 +-
 firstapp/source/getting_started.rst          | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/firstapp/samples/dotnet/getting_started.cs b/firstapp/samples/dotnet/getting_started.cs
index f55a256bd..40a9a16fb 100644
--- a/firstapp/samples/dotnet/getting_started.cs
+++ b/firstapp/samples/dotnet/getting_started.cs
@@ -59,7 +59,7 @@ namespace openstack
 				_image.Name));
 
 			// step-5
-			var flavor_id = "42";
+			var flavor_id = "2";
 			var _flavor = conn.GetFlavor (flavor_id, region: region);
 			Console.WriteLine (string.Format(
 				"Flavor Id: {0} - Flavor Name: {1}",
diff --git a/firstapp/samples/libcloud/getting_started.py b/firstapp/samples/libcloud/getting_started.py
index 36e930a62..c2f5dc502 100755
--- a/firstapp/samples/libcloud/getting_started.py
+++ b/firstapp/samples/libcloud/getting_started.py
@@ -32,7 +32,7 @@ image = conn.get_image(image_id)
 print(image)
 
 # step-5
-flavor_id = '3'
+flavor_id = '2'
 flavor = conn.ex_get_size(flavor_id)
 print(flavor)
 
diff --git a/firstapp/samples/pkgcloud/getting_started.js b/firstapp/samples/pkgcloud/getting_started.js
index 90142ec2a..e82614932 100644
--- a/firstapp/samples/pkgcloud/getting_started.js
+++ b/firstapp/samples/pkgcloud/getting_started.js
@@ -50,7 +50,7 @@ conn.getImage(image_id, function(err, image) {
 
 
 // step-5
-flavor_id = '3';
+flavor_id = 'cba9ea52-8e90-468b-b8c2-777a94d81ed3';
 conn.getFlavor(flavor_id, function(err, flavor) {
         console.log("id: " + flavor.id);
         console.log("name: " + flavor.name);
diff --git a/firstapp/source/getting_started.rst b/firstapp/source/getting_started.rst
index 31649c189..d79fae2b8 100644
--- a/firstapp/source/getting_started.rst
+++ b/firstapp/source/getting_started.rst
@@ -27,7 +27,7 @@ A general overview
 
 This tutorial shows two applications. The first application is a simple
 fractal generator that uses mathematical equations to generate beautiful
-`fractal images <http://en.wikipedia.org/wiki/Fractal>`_ . We show you this
+`fractal images <http://en.wikipedia.org/wiki/Fractal>`_. We show you this
 application in its entirety so that you can compare it to a second, more
 robust, application.
 
@@ -593,7 +593,7 @@ Next, choose which flavor you want to use:
 
     .. code-block:: python
 
-        <OpenStackNodeSize: id=3, name=m1.medium, ram=4096, disk=40, bandwidth=None, price=0.0, driver=OpenStack, vcpus=2,  ...>
+        <OpenStackNodeSize: id=2, name=m1.small, ram=2048, disk=20, bandwidth=None, price=0.0, driver=OpenStack, vcpus=1,  ...>
 
 .. only:: pkgcloud
 
@@ -606,7 +606,7 @@ Next, choose which flavor you want to use:
     .. code-block:: none
 
 
-        id: 3
+        id: cba9ea52-8e90-468b-b8c2-777a94d81ed3
         name: m1.small
         ram: 2048
         disk: 20
@@ -624,12 +624,12 @@ Next, choose which flavor you want to use:
 
     .. code-block:: none
 
-        Flavor Id: 42 - Flavor Name: m1.nano
+        Flavor Id: 2 - Flavor Name: m1.small
 
 .. only:: shade
 
-    Since shade can either use the ID or the name in most API calls,
-    let's specify the name for the flavor.
+    Because shade accepts either the ID or name in most API calls, specify the
+    name for the flavor:
 
     .. literalinclude:: ../samples/shade/getting_started.py
         :start-after: step-5