arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-09 07:30:57 +00:00
Code Issues Releases Wiki Activity

Merge branch '3.0' into gh-pages

Browse Source
This commit is contained in:
grossmj 2020-10-24 15:54:26 +10:30
commit a3a7223c49
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/publish_api_documentation.yml vendored
View File

@ -3,8 +3,6 @@ name: publish-api-documentation
on: on:
workflow_dispatch: workflow_dispatch:
push: push:
branches:
- 3.0
tags: tags:
- v3.* - v3.*
@ -36,8 +34,9 @@ jobs:
run: | run: |
git config user.name github-actions git config user.name github-actions
git config user.email github-actions@github.com git config user.email github-actions@github.com
git checkout gh-pages
git add docs git add docs
git status git status
git commit -m "Publish API documentation" git commit -m "Publish API documentation"
git checkout gh-pages
git merge 3.0
git push git push

22
gns3server/endpoints/controller/__init__.py
View File

@ -30,15 +30,15 @@ from . import symbols
from . import templates from . import templates
router = APIRouter() router = APIRouter()
router.include_router(controller.router, tags=["controller"]) router.include_router(controller.router, tags=["Controller"])
router.include_router(appliances.router, prefix="/appliances", tags=["appliances"]) router.include_router(appliances.router, prefix="/appliances", tags=["Appliances"])
router.include_router(computes.router, prefix="/computes", tags=["computes"]) router.include_router(computes.router, prefix="/computes", tags=["Computes"])
router.include_router(drawings.router, prefix="/projects/{project_id}/drawings", tags=["drawings"]) router.include_router(drawings.router, prefix="/projects/{project_id}/drawings", tags=["Drawings"])
router.include_router(gns3vm.router, prefix="/gns3vm", tags=["GNS3 VM"]) router.include_router(gns3vm.router, prefix="/gns3vm", tags=["GNS3 VM"])
router.include_router(links.router, prefix="/projects/{project_id}/links", tags=["links"]) router.include_router(links.router, prefix="/projects/{project_id}/links", tags=["Links"])
router.include_router(nodes.router, prefix="/projects/{project_id}/nodes", tags=["nodes"]) router.include_router(nodes.router, prefix="/projects/{project_id}/nodes", tags=["Nodes"])
router.include_router(notifications.router, prefix="/notifications", tags=["notifications"]) router.include_router(notifications.router, prefix="/notifications", tags=["Notifications"])
router.include_router(projects.router, prefix="/projects", tags=["projects"]) router.include_router(projects.router, prefix="/projects", tags=["Projects"])
router.include_router(snapshots.router, prefix="/projects/{project_id}/snapshots", tags=["snapshots"]) router.include_router(snapshots.router, prefix="/projects/{project_id}/snapshots", tags=["Snapshots"])
router.include_router(symbols.router, prefix="/symbols", tags=["symbols"]) router.include_router(symbols.router, prefix="/symbols", tags=["Symbols"])
router.include_router(templates.router, tags=["templates"]) router.include_router(templates.router, tags=["Templates"])