arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 19:28:07 +00:00
Code Issues Releases Wiki Activity
4,436 Commits 5 Branches 203 Tags 151 MiB
97e731a7d9
Commit Graph

3514 Commits

Author SHA1 Message Date
grossmj
1f1d93d078 Deactivate the embedded shell for Ethernet switch. Ref #1424 #1556 2019-03-20 16:23:30 +08:00
grossmj
dd211bce52 Fix VBoxManage fails if VM has specific special characters in name. Fixes #2739 2019-03-18 23:29:18 +07:00
grossmj
e00bde51da Merge branch '2.1' into 2.2 2019-03-18 19:26:46 +07:00
grossmj
e291ec1eb9 Fix IOU symlink issue on remote servers. 2019-03-18 18:11:16 +07:00
grossmj
3daa3f450b Fix IOU symlink issue on remote servers. 2019-03-18 18:05:40 +07:00
grossmj
8e8985c69f Fix vcpus configuration for GNS3 VM on VMware. Ref #2738. 2019-03-18 17:53:14 +07:00
grossmj
03401a477e Fix issue when images are not uploaded from appliance wizard. Ref https://github.com/GNS3/gns3-gui/issues/2738 2019-03-18 15:33:37 +07:00
grossmj
4e396ac690 Save the GNS3 VM settings even if the GNS3 VM cannot be stopped. 2019-03-18 15:30:59 +07:00
grossmj
3a73d01547 Fix exception when emitting event from controller. Ref https://github.com/GNS3/gns3-gui/issues/2737 2019-03-15 13:14:55 +07:00
grossmj
23b568678a Development on 2.2.0dev7 2019-03-14 23:27:11 +07:00
grossmj
8ad632976f Release v2.2.0a2 2019-03-14 17:09:53 +07:00
ziajka
b8bf2bf465 Web-UI v2019.1.0-alpha.1 2019-03-14 10:44:09 +01:00
grossmj
7d591b0228 Fix issue when loading and quickly closing a project and opening it again. Fixes #1501. 2019-03-14 15:15:27 +07:00
grossmj
a059e6b943 Disable unreliable nested virtualization check. 2019-03-13 23:13:54 +07:00
grossmj
aff67b324f Fix issue not checking build number on Windows. 2019-03-13 12:56:33 +07:00
grossmj
010d65114d Hyper-V with nested virtualization is only supported on Windows 10 Anniversary Update or later. 2019-03-13 02:15:58 +07:00
grossmj
3dcb7799e3 Use accurate info to detect Windows version. 2019-03-12 22:40:37 +07:00
grossmj
aaaeb410d5 Fix exception when loading and quickly closing a project. 2019-03-12 21:50:09 +07:00
grossmj
d506962bdb Debugging why sys.getwindowsversion() does not work with frozen app. 2019-03-12 21:18:46 +07:00
grossmj
4d9728b6f5 Correctly rename symbol. 2019-03-12 18:54:05 +07:00
grossmj
ff9048b5a8 Revert "Rename symbol." 
This reverts commit 6c96be2acc.
 2019-03-12 18:53:02 +07:00
grossmj
6c96be2acc Rename symbol. 2019-03-12 18:42:54 +07:00
Jeremy Grossmann
21afaf31f9
Merge pull request #1549 from GNS3/symbol-management-refactoring 
Symbol management refactoring
 2019-03-12 18:21:30 +07:00
grossmj
8e5ac228d5 Merge remote-tracking branch 'origin/2.2' into 2.2 2019-03-12 18:17:41 +07:00
grossmj
94f63f54ba Change Hyper-V requirement checks. 2019-03-12 18:17:31 +07:00
grossmj
cf91e904f7 Early support for symbol themes. 2019-03-12 18:13:33 +07:00
ziajka
767bb770ca Re-order handlers in order to prevent CORS 2019-03-11 16:16:10 +01:00
grossmj
bae3fb84b9 Download custom appliance symbols from GitHub 
Fix symbol cache issue. Ref https://github.com/GNS3/gns3-gui/issues/2671
Fix temporary directory for symbols was not deleted
Fix temporary appliance file was not deleted
 2019-03-11 16:55:16 +07:00
grossmj
889d29ec55 Update appliances. 2019-03-11 09:48:54 +07:00
grossmj
2d01ef489b Option to export snapshots. 2019-03-07 18:55:38 +07:00
Jeremy Grossmann
372017f467
Merge pull request #1537 from GNS3/import-export-refactoring 
Project import/export refactoring. Fixes #1349
 2019-03-07 17:38:56 +07:00
grossmj
0ae66a2608 Support selecting a compression type when exporting a project. 2019-03-07 17:05:32 +07:00
grossmj
380224dca1 Change how VPCS executable is searched. 2019-03-06 23:15:05 +07:00
grossmj
af80b0bb6e Use aiofiles where relevant. 2019-03-06 23:00:01 +07:00
grossmj
b0df7ecabf Merge branch '2.2' into import-export-refactoring 2019-03-05 17:29:01 +07:00
grossmj
4c83fc1243 Update paths for binaries moved to the MacOS directory in GNS3.app 2019-03-04 16:07:04 +07:00
grossmj
69ba0ccf77 Bump version to 2.2.0dev2 2019-03-04 14:48:57 +07:00
grossmj
3f679bd106 Locked state should not be used when duplicating a node. 2019-03-02 16:39:05 +07:00
grossmj
724eda1f35 Handle locking/unlocking items independently from the layer position. 2019-03-02 16:26:40 +07:00
Jeremy Grossmann
3f7c4c0474
Update qemu_vm.py 2019-03-01 23:40:32 +07:00
grossmj
80eb06f67c Merge 2.1 into 2.2 2019-03-01 17:23:49 +07:00
grossmj
8cc8269842 Use aiozipstream for snapshots. 
Fix tests.
 2019-02-28 17:25:05 +07:00
grossmj
52bfa636c1 Project duplication support. 2019-02-27 17:57:07 +07:00
grossmj
4eca82174d Development on 2.1.15dev1 2019-02-27 15:59:16 +07:00
grossmj
32f5dbb645 Release v2.1.14 2019-02-27 14:58:52 +07:00
grossmj
7aae682f0a Fix issue when setting cpuid.corespersocket for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2723 2019-02-27 14:47:45 +07:00
grossmj
879e32eb9a Bump ACPI Shutdown Timeout to 120 seconds. Ref #1536 2019-02-26 23:19:33 +07:00
grossmj
01481cde1f Development on 2.1.14dev1 2019-02-26 18:10:23 +07:00
grossmj
b5deb9d177 Release v2.1.13 2019-02-26 16:46:02 +07:00
grossmj
a8990c9e89 Non blocking project exportation. 2019-02-26 15:55:07 +07:00
grossmj
135d56371d Fix tests for project notifications. 2019-02-23 23:20:11 +07:00
grossmj
7fe8f7e716 Fix long-polling request for project notifications. 2019-02-23 21:08:52 +07:00
grossmj
2fb5e47c8d Allow cloud nodes to be exported. Fixes #1519 2019-02-23 11:07:01 +07:00
grossmj
5754747a90 Merging 2.1 into 2.2 2019-02-22 18:04:49 +07:00
grossmj
62c51edbae Less aggressive connections to uBridge. Ref #1289 2019-02-22 16:05:31 +07:00
grossmj
a13d063aa1 Fix topology images (Pictures) disappearing from projects. Fixes #1514. 2019-02-21 23:58:54 +07:00
grossmj
1ef1872f8e Reset MAC addresses when duplicating a project. Fixes #1522 2019-02-20 16:38:43 +07:00
grossmj
081ba31b50 Fix API call to create a node from an appliance doesn't return the new node data. Fixes #1527 2019-02-20 10:47:33 +07:00
grossmj
aea4ae808f Detect invalid environment variable and send a warning when creating a Docker node. Ref #2683 2019-02-19 17:34:10 +07:00
grossmj
ae3515434c Do not export/import symlinks for projects. Fixes #2699 2019-02-19 12:43:44 +07:00
grossmj
589c9754e8 Fix symlink not being created for duplicated IOU devices. Fixes https://github.com/GNS3/gns3-gui/issues/2699 2019-02-19 00:09:59 +08:00
grossmj
4ecd3b2015 Configure coresPerSocket value in VMX file for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/2688 2019-02-17 23:16:48 +08:00
grossmj
84ee3263ba Count logical CPUs to detect if the number of vCPUs is too high when configuring the GNS3 VM. Fixes #2688. 2019-02-17 23:07:33 +08:00
grossmj
d9a9abf845 Add explicit error when trying to pull a Docker image from Docker Hub without Internet access. Fixes #1506. 2019-02-17 19:21:21 +08:00
grossmj
0b07299472 Fixes double display output in GRUB in QEMU v3.1. Fixes #1516. 2019-02-17 19:03:36 +08:00
grossmj
96dce2ec82 Release v2.2.0a1 2019-01-29 14:47:09 +08:00
grossmj
117a1ac6da Restore reload support for nodes. 2019-01-24 16:51:14 +08:00
grossmj
7fb192699b Development on 2.1.13dev1 2019-01-23 15:42:10 +08:00
grossmj
bccdfc97d1 Release 2.1.12 2019-01-23 15:40:38 +08:00
grossmj
3e21f96bf9 Fix indentation issue. Ref https://github.com/GNS3/gns3-gui/issues/2674 
(cherry picked from commit c14d79a3d5)
 2019-01-21 23:51:46 +07:00
grossmj
5f932fee9f Tune how to get the size of SVG images. Ref https://github.com/GNS3/gns3-gui/issues/2674. 
* Default for missing height/width is "100%" as defined in the SVG specification
* Better error message, if viewBox attribute is missing
* Removal of "%" in percent more fault tolerant by using rstrip("%")

(cherry picked from commit e3757a8955)
 2019-01-21 23:49:43 +07:00
grossmj
c14d79a3d5 Fix indentation issue. Ref https://github.com/GNS3/gns3-gui/issues/2674 2019-01-21 16:24:23 +07:00
grossmj
e3757a8955 Tune how to get the size of SVG images. Ref https://github.com/GNS3/gns3-gui/issues/2674. 
* Default for missing height/width is "100%" as defined in the SVG specification
* Better error message, if viewBox attribute is missing
* Removal of "%" in percent more fault tolerant by using rstrip("%")
 2019-01-21 16:01:03 +07:00
grossmj
456ef1348b Fix DeprecationWarning: invalid escape sequence. Fixes https://github.com/GNS3/gns3-gui/issues/2670 2019-01-17 18:01:58 +07:00
grossmj
4b52e9313e Fix issue with coroutine not awaited. Fixes #1499 2019-01-17 17:43:09 +07:00
grossmj
474025175e Remove "deprecated" node for VirtualBox based GNS3 VM support. Ref #1377 2019-01-16 19:22:16 +07:00
grossmj
191036e266 Fix wrong controller method call. 2019-01-14 17:20:11 +07:00
grossmj
8360ae98b1 Move appliance and template management code in their own classes. 2019-01-14 16:09:06 +07:00
grossmj
12a4f95a8f Update appliance files. 2019-01-12 17:33:53 +07:00
grossmj
c6afea49da Try to delete saved VM state only if a snapshot has been saved. 2019-01-12 17:04:37 +07:00
grossmj
bb284d082a Set socket options SO_KEEPALIVE and TCP_NODELAY for embedded Telnet server. Ref #1335 2019-01-12 16:50:15 +07:00
grossmj
a896346c77 Fix issue with notification queue that prevented to properly close projects. Fix #1493 2019-01-12 16:02:36 +07:00
grossmj
f0ffb07165 Fix issue with "usage" variable for Dynamips VMs. Fixes #1495 2019-01-12 12:13:22 +07:00
grossmj
9ed181151f New node information dialog to display general, usage and command line information. 
Ref https://github.com/GNS3/gns3-gui/issues/2662 https://github.com/GNS3/gns3-gui/issues/2656
 2018-12-30 19:35:24 +07:00
grossmj
eae9774d69 Support "usage" field for Dynamips, IOU, VirtualBox and VMware. Fixes https://github.com/GNS3/gns3-gui/issues/2657 2018-12-21 16:54:13 +08:00
grossmj
468145319d Merge 2.1 into 2.2 branch. 2018-12-21 15:24:34 +08:00
grossmj
ef38ccfefa Automatically create a symbolic link to the IOU image in the IOU working directory. Fixes #1484 2018-12-17 22:42:18 -06:00
grossmj
670b6d689a Merge remote-tracking branch 'origin/2.1' into 2.1 2018-12-14 19:53:51 -06:00
grossmj
fc75a6b8d3 Fix link pause/filters only work for the first interface of Docker containers. Fixes #1482 2018-12-14 19:53:43 -06:00
grossmj
f76b329cba Fix ConnectionResetError issues and switch to aiohttp version 3.4.4. Fixes #1474. 2018-12-03 19:14:22 +08:00
grossmj
030714ae80 Fix server authentication. 2018-12-03 18:46:24 +08:00
grossmj
0fd54536d2 Fix issue when there is no gns3_controller.conf. Fixes https://github.com/GNS3/gns3-gui/issues/2644 2018-11-30 19:09:10 +08:00
grossmj
58b2ee152d Fix Docker console test. 2018-11-30 18:59:02 +08:00
grossmj
bec2270334 Fix non responsive console for Docker VMs. Fixes https://github.com/GNS3/gns3-gui/issues/2645 2018-11-30 17:06:21 +08:00
grossmj
56412b35e0 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/utils/asyncio/telnet_server.py
 2018-11-30 12:38:02 +08:00
grossmj
9fbdb25da8 Back to classic symbol theme. Ref https://github.com/GNS3/gns3-gui/issues/2644 2018-11-29 17:14:21 +08:00
Dušan Dragić
817a053dfc docker_vm: fix x11vnc not starting 2018-11-29 00:37:20 +01:00
grossmj
d7c2e16c21 Use "template" to name what we use to create new nodes. 2018-11-28 16:12:58 +07:00
grossmj
a17fa821bd Make sure nothing is named "compute server". 2018-11-27 18:14:51 +07:00
Jeremy Grossmann
b4a2bc5b47
Merge pull request #1467 from GNS3/symbol-themes 
Support symbol themes. Ref #1466
 2018-11-27 17:19:52 +07:00
grossmj
f39c27ff7b Allow usage property in Docker appliance. 2018-11-27 16:36:52 +07:00
grossmj
a93606d9ed Use "node" instead of "appliance" for grid support. 2018-11-27 16:13:22 +07:00
grossmj
dd14101eec Merge branch '2.2-grid-new-project' of git://github.com/kazkansouh/gns3-server into kazkansouh-2.2-grid-new-project 2018-11-27 15:50:24 +07:00
grossmj
83161bcdd4 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-11-27 15:47:29 +07:00
grossmj
60ac6d2dfe Telnet console resize support for Docker VM. 2018-11-27 15:06:56 +07:00
Jeremy Grossmann
1067f71952
Allow appliances to be loaded from file without the appliance id. 
Fixes https://github.com/GNS3/gns3-gui/issues/2639.
 2018-11-27 14:03:12 +07:00
Karim
8eb20525e8 Update schema to allow for drawing grid size to be part of project. 2018-11-26 15:31:28 +00:00
grossmj
c0a0a13bdd Avoid _fix_permissions() to be called twice when stopping Docker VM. Ref #1428 2018-11-26 15:53:24 +07:00
grossmj
a3044ede77 Fix _fix_permissions() garbles permissions in Docker VM. Ref #1428 2018-11-25 17:11:42 +07:00
grossmj
df3baffd9b Fix "None is not of type 'integer'" when opening project containing a Qemu VM. Fixes #2610. 2018-11-24 19:56:29 +07:00
grossmj
219c346187 Remove useless warning. 2018-11-24 17:04:16 +07:00
grossmj
e0813bfbe8 Normalize symbol ID on Windows. 2018-11-23 18:47:42 +07:00
grossmj
9f7f26700e Debugging for Windows. 2018-11-23 18:33:45 +07:00
grossmj
51787295dd Use POSIX path for symbol ID. 2018-11-23 18:26:04 +07:00
grossmj
17d070dca7 Early support for symbol themes. 2018-11-23 17:27:10 +07:00
grossmj
301b7475f7 Sync appliances 2018-11-21 14:13:14 +07:00
grossmj
53928b884f Bump version to 2.2.0dev5 2018-11-20 14:37:38 +07:00
grossmj
5cb0957f35 Require privileged access for uBridge when using VMware VMs and Docker containers. Fixes #1461. 2018-11-20 00:22:16 +07:00
grossmj
3fae6ada95 Only require privileged access for uBridge when connecting a cloud to an Ethernet/TAP interface. Fixes #1461. 2018-11-19 17:33:17 +07:00
grossmj
3497deaa31 Allow virtual machines to use files in project directory as disk images. 2018-11-19 15:53:43 +07:00
grossmj
bd657c0167 Support to duplicate an appliance. 2018-11-18 17:05:16 +07:00
grossmj
9b83b087cb Fix mac address schema validation for Qemu VM appliance. Fixes https://github.com/GNS3/gns3-gui/issues/2629 2018-11-18 16:20:50 +07:00
grossmj
a33b8eac3a Support "L1 keepalives" in IOU appliance schema. 2018-11-18 16:04:08 +07:00
grossmj
3512fde841 Fix small bugs when using the new appliance management API. 2018-11-17 22:16:18 +07:00
grossmj
74e1463015 Fix bug with custom adapters and categories for Docker VM. Fixes https://github.com/GNS3/gns3-gui/issues/2613 2018-11-17 21:50:00 +07:00
grossmj
aa4593c993 Handle custom adapters in schemas. 2018-11-17 20:09:34 +07:00
grossmj
499ab9844a Reorganize how appliance creation is validated against JSON schemas. 
This allows for clearer error messages when validation fails.
 2018-11-17 18:12:46 +07:00
grossmj
71fcf855b4 Add tests for all appliance types. 2018-11-17 15:37:20 +07:00
grossmj
627c7e9cfe Use schema to set appliance default values and better schema validation error messages. 2018-11-16 23:02:10 +07:00
grossmj
1184f29b90 Add appliance API tests. Ref #1427. 2018-11-15 21:34:36 +07:00
grossmj
9aafa4e62f Schema validation for appliance API. Ref #1427. 2018-11-15 17:28:17 +07:00
grossmj
98f04365b7 Remove generic controller settings API endpoint. 2018-11-14 16:24:30 +08:00
grossmj
cebb56387a Fix tests. 2018-11-13 15:40:18 +08:00
grossmj
f91d3c9dbb Merge branch '2.2' into appliance-api 2018-11-13 14:59:55 +08:00
grossmj
089fdff4f1 Working dedicated appliance management API. Ref https://github.com/GNS3/gns3-server/issues/1427 2018-11-13 14:59:18 +08:00
grossmj
d45d52f15c Support Xtigervnc restart. 2018-11-11 23:23:30 +08:00
grossmj
029344da14 Only require Xtigervnc or Xvfb+x11vnc for Docker with vnc console. Ref #1438 2018-11-11 22:33:58 +08:00
grossmj
36474f7bab Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
 2018-11-11 22:31:29 +08:00
grossmj
d0bab9947e Support tigervnc in Docker VM. Ref #1438 2018-11-11 21:07:33 +08:00
grossmj
f0fe9d39fa Base for dedicated appliance management API. Ref https://github.com/GNS3/gns3-server/issues/1427 2018-11-11 20:13:58 +08:00
grossmj
887b32c4bc Merge remote-tracking branch 'origin/2.2' into 2.2 2018-11-11 20:08:37 +08:00
grossmj
f03ba5ca0b Update appliance templates. 2018-11-11 20:08:13 +08:00
ziajka
41fbbf7a56 Reorder routes in order to get working CORS 2018-11-08 11:47:09 +01:00
ziajka
fcd102317a
Merge pull request #1448 from GNS3/disable-cors-cache 
Disable CORS cache, Fixes: #1445
 2018-11-06 13:38:43 +01:00
ziajka
249b2255f6 Fix CORS response on node deletion, Fixes: #1446 2018-11-06 13:37:03 +01:00
ziajka
78c693ff63 Disable CORS cache, Fixes: #1445 2018-11-06 13:31:14 +01:00
grossmj
2764828f38 Refactor how clients access PCAP capture files. Fixes https://github.com/GNS3/gns3-gui/issues/2438. 
* The PCAP file is directly accessed if controller and client are on the same host.
* The PCAP file is streamed from the compute server to the client with the controller as a proxy when the controller is remote for the client.
 2018-10-27 14:47:17 +07:00
ziajka
bf1b801cc0 Remove static dir configuration 2018-10-24 09:04:05 +02:00
ziajka
fa5571ced1 FIX PUT CORS for nodes, Fixes: #1434 2018-10-23 11:09:38 +02:00
grossmj
ab8dc52ece Fix tests to work with new version of aiohttp (>= 3.0) 2018-10-17 17:32:10 +07:00
grossmj
9ae9209881 Update appliance templates. 2018-10-16 16:20:37 +07:00
grossmj
86f87aec74 Fix installation with Python 3.7. Fixes #1414. 
Fix deprecated use of aiohttp.Timeout. Fixes #1296.
Use "async with" with aiohttp.ClientSession().
Make sure websocket connections are properly closed, see https://docs.aiohttp.org/en/stable/web_advanced.html#graceful-shutdown
Finish to drop Python 3.4.
 2018-10-16 15:56:06 +07:00
grossmj
de5934f818 Merge remote-tracking branch 'origin/2.2' into 2.2 2018-10-15 17:06:25 +07:00
grossmj
76af98404a Drop Python 3.4 and switch to async / await syntax for asyncio. Fixes #1425 2018-10-15 17:05:49 +07:00
Karim
14fb64b941 Added "/sbin" to init script PATH variable so that its possible to 
use more sophosticated dhcp clients (compared to the udhcpc that is
provided by busybox) by installing them into the docker image in
the normal way.
 2018-10-06 16:06:24 +01:00
grossmj
8baa480b79 Fix tests. 2018-10-06 21:57:03 +08:00
grossmj
97c68f56bf Notify users if x11vnc process has crashed. Fix #1401. 2018-10-06 21:30:39 +08:00
grossmj
22f7ca0243 Return compute port information via API. Ref #1420. 2018-10-05 12:48:20 +02:00
grossmj
eb97ebf311 Fix platform.linux_distribution() is deprecated. Fixes https://github.com/GNS3/gns3-gui/issues/2578 2018-10-04 16:32:49 +02:00
grossmj
9de13c570c Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/compute/dynamips/nodes/ethernet_switch.py
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
#	gns3server/controller/__init__.py
#	gns3server/version.py
#	gns3server/web/web_server.py
 2018-10-04 15:44:13 +02:00
grossmj
e4a6db8ebc Fix some typos. 2018-10-04 15:22:42 +02:00
grossmj
181a31be32 Update minimum VIX version requirements for VMware. Ref #1415. 2018-10-02 11:22:32 +02:00
grossmj
8d368cd0f6 Development on 2.1.12dev1 2018-09-28 20:50:03 +02:00
grossmj
41d4ecc4b7 Release v2.1.11 2018-09-28 20:47:44 +02:00
grossmj
4d95e0b51f Catch some exceptions. 2018-09-28 15:04:38 +02:00
grossmj
4efdefaf5a Development on 2.1.11dev1 2018-09-15 11:23:18 +02:00
grossmj
b6b345508b Release v2.1.10 2018-09-15 11:19:55 +02:00
grossmj
5d2e539193 Update appliances. 2018-09-14 22:18:13 +02:00
grossmj
eb0e26b55f Include locale information and GNS3 VM version in crash reports. 2018-09-12 15:38:20 +02:00
grossmj
17d657c919 Fix small errors like unhandled exceptions etc. 2018-09-11 15:06:01 +02:00
grossmj
0aa9ab53d1 Import encodings.idna to avoid LookupError when standard library is in a zip file. 2018-09-07 09:34:17 +02:00
grossmj
4021a13651 Catch exceptions in various locations to fix small issues reported by Sentry. 2018-09-06 09:49:12 +02:00
grossmj
341e2e2e3a Check if serial pipe can be opened for VMware and VirtualBox VMs. 2018-09-06 07:02:32 +02:00
grossmj
f8ecd61a98 Notify users if xvfb process or x11vnc process have crashed. Ref #1401. 2018-09-05 15:16:07 +08:00
grossmj
c620d0be84 Improve the invalid port format detection. Fixes https://github.com/GNS3/gns3-gui/issues/2580 2018-09-05 13:35:42 +08:00
grossmj
4a6202fa84 Update setup.py and fix minor issues. 2018-09-02 15:32:33 +07:00
grossmj
f89d645b56 Update appliances. 2018-08-31 19:33:03 +07:00
grossmj
6822ff65a2 Disable static directory. Ref https://github.com/GNS3/gns3-gui/issues/2558. 2018-08-30 17:34:26 +07:00
grossmj
ef4db112f1 Fix typo. 2018-08-29 17:27:24 +07:00
grossmj
86be4f98f1 Fix wrong call after merging. 2018-08-29 16:22:37 +07:00
grossmj
3c332b895d Fix tests after merging. 2018-08-29 16:08:08 +07:00
grossmj
33e8710495 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/compute.py
#	gns3server/controller/gns3vm/__init__.py
#	gns3server/controller/link.py
#	gns3server/controller/project.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/utils/asyncio/__init__.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	tests/compute/qemu/test_qemu_vm.py
 2018-08-29 15:57:54 +07:00
grossmj
b7dd8b5176 Catch asyncio.CancelledError when shutting down the server. 2018-08-28 17:10:24 +07:00
grossmj
00cf66fb0f Report GNS3 VM errors to the GUI server summary. Ref #1359. 2018-08-28 15:42:06 +07:00
grossmj
8d4e73d23c Replace vboxnet0 (if it does not exist) by the first available vboxnet interface on Windows. Fixes https://github.com/GNS3/gns3-vm/issues/102 2018-08-26 03:28:38 -07:00
grossmj
4e712280b3 Merge remote-tracking branch 'origin/2.1' into 2.1 2018-08-26 02:44:01 -07:00
grossmj
4d57a3befa Check if the VirtualBox host-only network exists when starting a GNS3 VM running on VirtualBox. Ref https://github.com/GNS3/gns3-vm/issues/102 2018-08-26 02:43:40 -07:00
grossmj
38b72079b2 Change file timestamps if necessary because ZIP does not support timestamps before 1980. Fixes #1360. 2018-08-25 18:10:40 +07:00
grossmj
814526ba26 Add missing coroutine decorator Ref https://github.com/GNS3/gns3-gui/issues/2566 2018-08-25 16:00:40 +07:00
grossmj
f5dc635baa Fix test to support Python 3.7 Ref https://github.com/GNS3/gns3-gui/issues/2566 2018-08-25 15:50:08 +07:00
grossmj
902de3dd47 Refactor asyncio locking system for Python 3.7 support. Ref https://github.com/GNS3/gns3-gui/issues/2566 Ref https://github.com/GNS3/gns3-gui/issues/2568 2018-08-25 14:10:47 +07:00
grossmj
3560cda06c Use asyncio.ensure_future() instead of asyncio.async() with conservative approach to support Python < 3.4.4. Fixes https://github.com/GNS3/gns3-gui/issues/2566 2018-08-24 18:57:18 +07:00
grossmj
089d25c79d Forbid controller and compute servers to be different versions. 
Report last compute server error to clients and display in the server summary.
 2018-08-22 16:54:43 +07:00
grossmj
59ce105a50 Fix exception with short names for Dynamips interfaces. Fixes #1386. 2018-08-21 19:46:14 +07:00
grossmj
aeb33024ca Add missing Qemu boot priority values. Fixes https://github.com/GNS3/gns3-server/issues/1385 2018-08-21 17:49:58 +07:00
grossmj
9ef23ce6a8 Include HTTP error code when reporting an error while download appliance templates 
from GitHub repository.
 2018-08-21 17:30:34 +07:00
grossmj
b7f9b865c8 Optimize appliance templates update from GitHub repository by only downloading when the repository 
has been updated. Ref https://github.com/GNS3/gns3-gui/issues/2490
 2018-08-21 16:26:07 +07:00
grossmj
5958a23557 Update appliance templates from online registry. Ref #2490. 2018-08-19 16:02:47 +07:00
grossmj
a78ee18977 Update appliance templates. 2018-08-18 16:49:21 +07:00
grossmj
7f72b90b0e The server has now 2 notification streams 
* A new one for controller related events (compute, appliance templates etc.)
* The existing one for project related events (links, nodes etc.)
 2018-08-16 21:31:57 +07:00
grossmj
dac3ba19b7 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/controller/ports/port_factory.py
 2018-08-13 22:06:44 +07:00
ziajka
c593785c6d Development on 2.1.10dev1 2018-08-13 13:50:43 +02:00
ziajka
689a82a180 Release v2.1.9 2018-08-13 13:13:46 +02:00
grossmj
23e83b730b Fix some more problems with interface short names. Fixes https://github.com/GNS3/gns3-gui/issues/2562 2018-08-13 15:45:24 +07:00
grossmj
e5d38811ca Fix incorrect short port names in topology summary. Fixes https://github.com/GNS3/gns3-gui/issues/2562 2018-08-13 15:10:21 +07:00
grossmj
daa2de4541 Allow custom symbols to be sub-directories. 2018-08-13 00:16:02 +07:00
grossmj
29620f4ea3 Add affinity symbols. Ref https://github.com/GNS3/gns3-gui/issues/2488 2018-08-12 22:08:48 +07:00
grossmj
1fd010484d ACPI shutdown for GNS3 VM running on Hyper-V. Ref https://github.com/GNS3/gns3-gui/issues/763 2018-08-12 17:11:32 +07:00
grossmj
c48eebcc5d Hyper-V support for GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/763 2018-08-12 16:49:24 +07:00
grossmj
c0521732a9 Get IP address from guest Hyper-V VM. Ref https://github.com/GNS3/gns3-gui/issues/763 2018-08-12 01:49:48 -07:00
grossmj
c9767a06b3 Early Hyper-V support to run the GNS3 VM. Ref https://github.com/GNS3/gns3-gui/issues/763. 2018-08-10 16:18:14 +07:00
grossmj
89f7169589 Add appliance UUID added to the node data. Fixes #1334. 2018-08-09 17:45:33 +07:00
grossmj
a54359d243 Clean GNS3 close if one remote server is down. Fixes #1357. 2018-08-09 16:59:10 +07:00
grossmj
e3c8c9d484 Mark VirtualBox support for running the GNS3 VM as deprecated. Ref #1377. 2018-08-08 15:02:31 +07:00
grossmj
cc52a6a6b5 Change default z value for nodes to 1 2018-08-08 14:33:10 +07:00
grossmj
033f005bde Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
 2018-08-07 21:06:42 +07:00
grossmj
12e71a2917 Set lower process priority when computing idle-pc value on Windows. Ref #2522. 2018-08-07 19:31:33 +07:00
grossmj
17e51fdac6 Merge remote-tracking branch 'origin/2.1' into 2.1 2018-07-26 13:35:57 -05:00
grossmj
d0ed6931d8 Catch exception: ZIP does not support timestamps before 1980. Ref #1360. 2018-07-26 13:34:23 -05:00
ziajka
c274be1135 Sync appliances 2018-07-13 12:42:43 +02:00
ziajka
1cc1ccd511 Re-enable static directory 2018-07-02 09:25:39 +02:00
ziajka
ec8cfcd0f9 Disable static/ dir, Ref: #2532 2018-06-29 14:31:19 +02:00
ziajka
dd845eb096 Fix tests on Windows 2018-06-28 09:16:51 +02:00
ziajka
21780fa2ed Gitkeep for web-ui directory 2018-06-26 12:26:04 +02:00
ziajka
0e1f2e26d0 Serve WebUI handlers and update-bundled-web-ui script, Ref: #1362 2018-06-26 12:09:08 +02:00
ziajka
867e997b74 Support /static/ files serving, Ref: #1362 2018-06-22 15:29:47 +02:00
ziajka
e20e885d44 Release v2.1.8 2018-06-14 15:17:08 +02:00
grossmj
0f496907a0 Fix API status code for start/stop/suspend/reload a node. Fixes #1353. 
Fix issues with test.
Update documentation.
 2018-06-14 16:39:32 +08:00
ziajka
ac73c72727 Don't send variables to computes where are empty, Ref: #1340 2018-06-13 18:55:47 +02:00
ziajka
2e586f56ca Development on v2.1.8dev1 2018-06-12 11:15:06 +02:00
ziajka
0b742fc43d Release v2.1.7 2018-06-12 11:12:59 +02:00
Andrew Caudwell
b2e0a1b291 Don't release NIO UDP ports when updating docker container. 
When a docker container was updated, the NIO UDP ports were being released
from port_manager, but they were still stored in self._ethernet_adapters.
When the container was restarted, the same NIO ports would be used. However,
if a new connection was then added, it could assign a port that was already
in use. The end result was that traffic would be bridged across the wrong
interface connection.
 2018-06-11 15:17:13 +12:00
grossmj
96d5e351f7 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/version.py
#	requirements.txt
 2018-06-10 21:19:55 +07:00
grossmj
45edc40948 Timeout for stream file. 2018-06-10 21:18:16 +07:00
grossmj
1f017a0d1d Console support for clouds (to connect to external devices or services). 2018-06-10 17:43:29 +07:00
grossmj
34fcbd68f3 Fix switching console type from telnet to VNC throws error. 2018-06-09 22:08:30 +07:00
grossmj
40151cd1fe Fix switching console type from telnet to VNC throws error. Fixes #2489. 2018-06-09 21:47:36 +07:00
grossmj
1905a99ce7 Fix saved VM state was not deleted correctly. 2018-06-09 17:28:26 +07:00
grossmj
8851a55199 Fix timeout error with "save as" for large projects. 2018-06-07 22:26:23 +07:00
grossmj
62f87de23a Add API endpoint to return all links attached to a node. 2018-06-06 20:46:44 +07:00
grossmj
fd5df0052a Fix issue with some SVG symbols that could not be used in GNS3. 
This was due to the height and width values being percentages.
 2018-06-06 16:32:51 +07:00
grossmj
19c5ff8521 Show correct free disk space value. 2018-06-06 14:59:44 +07:00
grossmj
fbfa75830e Bump version to 2.1.7dev1 2018-06-05 16:46:11 +07:00
grossmj
f8bf749577 Remove unwanted trailing characters and other white spaces when reading .md5sum files. 2018-06-05 00:01:20 +07:00
grossmj
d1ccf3bc84 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/version.py
#	requirements.txt
 2018-06-04 22:46:52 +07:00
grossmj
051eedb406 Change order to find vnetlib on Windows (PATH -> Registry -> Default directories). 2018-06-04 21:57:34 +07:00
ziajka
b0c89a4f2c Development on v2.1.7dev1 2018-05-22 14:14:31 +02:00
ziajka
eafe27e684 Release v2.1.6 2018-05-22 14:11:48 +02:00
ziajka
c52342907a
Merge pull request #1332 from GNS3/global-vars 
Docker `ExtraHosts`, global variables for project and supplier support, Fixes: #2482
 2018-05-15 09:23:54 +02:00
ziajka
f3c6faed75 Removed unnecessary line 2018-05-09 15:53:50 +02:00
ziajka
7b3d5ae5e3 Create/update project on compute when variables changes 2018-05-09 15:29:35 +02:00
ziajka
83445214be Support for nested global variables 2018-05-09 11:25:55 +02:00
ziajka
0bcc657bf1 Don't clean logo images when applied to the project 2018-05-08 16:22:35 +02:00
ziajka
f2700ed445 Support of supplier and variables in topology 2018-05-08 10:07:42 +02:00
ziajka
e267f8a8b8 Project global variables 2018-05-04 14:34:44 +02:00
grossmj
21a1800edc Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/export_project.py
#	gns3server/controller/import_project.py
#	gns3server/controller/project.py
#	gns3server/version.py
 2018-04-28 19:41:12 +07:00
grossmj
202e7362a5 Add command information when uBridge has an error. Ref #1289 2018-04-28 18:48:52 +07:00
grossmj
305fe2e817 Handle asyncio timeouts. Ref #1307. 2018-04-28 17:42:02 +07:00
grossmj
3b94484914 Fix bug with export project. Ref #1187 #1307. 2018-04-28 16:38:52 +07:00
grossmj
50a922f83e Offload slow file operations to threads for snapshots and project "save as". Ref #1187 #1307. 2018-04-28 16:01:43 +07:00
ziajka
80958e8a6d support based on init.sh, Ref: #2482 2018-04-27 14:33:07 +02:00
grossmj
20294e284c Fix exception from send_signal() on Windows. 2018-04-27 17:00:28 +07:00
ziajka
43081152ef Add support of ExtraHosts for Docker, Ref. gns3-gui#2482 2018-04-25 16:03:01 +02:00
ziajka
747814f083 Development on v2.1.6 2018-04-18 11:41:30 +02:00
ziajka
2e9c5590a8 Release v2.1.5 2018-04-18 11:29:02 +02:00
grossmj
cfd0216554 Disable TraceNG for version 2.1.5 2018-04-18 17:19:44 +08:00
grossmj
2ea0aa5ded Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py
 2018-04-18 17:08:42 +08:00
grossmj
9ecb058343 Fix tests. 2018-04-18 16:13:59 +08:00
grossmj
013c74f6d8 Sync appliance files. 2018-04-18 16:12:30 +08:00
grossmj
fff2e128eb Set the first byte to 0C when generating a random MAC address for a Qemu VM. Ref #1267. 2018-04-18 16:06:51 +08:00
grossmj
5690d350bd Update appliance files. 2018-04-17 12:58:37 +08:00
grossmj
1fea086f13 Do not use VMnet0 when allocating VMnet adapters. 2018-04-17 11:47:25 +08:00
grossmj
dd9c18b9f8 Use SO_REUSEADDR before calling bind() where missing. Fixes #1289. 2018-04-16 16:36:36 +08:00
grossmj
5c4f6dd3dc Do not fail a Dynamips project conversion if a file being used. 2018-04-16 15:45:43 +08:00
grossmj
a12c5a95b0 Catch exceptions when using AsyncioTelnetServer. Fixes #1321. 2018-04-16 15:30:06 +08:00
grossmj
025441f027 Add default destination setting for traceng + some checks. 2018-04-16 15:03:22 +08:00
grossmj
2de182eff4 Grid size support for projects. 2018-04-13 16:54:57 +08:00
grossmj
ee5317948b Fix tests. 2018-04-06 14:32:06 +07:00
grossmj
22a71b0e8c Fix problem with VM saved stated. 2018-04-06 13:19:54 +07:00
grossmj
7622c10cc9 Returns the ports' adapter types and mac addresses when available. 2018-04-06 13:19:17 +07:00
grossmj
395277d5c5 Support for console auto start. 2018-04-04 21:31:35 +07:00
grossmj
1d7f67695a Bump version to 2.2.0dev2 2018-04-03 12:51:09 +07:00
grossmj
757c103c03 Possibility to customize port names and adapter types for Qemu, VirtualBox, VMware and Docker. Fixes #2361. 
MAC addresses can customized for Qemu as well.
 2018-04-02 22:27:12 +07:00
grossmj
509b171b06 Allow to have projects with the same name in different locations. 2018-03-30 23:01:37 +07:00
grossmj
ea0009db6c Save state feature for VirtualBox and VMware. New "On close" setting to 
select the action to execute when closing/stopping a Qemu/VirtualBox/VMware VM.
 2018-03-30 21:18:44 +07:00
grossmj
3d1ee4da3f Support for suspend to disk / resume (Qemu). 2018-03-30 19:28:22 +07:00
grossmj
64949f5d04 Fix bug with 'none' console type for Ethernet switch. 
Fix some tests related to traceng.
 2018-03-30 13:00:52 +07:00
grossmj
669d2ec038 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/schemas/node.py
 2018-03-30 12:14:09 +07:00
grossmj
297bbd91ec Fix traceng tests. 2018-03-30 12:10:57 +07:00
grossmj
47e5dfabd8 Merge branch 'traceng' into 2.1 2018-03-29 15:17:41 +07:00
grossmj
898f180310 Fix issue with start all. 2018-03-29 13:32:56 +07:00
grossmj
b61bd2dc67 Merge remote-tracking branch 'origin/traceng' into traceng 2018-03-29 13:29:56 +07:00
grossmj
b7780ba7cc Check for valid IP address and prevent to run on non-Windows platforms. 2018-03-29 13:26:43 +07:00
grossmj
c053a2f350 Enable UDP tunnel option and use ICMP probing by default. 2018-03-28 04:26:40 -07:00
grossmj
05ec14e888 Use the configured IP address to trace. 2018-03-27 03:43:50 -07:00
grossmj
d08c08617c Support for source and destination for traceNG. 2018-03-27 16:58:49 +07:00
grossmj
8e695c8af1 Have TraceNG start without needing cmd.exe 2018-03-27 01:19:24 -07:00
grossmj
ff7911bd99 Allow to resize a Qemu VM disk (extend only). 2018-03-26 18:05:49 +07:00
grossmj
6cec67f79f Allow to select the default NAT interface in preferences for local server. 2018-03-26 14:23:01 +07:00
grossmj
caa2bda71b Spice with agent support for Qemu VMs. 2018-03-25 14:36:14 +07:00
grossmj
d419d3fa39 Check if the HAXM service is running when starting a Qemu VM with hardware acceleration. Ref #1242. 2018-03-24 22:15:20 +07:00
grossmj
5d704aa478 Fix tests. 2018-03-24 18:25:09 +07:00
grossmj
e52775fa3a Support for console type "none". 2018-03-24 18:11:21 +07:00
grossmj
54661c50b2 Fix tests related to console type changes. 2018-03-23 21:29:39 +07:00
grossmj
b6275deeef Fix tests. 2018-03-23 16:01:21 +07:00
grossmj
b8353bc0d5 Support for none console type (Qemu & Docker only) 2018-03-23 15:44:16 +07:00
grossmj
a40fdb3641 Fix bug and add optimizations when connecting and sending commands to QEMU monitor after starting a VM. Fixes #2336. 2018-03-23 00:07:32 +07:00
grossmj
135bbe8825 Check if HAXM support is installed on macOS. Ref #1242. 2018-03-22 22:37:09 +07:00
grossmj
9a9ac6d9f7 Fix some issues with hardware acceleration support for Qemu. 2018-03-22 15:45:41 +07:00
grossmj
17bfed52f2 Fix Qemu VM tests. 2018-03-22 14:05:31 +07:00
grossmj
44f2acffa5 Support Qemu with HAXM acceleration. Ref #1242. 2018-03-21 16:41:25 +07:00
grossmj
85dcb985eb Fix packet filters for Dynamips. 2018-03-20 11:15:42 +07:00
grossmj
279b4d7b20 Fix link filters/suspend tests. 2018-03-19 18:25:56 +07:00
grossmj
8b91894fa4 Improve suspend a link for Qemu and VirtualBox VMs. 
A suspended link will be unplugged allowing the VMs to be notified
of the change.
 2018-03-19 16:26:12 +07:00
grossmj
cde30f8f53 Fix warning message. 2018-03-19 14:23:46 +07:00
grossmj
c7875f93a3 Qemu VM support to detect when a link is plugged/unplugged. 2018-03-19 14:22:10 +07:00
grossmj
b7e436efdf Fix tests. 2018-03-15 20:47:42 +07:00
grossmj
aaf59e6050 Allow to configure the interface to be used by the NAT node. Fixes #1175. 2018-03-15 17:20:40 +07:00
grossmj
08493871a5 Restrict the list of available Ethernet/TAP adapters. Fixes #352. 2018-03-15 16:33:23 +07:00
grossmj
fb3bcf3b8f Basic project stats. 2018-03-15 15:21:29 +07:00
grossmj
90ce6093d8 Some spring cleaning. 2018-03-15 14:17:39 +07:00
grossmj
88674455a3 Merge branch '2.1' into 2.2 
# Conflicts:
#	gns3server/version.py
#	tests/compute/docker/test_docker_vm.py
 2018-03-14 18:40:37 +07:00
grossmj
a4626a2b79 Custom icons and small fixes for TraceNG integration. 2018-03-14 16:56:37 +07:00
grossmj
397c1322b4 Base support for TraceNG. 2018-03-12 17:57:13 +07:00
ziajka
148baaf465 Back to development on v2.1.5dev1 2018-03-12 11:27:02 +01:00
ziajka
e54a94240d Re-release v2.1.4 2018-03-12 09:40:42 +01:00
ziajka
4ca216b181 Development on v2.1.5dev1 2018-03-12 09:26:07 +01:00
ziajka
e417ee8fed Release v2.1.4 2018-03-12 09:19:18 +01:00
grossmj
658aa4bae9 Merge 2.1 into 2.2 branch 2018-03-12 13:38:50 +07:00
grossmj
3201a996ed Add Juniper JunOS space appliance. 2018-03-11 23:02:43 +07:00
grossmj
1df03d052f Sync checkpoint gaia appliance template. 2018-03-09 15:41:17 +07:00
grossmj
da31358a65 Sync appliance templates. 2018-03-09 15:26:40 +07:00
grossmj
38f458db7c Delete old pcap file when starting a new packet capture. 2018-03-08 16:00:05 +07:00
grossmj
233e41d006 Fix export project test. 2018-03-08 00:39:08 +07:00
grossmj
22db13d2bf Fix bug preventing to export portable projects with IOU images. 2018-03-08 00:13:35 +07:00
grossmj
0fde1cf54a Ignore invalid BPF filters. Ref #1290. 2018-03-07 21:37:15 +07:00
grossmj
00e781826b Different approach to handle no data returned by uBridge hypervisors. Fixes #1289. 2018-03-07 19:42:19 +07:00
grossmj
7c14e21f4a Different approach to handle no data returned by Dynamips or uBridge hypervisors. Fixes #1289. 2018-03-07 19:33:19 +07:00
grossmj
a3a0657502 Do not raise exception if Dynamips or uBridge hypervisor don't return data and are still running. Fixes #1289 2018-03-07 19:11:34 +07:00
grossmj
3ca4f72b99 Fix Dynamips private config not loaded into nvram when starting a router. Fixes #1313. 2018-03-07 18:18:51 +07:00
grossmj
d911e82dc4 Merge remote-tracking branch 'origin/2.1' into 2.1 2018-03-07 16:42:12 +07:00
grossmj
c93d0d8d12 Make sure we don't try to read when opening a file in binary more. Fixes #1301. 2018-03-07 16:39:04 +07:00
ziajka
53a229f8e9 Fix never reached condition 2018-03-05 11:16:03 +01:00
ziajka
05b6be2e42 Compatybility with controller, default_symbol and hover_symbol, Fixes: #2444 2018-03-02 13:48:27 +01:00
ziajka
9be76d98a2 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:38:32 +01:00
ziajka
09c7d73ee9 Filter snapshots directory during the snapshot, Fixes: #1297 2018-02-28 16:33:20 +01:00
ziajka
e79e27a73f Handle docker env with last empty line, Fixes: #2420 2018-02-27 16:33:55 +01:00
Jeremy Grossmann
a0f2dd374e
Require uBridge version 0.9.14 on Linux 2018-02-26 23:18:44 +07:00
Bernhard Ehlers
3a09bd43dc Implement a minimum interval between psutil calls. Fixes #2262 2018-02-13 11:31:04 +01:00
grossmj
fff593b358 Fix error when appliance template is broken (missing fields). Fixes #1287. 2018-02-06 16:07:23 +08:00