Summary: Modifying integration tests to use 128MB service offerings

Marcus Sorensen · Marcus Sorensen · commit 4f479e2b23cb · 2013-01-16T10:30:31.000-07:00
Detail: The default devcloud tiny template is set up via devcloud.sql to have
at least 100MB RAM, changing the tests as well. This will also allow the builtin
devcloud-kvm tiny template to work for tests as it requires a bit more.

Signed-off-by: Marcus Sorensen &lt;marcus@betterservers.com&gt; 1358357431 -0700
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
@@ -41,7 +41,7 @@ def __init__(self):
                                     "displaytext": "Tiny Instance",
                                     "cpunumber": 1,
                                     "cpuspeed": 100, # in MHz
-                                    "memory": 64, # In MBs
+                                    "memory": 128, # In MBs
                                     },
                         "virtual_machine":
                                     {
diff --git a/test/integration/smoke/test_service_offerings.py b/test/integration/smoke/test_service_offerings.py
@@ -39,7 +39,7 @@ def __init__(self):
                                 "displaytext": "Service Offering",
                                 "cpunumber": 1,
                                 "cpuspeed": 100, # MHz
-                                "memory": 64, # in MBs
+                                "memory": 128, # in MBs
                             },
                      }
 
diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py
@@ -52,7 +52,7 @@ def __init__(self):
                                     "displaytext": "Tiny Instance",
                                     "cpunumber": 1,
                                     "cpuspeed": 100,    # in MHz
-                                    "memory": 64,       # In MBs
+                                    "memory": 128,       # In MBs
                         },
                         "disk_offering": {
                                     "displaytext": "Small",
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
@@ -80,7 +80,7 @@ def __init__(self):
                         "displaytext": "Tiny Instance",
                         "cpunumber": 1,
                         "cpuspeed": 100, # in MHz
-                        "memory": 64, # In MBs
+                        "memory": 128, # In MBs
                     },
                  "small":
                     {
diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py
@@ -53,7 +53,7 @@ def __init__(self):
                                     "displaytext": "Tiny Instance",
                                     "cpunumber": 1,
                                     "cpuspeed": 100,    # in MHz
-                                    "memory": 64,       # In MBs
+                                    "memory": 128,       # In MBs
                         },
                         "disk_offering": {
                                     "displaytext": "Small",

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ def __init__(self):`
`41`	`41`	`"displaytext": "Tiny Instance",`
`42`	`42`	`"cpunumber": 1,`
`43`	`43`	`"cpuspeed": 100, # in MHz`
`44`		`- "memory": 64, # In MBs`
	`44`	`+ "memory": 128, # In MBs`
`45`	`45`	`},`
`46`	`46`	`"virtual_machine":`
`47`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ def __init__(self):`
`39`	`39`	`"displaytext": "Service Offering",`
`40`	`40`	`"cpunumber": 1,`
`41`	`41`	`"cpuspeed": 100, # MHz`
`42`		`- "memory": 64, # in MBs`
	`42`	`+ "memory": 128, # in MBs`
`43`	`43`	`},`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ def __init__(self):`
`80`	`80`	`"displaytext": "Tiny Instance",`
`81`	`81`	`"cpunumber": 1,`
`82`	`82`	`"cpuspeed": 100, # in MHz`
`83`		`- "memory": 64, # In MBs`
	`83`	`+ "memory": 128, # In MBs`
`84`	`84`	`},`
`85`	`85`	`"small":`
`86`	`86`	`{`