Skip to content

Commit 5092bc5

Browse files
julien-duponchellejulien-duponchelle
committed
Change default port to 3080
Ref GNS3/gns3-server#457
1 parent b013e8a commit 5092bc5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+93
-93
lines changed

Diff for: ‎gns3/servers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ def vmServer(self):
635635

636636
return self._vm_server
637637

638-
def _addRemoteServer(self, protocol="http", host="localhost", port=8000, ram_limit=0, user=None, password=None, accept_insecure_certificate=False, id=None):
638+
def _addRemoteServer(self, protocol="http", host="localhost", port=3080, ram_limit=0, user=None, password=None, accept_insecure_certificate=False, id=None):
639639
"""
640640
Adds a new remote server.
641641

Diff for: ‎gns3/settings.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
DEFAULT_CONFIGS_PATH = os.path.normpath(os.path.expanduser("~/GNS3/configs"))
3838

3939
DEFAULT_LOCAL_SERVER_HOST = "127.0.0.1"
40-
DEFAULT_LOCAL_SERVER_PORT = 8000
40+
DEFAULT_LOCAL_SERVER_PORT = 3080
4141

4242
# Pre-configured Telnet console commands on various OSes
4343
if sys.platform.startswith("win"):
@@ -308,7 +308,7 @@
308308
"adjust_local_server_ip": True,
309309
"vmname": "GNS3 VM",
310310
"vmx_path": "",
311-
"server_port": 8000, # hardcoded for now
311+
"server_port": 3080, # hardcoded for now
312312
"virtualization": "VMware",
313313
"user": "",
314314
"password": ""

Diff for: ‎gns3/ui/iouvm_converter_wizard.ui

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<li>Log as root with password cisco</li>
116116
<li>Type ifconfig eth0</li>
117117
<li>Remember the addr</li>
118-
<li>In your browser open http://THEADDR:8000</li>
118+
<li>In your browser open http://THEADDR:3080</li>
119119
<li>Download projects and images backups</li>
120120
<li>halt the vm</li>
121121
&lt;/ul&gt;</string>
@@ -133,7 +133,7 @@
133133
&lt;ul&gt;
134134
&lt;li&gt;Start the GNS3 VM&lt;/li&gt;
135135
&lt;li&gt;Remember the IP display on the information screen&lt;/li&gt;
136-
&lt;li&gt;In a browser open http://THEIP:8000/upload&lt;/li&gt;
136+
&lt;li&gt;In a browser open http://THEIP:3080/upload&lt;/li&gt;
137137
&lt;li&gt;Select the option for restoring projects and upload the previous backup&lt;/li&gt;
138138
&lt;li&gt;Select the option for restoring images and upload the previous backup&lt;/li&gt;
139139
&lt;/ul&gt;</string>

Diff for: ‎gns3/ui/iouvm_converter_wizard_ui.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,15 @@ def retranslateUi(self, IOUVMConverterWizard):
173173
"<li>Log as root with password cisco</li>\n"
174174
"<li>Type ifconfig eth0</li>\n"
175175
"<li>Remember the addr</li>\n"
176-
"<li>In your browser open http://THEADDR:8000</li>\n"
176+
"<li>In your browser open http://THEADDR:3080</li>\n"
177177
"<li>Download projects and images backups</li>\n"
178178
"<li>halt the vm</li>\n"
179179
"</ul>"))
180180
self.label_11.setText(_translate("IOUVMConverterWizard", "<h1>Restore backups</h1>\n"
181181
"<ul>\n"
182182
"<li>Start the GNS3 VM</li>\n"
183183
"<li>Remember the IP display on the information screen</li>\n"
184-
"<li>In a browser open http://THEIP:8000/upload</li>\n"
184+
"<li>In a browser open http://THEIP:3080/upload</li>\n"
185185
"<li>Select the option for restoring projects and upload the previous backup</li>\n"
186186
"<li>Select the option for restoring images and upload the previous backup</li>\n"
187187
"</ul>"))

Diff for: ‎gns3/ui/server_preferences_page.ui

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
<number>65535</number>
166166
</property>
167167
<property name="value">
168-
<number>8000</number>
168+
<number>3080</number>
169169
</property>
170170
</widget>
171171
</item>
@@ -616,7 +616,7 @@
616616
<number>65535</number>
617617
</property>
618618
<property name="value">
619-
<number>8000</number>
619+
<number>3080</number>
620620
</property>
621621
</widget>
622622
</item>

Diff for: ‎gns3/ui/server_preferences_page_ui.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def setupUi(self, ServerPreferencesPageWidget):
9595
self.uiLocalServerPortSpinBox = QtWidgets.QSpinBox(self.uiGeneralSettingsGroupBox)
9696
self.uiLocalServerPortSpinBox.setSuffix(" TCP")
9797
self.uiLocalServerPortSpinBox.setMaximum(65535)
98-
self.uiLocalServerPortSpinBox.setProperty("value", 8000)
98+
self.uiLocalServerPortSpinBox.setProperty("value", 3080)
9999
self.uiLocalServerPortSpinBox.setObjectName("uiLocalServerPortSpinBox")
100100
self.gridLayout.addWidget(self.uiLocalServerPortSpinBox, 8, 0, 1, 1)
101101
self.uiConsoleConnectionsToAnyIPCheckBox = QtWidgets.QCheckBox(self.uiGeneralSettingsGroupBox)
@@ -306,7 +306,7 @@ def setupUi(self, ServerPreferencesPageWidget):
306306
self.uiRemoteServerPortSpinBox.setSizePolicy(sizePolicy)
307307
self.uiRemoteServerPortSpinBox.setSuffix(" TCP")
308308
self.uiRemoteServerPortSpinBox.setMaximum(65535)
309-
self.uiRemoteServerPortSpinBox.setProperty("value", 8000)
309+
self.uiRemoteServerPortSpinBox.setProperty("value", 3080)
310310
self.uiRemoteServerPortSpinBox.setObjectName("uiRemoteServerPortSpinBox")
311311
self.gridLayout_5.addWidget(self.uiRemoteServerPortSpinBox, 3, 1, 1, 1)
312312
self.uiRAMLimitLabel = QtWidgets.QLabel(self.uiRemoteTabWidget)

Diff for: ‎gns3/utils/wait_for_vm_worker.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,9 @@ def _start_virtualbox(self, vm_server):
297297
log.debug("Removing GNS3VM NAT port forwarding rule from interface {}".format(nat_interface_number))
298298
self._vm.execute_vboxmanage("controlvm", [self._vmname, "natpf{}".format(nat_interface_number), "delete", "GNS3VM"])
299299

300-
# add a GNS3VM NAT port forwarding rule to redirect 127.0.0.1 with random port to port 8000 in the VM
300+
# add a GNS3VM NAT port forwarding rule to redirect 127.0.0.1 with random port to port 3080 in the VM
301301
log.debug("Adding GNS3VM NAT port forwarding rule with port {} to interface {}".format(port, nat_interface_number))
302-
self._vm.execute_vboxmanage("controlvm", [self._vmname, "natpf{}".format(nat_interface_number), "GNS3VM,tcp,{},{},,8000".format(ip_address, port)])
302+
self._vm.execute_vboxmanage("controlvm", [self._vmname, "natpf{}".format(nat_interface_number), "GNS3VM,tcp,{},{},,3080".format(ip_address, port)])
303303

304304
if not self._is_running:
305305
return False

Diff for: ‎tests/conftest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def local_server():
6666

6767
server = Servers.instance().localServer()
6868
server.setHost('127.0.0.1')
69-
server.setPort(8000)
69+
server.setPort(3080)
7070
return server
7171

7272

Diff for: ‎tests/registry/test_config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def empty_config(tmpdir, images_dir, symbols_dir):
3838
"images_path": images_dir,
3939
"symbols_path": symbols_dir,
4040
"path": "",
41-
"port": 8000,
41+
"port": 3080,
4242
"projects_path": str(tmpdir),
4343
"report_errors": False,
4444
"udp_end_port_range": 20000,

Diff for: ‎tests/schemas/0.8_schema.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@
316316
"host": "127.0.0.1",
317317
"id": 2,
318318
"local": true,
319-
"port": 8000,
319+
"port": 3080,
320320
"protocol": "http",
321321
"ram_limit": 0,
322322
"vm": false
@@ -325,4 +325,4 @@
325325
},
326326
"type": "topology",
327327
"version": "1.4.0dev2"
328-
}
328+
}

Diff for: ‎tests/schemas/1.3.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@
6666
"host": "192.168.1.11",
6767
"id": 1,
6868
"local": true,
69-
"port": 8000
69+
"port": 3080
7070
}
7171
]
7272
},
7373
"type": "topology",
7474
"version": "1.3.3"
75-
}
75+
}

Diff for: ‎tests/schemas/1_1_topology.gns3

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"font": "TypeWriter,10,-1,5,75,0,0,0,0,0",
1313
"text": "f0/1",
1414
"x": 68.77708763999664,
15-
"y": 4.111456180001682
15+
"y": 4.111456130801682
1616
},
1717
"id": 2,
1818
"source_node_id": 4,
@@ -519,10 +519,10 @@
519519
"host": "127.0.0.1",
520520
"id": 1,
521521
"local": true,
522-
"port": 8000
522+
"port": 3080
523523
}
524524
]
525525
},
526526
"type": "topology",
527527
"version": "1.1"
528-
}
528+
}

Diff for: ‎tests/schemas/TshootRebuild.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -1733,10 +1733,10 @@
17331733
"host": "127.0.0.1",
17341734
"id": 1,
17351735
"local": true,
1736-
"port": 8000
1736+
"port": 3080
17371737
}
17381738
]
17391739
},
17401740
"type": "topology",
17411741
"version": "1.2.1"
1742-
}
1742+
}

Diff for: ‎tests/schemas/ccnp-ch4-eigrp.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@
481481
"host": "127.0.0.1",
482482
"id": 1,
483483
"local": true,
484-
"port": 8000,
484+
"port": 3080,
485485
"protocol": "http",
486486
"ram_limit": 0,
487487
"vm": false
@@ -490,4 +490,4 @@
490490
},
491491
"type": "topology",
492492
"version": "1.4.0beta1"
493-
}
493+
}

Diff for: ‎tests/schemas/cloud1.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
"host": "192.168.1.11",
4242
"id": 1,
4343
"local": true,
44-
"port": 8000,
44+
"port": 3080,
4545
"protocol": "http"
4646
}
4747
]
4848
},
4949
"type": "topology",
5050
"version": "1.4.0.dev1"
51-
}
51+
}

Diff for: ‎tests/schemas/dynamips_3725_no_idlepc.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
"host": "192.168.1.11",
6767
"id": 1,
6868
"local": true,
69-
"port": 8000,
69+
"port": 3080,
7070
"protocol": "http"
7171
}
7272
]
7373
},
7474
"type": "topology",
7575
"version": "1.4.0.dev1"
76-
}
76+
}

Diff for: ‎tests/schemas/dynamips_3725_wic.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@
7474
"host": "192.168.1.11",
7575
"id": 1,
7676
"local": true,
77-
"port": 8000,
77+
"port": 3080,
7878
"protocol": "http"
7979
}
8080
]
8181
},
8282
"type": "topology",
8383
"version": "1.4.0.dev1"
84-
}
84+
}

Diff for: ‎tests/schemas/dynamips_7200.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@
9898
"host": "192.168.1.11",
9999
"id": 1,
100100
"local": true,
101-
"port": 8000,
101+
"port": 3080,
102102
"protocol": "http"
103103
}
104104
]
105105
},
106106
"type": "topology",
107107
"version": "1.4.0.dev1"
108-
}
108+
}

Diff for: ‎tests/schemas/dynamips_aux.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,10 +250,10 @@
250250
"host": "192.168.1.11",
251251
"id": 1,
252252
"local": true,
253-
"port": 8000
253+
"port": 3080
254254
}
255255
]
256256
},
257257
"type": "topology",
258258
"version": "1.3.0rc1"
259-
}
259+
}

Diff for: ‎tests/schemas/dynamips_c3725.gns3

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"host": "192.168.1.11",
6868
"id": 1,
6969
"local": true,
70-
"port": 8000,
70+
"port": 3080,
7171
"protocol": "http"
7272
}
7373
]

Diff for: ‎tests/schemas/dynamips_ios.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@
179179
"host": "127.0.0.1",
180180
"id": 1,
181181
"local": true,
182-
"port": 8000,
182+
"port": 3080,
183183
"protocol": "http"
184184
}
185185
]
186186
},
187187
"type": "topology",
188188
"version": "1.4.0.dev1"
189-
}
189+
}

Diff for: ‎tests/schemas/dynamips_md5sum.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@
6363
"host": "127.0.0.1",
6464
"id": 2,
6565
"local": true,
66-
"port": 8000,
66+
"port": 3080,
6767
"protocol": "http"
6868
}
6969
]
7070
},
7171
"type": "topology",
7272
"version": "1.4.0.dev1"
73-
}
73+
}

Diff for: ‎tests/schemas/dynamips_standard_devices.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@
189189
"host": "127.0.0.1",
190190
"id": 1,
191191
"local": true,
192-
"port": 8000,
192+
"port": 3080,
193193
"protocol": "http"
194194
}
195195
]
196196
},
197197
"type": "topology",
198198
"version": "1.4.0.dev1"
199-
}
199+
}

Diff for: ‎tests/schemas/host.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
"host": "192.168.1.11",
6666
"id": 1,
6767
"local": true,
68-
"port": 8000,
68+
"port": 3080,
6969
"protocol": "http"
7070
}
7171
]
7272
},
7373
"type": "topology",
7474
"version": "1.4.0.dev1"
75-
}
75+
}

Diff for: ‎tests/schemas/https.gns3

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"host": "127.0.0.1",
4646
"id": 1,
4747
"local": false,
48-
"port": 8000,
48+
"port": 3080,
4949
"protocol": "https",
5050
"user": ""
5151
}

Diff for: ‎tests/schemas/iou_asa.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,10 @@
424424
"host": "127.0.0.1",
425425
"id": 1,
426426
"local": true,
427-
"port": 8000
427+
"port": 3080
428428
}
429429
]
430430
},
431431
"type": "topology",
432432
"version": "1.2.3"
433-
}
433+
}

Diff for: ‎tests/schemas/iou_without_initial_config.gns3

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,11 @@
281281
"host": "192.168.1.11",
282282
"id": 1,
283283
"local": true,
284-
"port": 8000,
284+
"port": 3080,
285285
"protocol": "http"
286286
}
287287
]
288288
},
289289
"type": "topology",
290290
"version": "1.4.0.dev1"
291-
}
291+
}

0 commit comments

Comments
 (0)