Merge pull request #23 from UpCloudLtd/0.3.6-devel

merge 0.3.6 devel into master

Author: Elias Nygren

.gitignore

@@ -1,3 +1,4 @@
+.gitignore
 __pycache__
 ENV/
 .DS_Store
@@ -9,7 +10,10 @@ dist/
 *.sublime-workspace
 docs/html/
 .tox
+.cache
 
 # pyenv
 .python-version
 
+# local
+.test-snippets

circle.yml

@@ -0,0 +1,16 @@
+machine:
+  python:
+    # we want to run integration tests with 2.7.x
+    # as it's the most important one due to Ansible
+    version: 2.7.11
+
+dependencies:
+  override:
+    - pip install tox tox-pyenv
+    - pyenv install 2.6.9
+    - pyenv local 2.6.9 2.7.11 3.3.6 3.4.4 3.5.1
+
+test:
+  override:
+    - tox
+    - tox -e py27 -- -x --integration-tests

requirements-dev.txt

@@ -1,2 +1,9 @@
-pytest==2.6.4
-py==1.4.26
+pytest>=2.9.2
+py>=1.4.26
+mock>=1.0.1
+responses>=0.3.0
+
+# flake8
+flake8>=2.6.2
+flake8-docstrings>=0.2.8
+hacking>=0.11.0

requirements.txt

@@ -1,6 +1,2 @@
-future==0.14.3
-mock==1.0.1
-requests==2.6.0
-responses==0.3.0
-six==1.9.0
-wheel==0.24.0
+requests>=2.6.0
+six>=1.9.0

test/conftest.py

@@ -3,10 +3,21 @@
 from __future__ import division
 from __future__ import absolute_import
 from builtins import object, open
-from future import standard_library
-standard_library.install_aliases()
+import json
+import os
+import pytest
+import responses
+import sys
+
+
+# make files under helpers available for import
+HELPERS_PATH = os.path.join(os.path.dirname(__file__), 'helpers')
+sys.path.append(HELPERS_PATH)
+
+
+def pytest_addoption(parser):
+    parser.addoption('--integration-tests', action='store_true', help='run integration tests')
 
-import json, os, pytest, responses
 
 @pytest.fixture(scope='module')
 def manager():
@@ -15,80 +26,76 @@ def manager():
 
 
 class Mock(object):
-	base_url = 'https://api.upcloud.com/1.2'
-
-	@staticmethod
-	def read_from_file(filename):
-
-		filename = filename.replace("/", "_")
-
-		cwd = os.path.dirname(__file__)
-		f = open(cwd + '/json_data/'+filename, 'r')
-		return f.read()
+    base_url = 'https://api.upcloud.com/1.2'
 
-	@staticmethod
-	def mock_get(target, response_file=None):
-		if not response_file:
-			response_file = target + '.json'
+    @staticmethod
+    def read_from_file(filename):
 
-		data = Mock.read_from_file(response_file)
-		responses.add(responses.GET, Mock.base_url + '/' + target,
-						body=data,
-						status=200,
-						content_type='application/json')
-		return data
+        filename = filename.replace("/", "_")
 
-	@staticmethod
-	def __put_post_callback(request, target, data):
-		data_field = target.split("/")[0]
-		payload = json.loads(request.body)
+        cwd = os.path.dirname(__file__)
+        f = open(cwd + '/json_data/'+filename, 'r')
+        return f.read()
 
-		for field in data[data_field]:
-			if field in payload[data_field]:
-				data[data_field][field] = payload[data_field][field]
-		return(200, {}, json.dumps(data))
+    @staticmethod
+    def mock_get(target, response_file=None):
+        if not response_file:
+            response_file = target + '.json'
 
-	@staticmethod
-	def mock_post(target):
-		data = json.loads( Mock.read_from_file(target + '_post.json') )
+        data = Mock.read_from_file(response_file)
+        responses.add(responses.GET, Mock.base_url + '/' + target,
+                      body=data,
+                      status=200,
+                      content_type='application/json')
+        return data
 
-		def callback(request):
-			return Mock.__put_post_callback(request, target, data)
+    @staticmethod
+    def __put_post_callback(request, target, data):
+        data_field = target.split("/")[0]
+        payload = json.loads(request.body)
 
-		responses.add_callback(responses.POST, Mock.base_url + '/' + target,
-								callback=callback,
-								content_type='application/json')
+        for field in data[data_field]:
+            if field in payload[data_field]:
+                data[data_field][field] = payload[data_field][field]
+        return(200, {}, json.dumps(data))
 
-	@staticmethod
-	def mock_put(target):
-		data = json.loads( Mock.read_from_file(target + '.json') )
+    @staticmethod
+    def mock_post(target):
+        data = json.loads(Mock.read_from_file(target + '_post.json'))
 
-		def callback(request):
-			return Mock.__put_post_callback(request, target, data)
+        def callback(request):
+            return Mock.__put_post_callback(request, target, data)
 
-		responses.add_callback(responses.PUT, Mock.base_url + '/' + target,
-								callback=callback,
-								content_type='application/json')
-	@staticmethod
-	def mock_delete(target):
-		# print(Mock.base_url + "/" + target)
-		responses.add(responses.DELETE, Mock.base_url + "/" + target,
-						status = 204 )
+        responses.add_callback(responses.POST, Mock.base_url + '/' + target,
+                               callback=callback,
+                               content_type='application/json')
 
-	@staticmethod
-	def mock_server_operation(target):
-		# drop third (last) part of a string divided by two slashes ("/"); e.g "this/is/string" -> "this/is"
-		targetsplit = target.split("/")
-		targetfile = "/".join( targetsplit[:2] )
+    @staticmethod
+    def mock_put(target):
+        data = json.loads(Mock.read_from_file(target + '.json'))
 
-		data = json.loads( Mock.read_from_file(targetfile + '.json') )
+        def callback(request):
+            return Mock.__put_post_callback(request, target, data)
 
-		# API will always respond state: "started", see: Server.stop, Server.start, Server,restart
-		data["server"]["state"] = "started"
+        responses.add_callback(responses.PUT, Mock.base_url + '/' + target,
+                               callback=callback,
+                               content_type='application/json')
 
-		data = json.dumps( data )
-		responses.add(responses.POST, Mock.base_url + "/" + target, status=200, body = data, content_type='application/json')
+    @staticmethod
+    def mock_delete(target):
+        responses.add(responses.DELETE, Mock.base_url + '/' + target,
+                      status=204)
 
+    @staticmethod
+    def mock_server_operation(target):
+        # drop third (last) part of a string divided by two slashes ("/"); e.g "this/is/string" -> "this/is"
+        targetsplit = target.split('/')
+        targetfile = '/'.join( targetsplit[:2] )
 
+        data = json.loads( Mock.read_from_file(targetfile + '.json') )
 
+        # API will always respond state: "started", see: Server.stop, Server.start, Server,restart
+        data['server']['state'] = 'started'
 
+        data = json.dumps( data )
+        responses.add(responses.POST, Mock.base_url + "/" + target, status=200, body = data, content_type='application/json')

test/helpers/infra.py

@@ -0,0 +1,90 @@
+from __future__ import print_function
+from __future__ import unicode_literals
+from __future__ import division
+from __future__ import absolute_import
+
+from upcloud_api import CloudManager, Storage, FirewallRule, ZONE, Tag
+from upcloud_api.server import Server, login_user_block
+
+
+CLUSTER = {
+    'web1': Server(
+        core_number=1,
+        memory_amount=512,
+        hostname='web1.example.com',
+        zone=ZONE.London,
+        password_delivery='none',
+        storage_devices=[
+            Storage(os='Ubuntu 14.04', size=10),
+            Storage(size=10, tier='maxiops')
+        ]),
+
+    'web2': Server(
+        core_number=1,
+        memory_amount=512,
+        hostname='web2.example.com',
+        zone=ZONE.London,
+        password_delivery='none',
+        storage_devices=[
+            Storage(os='Ubuntu 14.04', size=10),
+            Storage(size=10, tier='maxiops'),
+        ]),
+
+    'db': Server(
+        core_number=1,
+        memory_amount=512,
+        hostname='db.example.com',
+        zone=ZONE.London,
+        password_delivery='none',
+        storage_devices=[
+            Storage(os='CentOS 7.0', size=10),
+            Storage(size=10),
+        ],
+        login_user=login_user_block('testuser', ['ssh-rsa AAAAB3NzaC1yc2EAA[...]ptshi44x [email protected]'], True),
+        ),
+
+
+    'lb': Server(
+        plan= '1xCPU-1GB',
+        hostname='balancer.example.com',
+        zone=ZONE.London,
+        password_delivery='none',
+        storage_devices=[
+            Storage(os='Debian 7.8', size=30)
+        ],
+        login_user=login_user_block('testuser', ['ssh-rsa AAAAB3NzaC1yc2EAA[...]ptshi44x [email protected]'], True),
+        )
+}
+
+
+FIREWALL_RULES = [
+    FirewallRule(
+        position='1',
+        direction='in',
+        family='IPv4',
+        protocol='tcp',
+        source_address_start='192.168.1.1',
+        source_address_end='192.168.1.255',
+        destination_port_start='22',
+        destination_port_end='22',
+        action='accept'
+    ),
+    FirewallRule(
+        position='2',
+        direction='in',
+        family='IPv4',
+        protocol='tcp',
+        source_address_start='192.168.1.1',
+        source_address_end='192.168.1.255',
+        destination_port_start='21',
+        destination_port_end='21',
+        action='accept'
+    )
+]
+
+
+TAGS = [
+    Tag('testlb'),
+    Tag('testdb'),
+    Tag('testweb')
+]

test/helpers/infra_helpers.py

@@ -0,0 +1,83 @@
+from __future__ import print_function
+from __future__ import unicode_literals
+from __future__ import division
+from __future__ import absolute_import
+
+from upcloud_api import ZONE, Tag
+
+
+def create_cluster(manager, cluster):
+    """Create all servers in cluster."""
+    for server in cluster:
+        s = manager.create_server(cluster[server])
+
+    for server in cluster:
+        cluster[server].ensure_started()
+
+    return manager.get_servers()
+
+
+def firewall_test(manager, firewall_rules, server):
+    """Run tests on firewall rules."""
+    # add 1 rule and remove it
+    server.add_firewall_rule(firewall_rules[0])
+
+    fs = server.get_firewall_rules()
+    assert len(fs) == 1
+
+    fs[0].destroy()
+    fs = server.get_firewall_rules()
+    assert len(fs) == 0
+
+    # add several rules and remove them
+    server.configure_firewall(firewall_rules)
+
+    fs = server.get_firewall_rules()
+    assert len(fs) == 2
+
+    for f in fs:
+        manager.delete_firewall_rule(server.uuid, 1)
+
+    fs = server.get_firewall_rules()
+    assert len(fs) == 0
+
+
+def server_test(manager, server):
+    """Run tests on a server instance."""
+    server.populate()
+
+    server.core_number = '3'
+    server.memory_amount = '1024'
+    server.save()
+
+    server.add_IP()
+
+    storage = manager.create_storage(size=10, tier='maxiops', zone=ZONE.London)
+    server.add_storage(storage)
+
+    server.start()
+
+    #sync new info from API and assert the changes from above have happened
+    server.populate()
+    assert server.core_number == '3'
+    assert server.memory_amount == '1024'
+    assert len(server.storage_devices) == 3
+    assert len(server.ip_addresses) == 4
+
+    server.ensure_started()
+
+
+def tag_servers_test(manager, tags, cluster):
+    """Run tests on tags."""
+    # create tags
+    for t in tags:
+        manager.create_tag(str(t))
+
+    cluster['web1'].add_tags(['testweb'])
+    cluster['web2'].add_tags(['testweb'])
+    cluster['lb'].add_tags([tags[1]]) # tags[1] is 'db'
+    cluster['db'].add_tags(['testlb'])
+
+    fetched_servers = manager.get_servers(tags_has_one=['testlb'])
+    assert len(fetched_servers) == 1
+    assert fetched_servers[0].tags[0] == 'testlb'