Merge pull request #51 from UpCloudLtd/feature-memory-update

update memory values from deprecated "odd" numbers to 1024.

Author: CancerBalls

README.md

@@ -90,7 +90,7 @@ login_user = login_user_block(
 cluster = {
     'web1': Server(
         core_number=1, # CPU cores
-        memory_amount=512, # RAM in MB
+        memory_amount=1024, # RAM in MB
         hostname='web1.example.com',
         zone=ZONE.London, # ZONE.Helsinki and ZONE.Chicago available also
         storage_devices=[
@@ -104,7 +104,7 @@ cluster = {
     ),
     'web2': Server(
         core_number=1,
-        memory_amount=512,
+        memory_amount=1024,
         hostname='web2.example.com',
         zone=ZONE.London,
         storage_devices=[
@@ -192,7 +192,7 @@ must be defined and must be at least same size than storage being cloned.
 ```python
 clone = Server(
     core_number=1,
-    memory_amount=512,
+    memory_amount=1024,
     hostname='cloned.server',
     zone=ZONE.Helsinki,
     storage_devices=[

docs/Server.md

@@ -51,7 +51,7 @@ Creation of servers in the API is handled by the CloudManager. It accepts a Serv
 
 server = Server(
 			core_number = 1,
-			memory_amount = 512,
+			memory_amount = 1024,
 			hostname = "web1.example.com",
 			zone = ZONE.London,
 			storage_devices = [

docs/server-mixin.md

@@ -41,7 +41,7 @@ def create_server(self, server):
 
 	Example:
 	server1 = Server( core_number = 1,
-				memory_amount = 512, 
+				memory_amount = 1024, 
 				hostname = "my.example.1", 
 				zone = ZONE.London, 
 				storage_devices = [

test/helpers/infra.py

@@ -10,7 +10,7 @@
 CLUSTER = {
     'web1': Server(
         core_number=1,
-        memory_amount=512,
+        memory_amount=1024,
         hostname='web1.example.com',
         zone=ZONE.London,
         password_delivery='none',
@@ -21,7 +21,7 @@
 
     'web2': Server(
         core_number=1,
-        memory_amount=512,
+        memory_amount=1024,
         hostname='web2.example.com',
         zone=ZONE.London,
         password_delivery='none',
@@ -35,7 +35,7 @@
 
     'db': Server(
         core_number=1,
-        memory_amount=512,
+        memory_amount=1024,
         hostname='db.example.com',
         zone=ZONE.London,
         password_delivery='none',

test/json_data/server.json

@@ -7,7 +7,7 @@
 				"core_number" : "0",
 				"title" : "Helsinki server",
 				"hostname" : "fi.example.com",
-				"memory_amount" : "512",
+				"memory_amount" : "1024",
 				"uuid" : "00798b85-efdc-41ca-8021-f6ef457b8531",
 				"state" : "started",
 				"tags": {
@@ -22,7 +22,7 @@
 				"core_number" : "0",
 				"title" : "London server",
 				"hostname" : "uk.example.com",
-				"memory_amount" : "512",
+				"memory_amount" : "1024",
 				"uuid" : "009d64ef-31d1-4684-a26b-c86c955cbf46",
 				"state" : "stopped",
 				"tags": {

test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531.json

@@ -19,7 +19,7 @@
 			]
 		},
 		"license" : 0,
-		"memory_amount" : "512",
+		"memory_amount" : "1024",
 		"nic_model" : "e1000",
 		"state" : "started",
 		"storage_devices" : {

test/json_data/server_009d64ef-31d1-4684-a26b-c86c955cbf46.json

@@ -17,7 +17,7 @@
 			]
 		},
 		"license" : 0,
-		"memory_amount" : "512",
+		"memory_amount" : "1024",
 		"nic_model" : "e1000",
 		"state" : "stopped",
 		"storage_devices" : {

test/json_data/storage_attach.json

@@ -17,7 +17,7 @@
 			]
 		},
 		"license" : 0,
-		"memory_amount" : "512",
+		"memory_amount" : "1024",
 		"nic_model" : "e1000",
 		"state" : "started",
 		"storage_devices" : {

test/json_data/storage_detach.json

@@ -17,7 +17,7 @@
 			]
 		},
 		"license" : 0,
-		"memory_amount" : "512",
+		"memory_amount" : "1024",
 		"nic_model" : "e1000",
 		"state" : "started",
 		"storage_devices" : {

test/test_integration/test_integration_test.py

@@ -36,14 +36,15 @@ def destroy_server(server):
     """Destroy a server and it's storages."""
     server.stop_and_destroy()
 
+
 def delete_tag(tag):
     """Destroy a tag (only works if the tag is not in use)."""
     tag.destroy()
 
 
 @integration_test
 def teardown_module(module):
-    manager = CloudManager(USERNAME, PASSWORD, timeout=120)
+    manager = CloudManager(USERNAME, PASSWORD, timeout=160)
 
     # if we are at CIRCLECI, clean up everything
     if os.environ.get('CIRCLECI', False):
@@ -84,7 +85,6 @@ def test_infra_ops():
         server.populate()
         cluster_servers.append(server)
 
-
     CREATED_SERVERS = cluster_servers
 
     # assert all_servers contain cluster_servers
@@ -107,8 +107,6 @@ def test_infra_ops():
     assert len(web2.ip_addresses) == 1
     assert web2.ip_addresses[0].family == 'IPv6'
 
-
-
     test_server = CLUSTER['web1']
 
     test_server.populate()