Return command_line and node_directory via the controller

tests/compute/docker/test_docker_vm.py

@@ -63,7 +63,7 @@ def test_json(vm, project):
         'aux': vm.aux,
         'start_command': vm.start_command,
         'environment': vm.environment,
-        'vm_directory': vm.working_dir
+        'node_directory': vm.working_dir
     }
 
 

tests/compute/virtualbox/test_virtualbox_vm.py

@@ -63,7 +63,7 @@ def test_vm_adapter_add_nio_binding_adapter_not_exist(loop, vm, manager, free_co
 
 
 def test_json(vm, tmpdir, project):
-    assert vm.__json__()["vm_directory"] is None
+    assert vm.__json__()["node_directory"] is None
     project._path = str(tmpdir)
     vm._linked_clone = True
-    assert vm.__json__()["vm_directory"] is not None
+    assert vm.__json__()["node_directory"] is not None

tests/compute/vmware/test_vmware_vm.py

@@ -45,10 +45,10 @@ def test_vm(project, manager, vm):
 
 
 def test_json(vm, tmpdir, project):
-    assert vm.__json__()["vm_directory"] is not None
+    assert vm.__json__()["node_directory"] is not None
     project._path = str(tmpdir)
     vm._linked_clone = True
-    assert vm.__json__()["vm_directory"] is not None
+    assert vm.__json__()["node_directory"] is not None
 
 
 def test_start_capture(vm, tmpdir, manager, free_console_port, loop):

tests/controller/test_node.py

@@ -55,6 +55,8 @@ def test_json(node, compute):
         "name": "demo",
         "console": node.console,
         "console_type": node.console_type,
+        "command_line": None,
+        "node_directory": None,
         "properties": node.properties
     }
 

tests/handlers/api/compute/test_qemu.py

@@ -103,12 +103,12 @@ def test_qemu_create_with_params(http_compute, project, base_params, fake_qemu_v
 
 
 def test_qemu_get(http_compute, project, vm):
-    response = http_compute.get("/projects/{project_id}/qemu/nodes/{node_id}".format(project_id=vm["project_id"],node_id=vm["node_id"]), example=True)
+    response = http_compute.get("/projects/{project_id}/qemu/nodes/{node_id}".format(project_id=vm["project_id"], node_id=vm["node_id"]), example=True)
     assert response.status == 200
     assert response.route == "/projects/{project_id}/qemu/nodes/{node_id}"
     assert response.json["name"] == "PC TEST 1"
     assert response.json["project_id"] == project.id
-    assert response.json["vm_directory"] == os.path.join(project.path, "project-files", "qemu", vm["node_id"])
+    assert response.json["node_directory"] == os.path.join(project.path, "project-files", "qemu", vm["node_id"])
 
 
 def test_qemu_start(http_compute, vm):
@@ -185,7 +185,7 @@ def test_qemu_nio_create_ethernet(http_compute, vm):
     http_compute.put("/projects/{project_id}/qemu/nodes/{node_id}".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"adapters": 2})
     response = http_compute.post("/projects/{project_id}/qemu/nodes/{node_id}/adapters/1/ports/0/nio".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"type": "nio_generic_ethernet",
                                                                                                                                                                    "ethernet_device": "eth0",
-                                                                                                                                                                  },
+                                                                                                                                                                   },
                                  example=True)
     assert response.status == 409