Drop GNS3 converter

Fix #1147
This commit is contained in:
Julien Duponchelle
2016-04-18 16:45:05 +02:00
parent 0f76819936
commit b2db2cc719
4 changed files with 0 additions and 65 deletions

View File

@@ -272,10 +272,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
License notice for gns3-converter
---------------------------------
https://github.com/dlintott/gns3-converter/blob/master/COPYING
License notice for pywin32
--------------------------
https://github.com/SublimeText/Pywin32/blob/master/License.txt

View File

@@ -28,10 +28,6 @@ import json
from .qt import QtCore
from .node import Node
from .version import __version__
try:
from gns3converter import __version__ as gns3converter_version
except ImportError:
gns3converter_version = "Not installed"
class ConsoleCmd(cmd.Cmd):
@@ -45,7 +41,6 @@ class ConsoleCmd(cmd.Cmd):
if hasattr(sys, "frozen"):
compiled = "(compiled)"
print("GNS3 version is {} {}".format(__version__, compiled))
print("GNS3 Converter version is {}".format(gns3converter_version))
print("Python version is {}.{}.{} ({}-bit) with {} encoding".format(sys.version_info[0],
sys.version_info[1],
sys.version_info[2],

View File

@@ -1346,58 +1346,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
return True
def _convertOldProject(self, path):
"""
Converts old ini-style GNS3 topologies (<=0.8.7) to the newer version 1+ JSON format.
:param path: path to the project file.
"""
try:
from gns3converter.main import do_conversion, get_snapshots, ConvertError
except ImportError as e:
log.error("GNS3 converter is missing: {}".format(str(e)))
QtWidgets.QMessageBox.critical(self, "GNS3 converter", "Please install gns3-converter in order to open old ini-style GNS3 projects")
self._createTemporaryProject()
return
try:
project_name = os.path.basename(os.path.dirname(path))
project_dir = os.path.join(self.projectsDirPath(), project_name)
while os.path.isdir(project_dir):
text, ok = QtWidgets.QInputDialog.getText(self,
"GNS3 converter",
"Project '{}' already exists. Please choose an alternative project name:".format(project_name),
text=project_name + "2")
if ok:
project_name = text
project_dir = os.path.join(self.projectsDirPath(), project_name)
else:
self._createTemporaryProject()
return
for snapshot_def in get_snapshots(path):
do_conversion(snapshot_def, project_name, project_dir, quiet=True)
topology_def = {'file': path, 'snapshot': False}
do_conversion(topology_def, project_name, project_dir, quiet=True)
except ConvertError as e:
QtWidgets.QMessageBox.critical(self, "GNS3 converter", "Could not convert {}: {}".format(path, e))
self._createTemporaryProject()
return
except Exception:
exc_type, exc_value, exc_tb = sys.exc_info()
lines = traceback.format_exception(exc_type, exc_value, exc_tb)
tb = "".join(lines)
MessageBox(self, "GNS3 converter", "Unexpected exception while converting {}".format(path), details=tb)
self._createTemporaryProject()
return
QtWidgets.QMessageBox.information(self, "GNS3 converter", "Your project has been converted to a new format and can be found in: {}".format(project_dir))
project_path = os.path.join(project_dir, project_name + ".gns3")
self._loadProject(project_path)
def _loadProject(self, path):
"""
Loads a project into GNS3.
@@ -1412,9 +1360,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
QtWidgets.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor)
extension = os.path.splitext(path)[1]
if extension == ".net":
self._convertOldProject(path)
return
topology.loadFile(path, self._project)
except OSError as e:
QtWidgets.QMessageBox.critical(self, "Load", "Could not load project {}: {}".format(os.path.basename(path), e))

View File

@@ -1,5 +1,4 @@
jsonschema>=2.4.0
raven>=5.2.0
psutil>=2.2.1
gns3-net-converter>=1.3.0
PyQt5==5.6.dev1604121819