CLOUDSTACK-2377: change memory size to 128 mb for the tiny service offering in the integration tests
Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b8358e10 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8358e10 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8358e10 Branch: refs/heads/marvin_refactor Commit: b8358e109e737c454a351942c0f3d66f674febd7 Parents: 1fe50a8 Author: Srikanteswararao Talluri <[email protected]> Authored: Wed May 8 12:23:15 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Wed May 8 14:26:44 2013 +0530 ---------------------------------------------------------------------- test/integration/component/test_accounts.py | 2 +- .../component/test_allocation_states.py | 2 +- test/integration/component/test_blocker_bugs.py | 2 +- test/integration/component/test_egress_rules.py | 2 +- test/integration/component/test_eip_elb.py | 2 +- .../integration/component/test_network_offering.py | 2 +- test/integration/component/test_project_configs.py | 2 +- test/integration/component/test_project_limits.py | 2 +- .../component/test_project_resources.py | 2 +- test/integration/component/test_project_usage.py | 2 +- test/integration/component/test_projects.py | 2 +- test/integration/component/test_resource_limits.py | 2 +- test/integration/component/test_routers.py | 2 +- test/integration/component/test_security_groups.py | 2 +- test/integration/component/test_templates.py | 2 +- test/integration/component/test_usage.py | 2 +- test/integration/component/test_volumes.py | 2 +- test/integration/smoke/test_affinity_groups.py | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_accounts.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py index fb38e62..9cbefe5 100644 --- a/test/integration/component/test_accounts.py +++ b/test/integration/component/test_accounts.py @@ -60,7 +60,7 @@ class Services: "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, + "memory": 128, # In MBs }, "virtual_machine": { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_allocation_states.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_allocation_states.py b/test/integration/component/test_allocation_states.py index fe4c35f..5ce0b21 100644 --- a/test/integration/component/test_allocation_states.py +++ b/test/integration/component/test_allocation_states.py @@ -49,7 +49,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "disk_offering": { "displaytext": "Small", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_blocker_bugs.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py index a6ea25a..d099bf1 100644 --- a/test/integration/component/test_blocker_bugs.py +++ b/test/integration/component/test_blocker_bugs.py @@ -51,7 +51,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "disk_offering": { "displaytext": "Small", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_egress_rules.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py index 4af6eee..872ca2c 100644 --- a/test/integration/component/test_egress_rules.py +++ b/test/integration/component/test_egress_rules.py @@ -69,7 +69,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "security_group": { "name": 'SSH', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_eip_elb.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_eip_elb.py b/test/integration/component/test_eip_elb.py index cb41859..b01371b 100644 --- a/test/integration/component/test_eip_elb.py +++ b/test/integration/component/test_eip_elb.py @@ -49,7 +49,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "lbrule": { "name": "SSH", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_network_offering.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py index 00566a0..e33c376 100644 --- a/test/integration/component/test_network_offering.py +++ b/test/integration/component/test_network_offering.py @@ -49,7 +49,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "network_offering": { "name": 'Network offering-VR services', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_project_configs.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py index 33409ac..1eef123 100644 --- a/test/integration/component/test_project_configs.py +++ b/test/integration/component/test_project_configs.py @@ -70,7 +70,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "virtual_machine": { "displayname": "Test VM", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_project_limits.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py index c5d2d6d..17ddfc6 100644 --- a/test/integration/component/test_project_limits.py +++ b/test/integration/component/test_project_limits.py @@ -63,7 +63,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "disk_offering": { "displaytext": "Tiny Disk Offering", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_project_resources.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py index e79254c..8414188 100644 --- a/test/integration/component/test_project_resources.py +++ b/test/integration/component/test_project_resources.py @@ -64,7 +64,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "disk_offering": { "displaytext": "Tiny Disk Offering", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_project_usage.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py index 44ef2f9..ab789e1 100644 --- a/test/integration/component/test_project_usage.py +++ b/test/integration/component/test_project_usage.py @@ -52,7 +52,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "disk_offering": { "displaytext": "Small", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_projects.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py index ccfc8ef..f013e99 100644 --- a/test/integration/component/test_projects.py +++ b/test/integration/component/test_projects.py @@ -78,7 +78,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "virtual_machine": { "displayname": "Test VM", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_resource_limits.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py index 418080a..1d876b6 100644 --- a/test/integration/component/test_resource_limits.py +++ b/test/integration/component/test_resource_limits.py @@ -51,7 +51,7 @@ class Services: "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, + "memory": 128, # In MBs }, "disk_offering": { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_routers.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py index 96eb9aa..bc33d75 100644 --- a/test/integration/component/test_routers.py +++ b/test/integration/component/test_routers.py @@ -41,7 +41,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "virtual_machine": { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_security_groups.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py index fe2561a..54b5c67 100644 --- a/test/integration/component/test_security_groups.py +++ b/test/integration/component/test_security_groups.py @@ -74,7 +74,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "security_group": { "name": 'SSH', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_templates.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py index 3867fb4..1a60123 100644 --- a/test/integration/component/test_templates.py +++ b/test/integration/component/test_templates.py @@ -51,7 +51,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "disk_offering": { "displaytext": "Small", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_usage.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py index dbd0be9..a3779e4 100644 --- a/test/integration/component/test_usage.py +++ b/test/integration/component/test_usage.py @@ -48,7 +48,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "disk_offering": { "displaytext": "Small", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/component/test_volumes.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py index f7eb9f9..34a0679 100644 --- a/test/integration/component/test_volumes.py +++ b/test/integration/component/test_volumes.py @@ -52,7 +52,7 @@ class Services: "displaytext": "Tiny Instance", "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, # In MBs + "memory": 128, # In MBs }, "disk_offering": { "displaytext": "Small", http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8358e10/test/integration/smoke/test_affinity_groups.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py index 6ccd478..e0e1a17 100644 --- a/test/integration/smoke/test_affinity_groups.py +++ b/test/integration/smoke/test_affinity_groups.py @@ -48,7 +48,7 @@ class Services: "cpunumber": 1, "cpuspeed": 100, # in MHz - "memory": 64, + "memory": 128, # In MBs }, "ostype": 'CentOS 5.3 (64-bit)',
