Merge branch 'master' into 2.2

# Conflicts:
#	gns3server/version.py

gns3server/appliances/cisco-asav.gns3a

@@ -35,7 +35,7 @@
         {
             "filename": "asav992.qcow2",
             "version": "9.9.2",
-            "md5sum": "0cba453dbf70313d8d63a00700618f52",
+            "md5sum": "6fd1337c5334844484b371d1033c038a",
             "filesize": 204865536,
             "download_url": "https://software.cisco.com/download/home/286119613/type/280775065/release/9.9.2"
         },

gns3server/appliances/cisco-iosxrv9k.gns3a

@@ -24,6 +24,13 @@
         "options": "-smp 4 -cpu host"
     },
     "images": [
+        {
+            "filename": "xrv9k-fullk9-x-7.0.1.qcow2",
+            "version": "7.0.1",
+            "md5sum": "ca2817767fa546e303c3c536e211d33e",
+            "filesize": 1446445056,
+            "download_url": "https://software.cisco.com/download/home/286288939/type/280805694/release/7.0.1"
+        },
         {
             "filename": "xrv9k-fullk9-x-6.6.2.qcow2",
             "version": "6.6.2",
@@ -88,6 +95,12 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.0.1",
+            "images": {
+                "hda_disk_image": "xrv9k-fullk9-x-7.0.1.qcow2"
+            }
+        },
         {
             "name": "6.6.2",
             "images": {

gns3server/appliances/cisco-nxosv9k.gns3a

@@ -53,6 +53,13 @@
             "filesize": 1330315264,
             "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/9.2%25281%2529"
         },
+        {
+            "filename": "nxosv-final.7.0.3.I7.7.qcow2",
+            "version": "7.0.3.I7.7",
+            "md5sum": "5daab34b672f9534c9aee59a6c8903b3",
+            "filesize": 996212736,
+            "download_url": "https://software.cisco.com/download/home/286312239/type/282088129/release/7.0%25283%2529I7%25287%2529"
+        },
         {
             "filename": "nxosv-final.7.0.3.I7.6.qcow2",
             "version": "7.0.3.I7.6",
@@ -155,6 +162,13 @@
                 "hda_disk_image": "nxosv-final.9.2.1.qcow2"
             }
         },
+        {
+            "name": "7.0.3.I7.7",
+            "images": {
+                "bios_image": "OVMF-20160813.fd",
+                "hda_disk_image": "nxosv-final.7.0.3.I7.7.qcow2"
+            }
+        },
         {
             "name": "7.0.3.I7.6",
             "images": {

gns3server/appliances/f5-bigiq.gns3a

@@ -29,6 +29,13 @@
         "options": "-smp 2 -cpu host"
     },
     "images": [
+        {
+            "filename": "BIG-IQ-7.0.0.0.0.1854.qcow2",
+            "version": "7.0.0.0",
+            "md5sum": "89ff128c4ba82c266a6cefa21c80029b",
+            "filesize": 4312006656,
+            "download_url": "https://downloads.f5.com/esd/serveDownload.jsp?path=/big-iq/big-iq_cm/7.0.0/english/v7.0.0/&sw=BIG-IQ&pro=big-iq_CM&ver=7.0.0&container=v7.0.0&file=BIG-IQ-7.0.0.0.0.1854.qcow2.zip"
+        },
         {
             "filename": "BIG-IQ-6.0.1.1.0.0.9.qcow2",
             "version": "6.0.1.1",
@@ -95,6 +102,13 @@
         }
     ],
     "versions": [
+        {
+            "name": "7.0.0.0",
+            "images": {
+                "hda_disk_image": "BIG-IQ-7.0.0.0.0.1854.qcow2",
+                "hdb_disk_image": "empty100G.qcow2"
+            }
+        },
         {
             "name": "6.0.1.1",
             "images": {

gns3server/appliances/fortianalyzer.gns3a

@@ -15,7 +15,7 @@
     "port_name_format": "Port{port1}",
     "symbol": "fortinet.svg",
     "qemu": {
-        "adapter_type": "virtio-net-pci",
+        "adapter_type": "e1000",
         "adapters": 4,
         "ram": 1024,
         "hda_disk_interface": "virtio",

gns3server/appliances/fortiauthenticator.gns3a

@@ -15,7 +15,7 @@
     "port_name_format": "Port{port1}",
     "symbol": "fortinet.svg",
     "qemu": {
-        "adapter_type": "virtio-net-pci",
+        "adapter_type": "e1000",
         "adapters": 4,
         "ram": 1024,
         "hda_disk_interface": "virtio",

gns3server/appliances/forticache.gns3a

@@ -15,11 +15,11 @@
     "port_name_format": "Port{port1}",
     "symbol": "fortinet.svg",
     "qemu": {
-        "adapter_type": "virtio-net-pci",
+        "adapter_type": "e1000",
         "adapters": 3,
         "ram": 1024,
-        "hda_disk_interface": "ide",
+        "hda_disk_interface": "virtio",
-        "hdb_disk_interface": "ide",
+        "hdb_disk_interface": "virtio",
         "arch": "x86_64",
         "console_type": "telnet",
         "boot_priority": "c",

gns3server/appliances/fortigate.gns3a

@@ -15,7 +15,7 @@
     "port_name_format": "Port{port1}",
     "symbol": "fortinet.svg",
     "qemu": {
-        "adapter_type": "virtio-net-pci",
+        "adapter_type": "e1000",
         "adapters": 10,
         "ram": 1024,
         "hda_disk_interface": "virtio",

gns3server/appliances/hp-vsr1001.gns3a

@@ -21,7 +21,7 @@
         "console_type": "vnc",
         "boot_priority": "c",
         "kvm": "require",
-        "options": "-machine type=pc-1.0"
+        "options": "-cpu qemu64"
     },
     "images": [
         {

gns3server/appliances/mikrotik-chr.gns3a

@@ -28,11 +28,11 @@
     "images": [
         {
            "filename": "chr-6.44.3.img",
-           "version": "6.44.2",
+           "version": "6.44.3",
            "md5sum": "c46b33125d536faa24473a519abbb89d",
            "filesize": 67108864,
            "download_url": "http://www.mikrotik.com/download",
-           "direct_download_url": "https://download.mikrotik.com/routeros/6.44.2/chr-6.44.2.img.zip",
+           "direct_download_url": "https://download.mikrotik.com/routeros/6.44.3/chr-6.44.3.img.zip",
            "compression": "zip"
         },
         {

gns3server/version.py

@@ -23,8 +23,8 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "2.2.0rc5"
+__version__ = "2.2.0dev18"
-__version_info__ = (2, 2, 0, -99)
+__version_info__ = (2, 2, 0, 99)
 
 if "dev" in __version__:
     try: