arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-11 16:41:04 +00:00
Code Issues Releases Wiki Activity

Migration to 2.0 rename instructions.txt to README.txt

Browse Source 
Fix #612
This commit is contained in:
Julien Duponchelle 2016-07-13 09:58:53 +02:00
parent 2c62b1eeb8
commit 3dccfbb852
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gns3server/controller/topology.py
View File

@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import os
import json import json
import jsonschema import jsonschema
import uuid import uuid
@ -90,7 +91,7 @@ def load_topology(path):
# 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") shutil.copy(path, path + ".backup")
topo = _convert_1_3_later(topo) topo = _convert_1_3_later(topo, path)
with open(path, "w+") as f: with open(path, "w+") as f:
json.dump(topo, f) json.dump(topo, f)
elif topo["revision"] > GNS3_FILE_FORMAT_REVISION: elif topo["revision"] > GNS3_FILE_FORMAT_REVISION:
@ -99,12 +100,14 @@ def load_topology(path):
return topo return topo
def _convert_1_3_later(topo): def _convert_1_3_later(topo, topo_path):
""" """
Convert topologies to the new file format Convert topologies from 1_3 to the new file format
Look in tests/topologies/README.rst for instructions to test changes here Look in tests/topologies/README.rst for instructions to test changes here
""" """
topo_dir = os.path.dirname(topo_path)
new_topo = { new_topo = {
"type": "topology", "type": "topology",
"revision": GNS3_FILE_FORMAT_REVISION, "revision": GNS3_FILE_FORMAT_REVISION,
@ -327,6 +330,12 @@ def _convert_1_3_later(topo):
} }
new_topo["topology"]["drawings"].append(new_rectangle) new_topo["topology"]["drawings"].append(new_rectangle)
# Convert instructions.txt to README.txt
instructions_path = os.path.join(topo_dir, "instructions.txt")
readme_path = os.path.join(topo_dir, "README.txt")
if os.path.exists(instructions_path) and not os.path.exists(readme_path):
shutil.move(instructions_path, readme_path)
return new_topo return new_topo

1
tests/topologies/1_5_builtins/after/README.txt Normal file
View File

@ -0,0 +1 @@
hello

1
tests/topologies/1_5_builtins/before/instructions.txt Normal file
View File

@ -0,0 +1 @@
hello