arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Simplify conversion process from 1.3 to 2.0

Browse Source 
This could avoid some corruption issue.
This commit is contained in:
Julien Duponchelle 2017-02-02 11:52:55 +01:00
parent f0ff035c0b
commit 46d405c8b3
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gns3server/controller/topology.py
View File

@ -23,7 +23,6 @@ import glob
import shutil import shutil
import zipfile import zipfile
import aiohttp import aiohttp
import platform
import jsonschema import jsonschema
@ -117,34 +116,33 @@ def load_topology(path):
topo = json.load(f) topo = json.load(f)
except (OSError, UnicodeDecodeError, ValueError) as e: except (OSError, UnicodeDecodeError, ValueError) as e:
raise aiohttp.web.HTTPConflict(text="Could not load topology {}: {}".format(path, str(e))) raise aiohttp.web.HTTPConflict(text="Could not load topology {}: {}".format(path, str(e)))
if "revision" not in topo or topo["revision"] < 5:
if topo.get("revision", 0) > GNS3_FILE_FORMAT_REVISION:
raise aiohttp.web.HTTPConflict(text="This project is designed for a more recent version of GNS3 please update GNS3 to version {} or later".format(topo["version"]))
changed = False
if "revision" not in topo or topo["revision"] < GNS3_FILE_FORMAT_REVISION:
# If it's an old GNS3 file we need to convert it # If it's an old GNS3 file we need to convert it
# first we backup the file # first we backup the file
shutil.copy(path, path + ".backup{}".format(topo.get("revision", 0))) shutil.copy(path, path + ".backup{}".format(topo.get("revision", 0)))
changed = True
if "revision" not in topo or topo["revision"] < 5:
topo = _convert_1_3_later(topo, path) topo = _convert_1_3_later(topo, path)
_check_topology_schema(topo)
with open(path, "w+", encoding="utf-8") as f:
json.dump(topo, f, indent=4, sort_keys=True)
# Version before GNS3 2.0 alpha 4 # Version before GNS3 2.0 alpha 4
if topo["revision"] < 6: if topo["revision"] < 6:
shutil.copy(path, path + ".backup{}".format(topo.get("revision", 0)))
topo = _convert_2_0_0_alpha(topo, path) topo = _convert_2_0_0_alpha(topo, path)
_check_topology_schema(topo)
with open(path, "w+", encoding="utf-8") as f:
json.dump(topo, f, indent=4, sort_keys=True)
# Version before GNS3 2.0 beta 3 # Version before GNS3 2.0 beta 3
if topo["revision"] < 7: if topo["revision"] < 7:
shutil.copy(path, path + ".backup{}".format(topo.get("revision", 0)))
topo = _convert_2_0_0_beta_2(topo, path) topo = _convert_2_0_0_beta_2(topo, path)
_check_topology_schema(topo) _check_topology_schema(topo)
if changed:
with open(path, "w+", encoding="utf-8") as f: with open(path, "w+", encoding="utf-8") as f:
json.dump(topo, f, indent=4, sort_keys=True) json.dump(topo, f, indent=4, sort_keys=True)
if topo["revision"] > GNS3_FILE_FORMAT_REVISION:
raise aiohttp.web.HTTPConflict(text="This project is designed for a more recent version of GNS3 please update GNS3 to version {} or later".format(topo["version"]))
_check_topology_schema(topo)
return topo return topo