API V2

gns3server/web/documentation.py

@@ -39,16 +39,22 @@ class Documentation(object):
         self.write_documentation("hypervisor")
         # Controller documentation
         self.write_documentation("controller")
-        # Write doc common to both
-        self.write_documentation("common")
 
     def write_documentation(self, doc_type):
         """
         Build all the doc page for handlers
 
-        :param doc_type: Type of doc to generate (controller, hypervisor or common)
+        :param doc_type: Type of doc to generate (controller, hypervisor)
         """
         for handler_name in sorted(self._documentation):
+            if "controller." in handler_name:
+                server_type = "controller"
+            elif "hypervisor." in handler_name:
+                server_type = "hypervisor"
+
+            if doc_type != server_type:
+                continue
+
             print("Build {}".format(handler_name))
 
             for path in sorted(self._documentation[handler_name]):
@@ -57,16 +63,6 @@ class Documentation(object):
                 if api_version is None:
                     continue
 
-                if "controller." in handler_name:
-                    server_type = "controller"
-                elif "hypervisor." in handler_name:
-                    server_type = "hypervisor"
-                else:
-                    server_type = "common"
-
-                if doc_type != server_type:
-                    continue
-
                 filename = self._file_path(path)
                 handler_doc = self._documentation[handler_name][path]
                 handler = handler_name.replace(server_type + ".", "")
@@ -126,7 +122,7 @@ class Documentation(object):
     def _file_path(self, path):
         path = path.replace("hypervisor", "")
         path = path.replace("controller", "")
-        return re.sub("^v1", "", re.sub("[^a-z0-9]", "", path))
+        return re.sub("^v2", "", re.sub("[^a-z0-9]", "", path))
 
     def _write_definitions(self, f, schema):
         if "definitions" in schema:

gns3server/web/route.py

@@ -120,7 +120,7 @@ class Route(object):
         # This block is executed only the first time
         output_schema = kw.get("output", {})
         input_schema = kw.get("input", {})
-        api_version = kw.get("api_version", 1)
+        api_version = kw.get("api_version", 2)
         raw = kw.get("raw", False)
 
         def register(func):
@@ -129,8 +129,6 @@ class Route(object):
                 route = "/v{version}/controller{path}".format(path=path, version=api_version)
             elif "hypervisor" in func.__module__:
                 route = "/v{version}/hypervisor{path}".format(path=path, version=api_version)
-            elif "handlers.api" in func.__module__:
-                route = "/v{version}{path}".format(path=path, version=api_version)
             else:
                 route = path