Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/version.py
#	requirements.txt

tests/handlers/api/controller/test_project.py

@@ -67,6 +67,31 @@ def test_create_project_with_uuid(http_controller):
     assert response.json["name"] == "test"
 
 
+def test_create_project_with_variables(http_controller):
+    variables = [
+        {"name": "TEST1"},
+        {"name": "TEST2", "value": "value1"}
+    ]
+    query = {"name": "test", "project_id": "30010203-0405-0607-0809-0a0b0c0d0e0f", "variables": variables}
+    response = http_controller.post("/projects", query)
+    assert response.status == 201
+    assert response.json["variables"] ==  [
+        {"name": "TEST1"},
+        {"name": "TEST2", "value": "value1"}
+    ]
+
+
+def test_create_project_with_supplier(http_controller):
+    supplier = {
+        'logo': 'logo.png',
+        'url': 'http://example.com'
+    }
+    query = {"name": "test", "project_id": "30010203-0405-0607-0809-0a0b0c0d0e0f", "supplier": supplier}
+    response = http_controller.post("/projects", query)
+    assert response.status == 201
+    assert response.json["supplier"] == supplier
+
+
 def test_update_project(http_controller):
     query = {"name": "test", "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f"}
     response = http_controller.post("/projects", query)
@@ -79,6 +104,20 @@ def test_update_project(http_controller):
     assert response.json["name"] == "test2"
 
 
+def test_update_project_with_variables(http_controller):
+    variables = [
+        {"name": "TEST1"},
+        {"name": "TEST2", "value": "value1"}
+    ]
+    query = {"name": "test", "project_id": "10010203-0405-0607-0809-0a0b0c0d0e0f", "variables": variables}
+    response = http_controller.post("/projects", query)
+    assert response.status == 201
+    query = {"name": "test2"}
+    response = http_controller.put("/projects/10010203-0405-0607-0809-0a0b0c0d0e0f", query, example=True)
+    assert response.status == 200
+    assert response.json["variables"] == variables
+
+
 def test_list_projects(http_controller, tmpdir):
     http_controller.post("/projects", {"name": "test", "path": str(tmpdir), "project_id": "00010203-0405-0607-0809-0a0b0c0d0e0f"})
     response = http_controller.get("/projects", example=True)