Fincer
/
GNS3_patches
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Custom patches for GNS3 network topology simulator & planning software.
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
5 Commits
1 Branch
0 B
Tree: dc1cc226c7
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'dc1cc226c7'
${ noResults }
GNS3_patches/patches/gns3-gui/patch_gns3gui_qemu-envvars....

432 lines
16 KiB
Raw Normal View History

Add patches
3 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 
  1. Author: Pekka Helenius <pekka.helenius@fjordtek.com>
  2. Date: Sun, 6 Jun 2021 15:10:45 +0200
  3. Subject: [PATCH] GNS3 GUI: QEMU environment variables.
  4. 

  5. Add support for QEMU environment variables for GNS3 GUI.
  6. 

  7. --- a/tests/test_local_config.py

  8. +++ b/tests/test_local_config.py

  9. @@ -285,6 +285,7 @@

  10.                  "enable_kvm": True,
  11.                  "vms": [
  12.                      {
  13. +                        "env_vars": "",

  14.                          "kernel_image": "",
  15.                          "kernel_command_line": "",
  16.                          "first_port_name": "",
  17. @@ -323,6 +324,7 @@

  18.                          "platform": ""
  19.                      },
  20.                      {
  21. +                        "env_vars": "",

  22.                          "kernel_image": "",
  23.                          "kernel_command_line": "",
  24.                          "server": "vm",
  25. 

  26. --- a/gns3/modules/qemu/settings.py

  27. +++ b/gns3/modules/qemu/settings.py

  28. @@ -27,6 +27,7 @@

  29.  }
  30.  
  31.  QEMU_VM_SETTINGS = {
  32. +    "env_vars": "",

  33.      "name": "",
  34.      "default_name_format": "{name}-{0}",
  35.      "usage": "",
  36. 

  37. --- a/gns3/modules/qemu/qemu_vm.py

  38. +++ b/gns3/modules/qemu/qemu_vm.py

  39. @@ -42,7 +42,8 @@

  40.  
  41.          self._linked_clone = True
  42.  
  43. -        qemu_vm_settings = {"usage": "",

  44. +        qemu_vm_settings = {"env_vars": "",

  45. +                            "usage": "",

  46.                              "qemu_path": "",
  47.                              "hda_disk_image": "",
  48.                              "hdb_disk_image": "",
  49. --- a/gns3/modules/qemu/ui/qemu_vm_configuration_page_ui.py

  50. +++ b/gns3/modules/qemu/ui/qemu_vm_configuration_page_ui.py

  51. @@ -63,6 +63,12 @@

  52.          self.uiCPULabel = QtWidgets.QLabel(self.uiGeneralSettingsTab)
  53.          self.uiCPULabel.setObjectName("uiCPULabel")
  54.          self.gridLayout_4.addWidget(self.uiCPULabel, 5, 0, 1, 1)
  55. +        self.uiEnvvarLabel = QtWidgets.QLabel(self.uiGeneralSettingsTab)

  56. +        self.uiEnvvarLabel.setObjectName("uiEnvvarLabel")

  57. +        self.gridLayout_4.addWidget(self.uiEnvvarLabel, 9, 0, 1, 1)

  58. +        self.uiEnvvarLineEdit = QtWidgets.QLineEdit(self.uiGeneralSettingsTab)

  59. +        self.uiEnvvarLineEdit.setObjectName("uiEnvvarLineEdit")

  60. +        self.gridLayout_4.addWidget(self.uiEnvvarLineEdit, 9, 1, 1, 1)

  61.          self.uiCPUSpinBox = QtWidgets.QSpinBox(self.uiGeneralSettingsTab)
  62.          self.uiCPUSpinBox.setMinimum(1)
  63.          self.uiCPUSpinBox.setMaximum(255)
  64. @@ -93,7 +99,7 @@

  65.          self.gridLayout_4.addWidget(self.uiOnCloseComboBox, 8, 1, 1, 1)
  66.          self.uiConsoleTypeLabel = QtWidgets.QLabel(self.uiGeneralSettingsTab)
  67.          self.uiConsoleTypeLabel.setObjectName("uiConsoleTypeLabel")
  68. -        self.gridLayout_4.addWidget(self.uiConsoleTypeLabel, 9, 0, 1, 1)

  69. +        self.gridLayout_4.addWidget(self.uiConsoleTypeLabel, 10, 0, 1, 1)

  70.          self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
  71.          self.horizontalLayout_2.setObjectName("horizontalLayout_2")
  72.          self.uiConsoleTypeComboBox = QtWidgets.QComboBox(self.uiGeneralSettingsTab)
  73. @@ -107,9 +113,9 @@

  74.          self.uiConsoleAutoStartCheckBox = QtWidgets.QCheckBox(self.uiGeneralSettingsTab)
  75.          self.uiConsoleAutoStartCheckBox.setObjectName("uiConsoleAutoStartCheckBox")
  76.          self.horizontalLayout_2.addWidget(self.uiConsoleAutoStartCheckBox)
  77. -        self.gridLayout_4.addLayout(self.horizontalLayout_2, 9, 1, 1, 1)

  78. +        self.gridLayout_4.addLayout(self.horizontalLayout_2, 10, 1, 1, 1)

  79.          spacerItem = QtWidgets.QSpacerItem(263, 94, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
  80. -        self.gridLayout_4.addItem(spacerItem, 10, 1, 1, 1)

  81. +        self.gridLayout_4.addItem(spacerItem, 11, 1, 1, 1)

  82.          self.uiQemutabWidget.addTab(self.uiGeneralSettingsTab, "")
  83.          self.uiHddTab = QtWidgets.QWidget()
  84.          self.uiHddTab.setObjectName("uiHddTab")
  85. @@ -462,6 +468,7 @@

  86.          self.uiRamLabel.setText(_translate("QemuVMConfigPageWidget", "RAM:"))
  87.          self.uiRamSpinBox.setSuffix(_translate("QemuVMConfigPageWidget", " MB"))
  88.          self.uiCPULabel.setText(_translate("QemuVMConfigPageWidget", "vCPUs:"))
  89. +        self.uiEnvvarLabel.setText(_translate("QemuVMConfigPageWidget", "Environment variables:"))

  90.          self.uiQemuListLabel.setText(_translate("QemuVMConfigPageWidget", "Qemu binary:"))
  91.          self.uiBootPriorityLabel.setText(_translate("QemuVMConfigPageWidget", "Boot priority:"))
  92.          self.uiOnCloseLabel.setText(_translate("QemuVMConfigPageWidget", "On close:"))
  93. 

  94. --- a/gns3/modules/qemu/ui/qemu_vm_configuration_page.ui

  95. +++ b/gns3/modules/qemu/ui/qemu_vm_configuration_page.ui

  96. @@ -24,26 +24,23 @@

  97.         <string>General settings</string>
  98.        </attribute>
  99.        <layout class="QGridLayout" name="gridLayout_4">
  100. -       <item row="0" column="0">

  101. -        <widget class="QLabel" name="uiNameLabel">

  102. +       <item row="1" column="0">

  103. +        <widget class="QLabel" name="uiDefaultNameFormatLabel">

  104.           <property name="text">
  105. -          <string>Name:</string>

  106. +          <string>Default name format:</string>

  107.           </property>
  108.          </widget>
  109.         </item>
  110. -       <item row="0" column="1">

  111. -        <widget class="QLineEdit" name="uiNameLineEdit"/>

  112. +       <item row="8" column="2">

  113. +        <widget class="QComboBox" name="uiOnCloseComboBox"/>

  114.         </item>
  115. -       <item row="1" column="0">

  116. -        <widget class="QLabel" name="uiDefaultNameFormatLabel">

  117. +       <item row="0" column="0">

  118. +        <widget class="QLabel" name="uiNameLabel">

  119.           <property name="text">
  120. -          <string>Default name format:</string>

  121. +          <string>Name:</string>

  122.           </property>
  123.          </widget>
  124.         </item>
  125. -       <item row="1" column="1">

  126. -        <widget class="QLineEdit" name="uiDefaultNameFormatLineEdit"/>

  127. -       </item>

  128.         <item row="2" column="0">
  129.          <widget class="QLabel" name="uiSymbolLabel">
  130.           <property name="text">
  131. @@ -51,64 +48,23 @@

  132.           </property>
  133.          </widget>
  134.         </item>
  135. -       <item row="2" column="1">

  136. -        <layout class="QHBoxLayout" name="horizontalLayout_7">

  137. -         <item>

  138. -          <widget class="QLineEdit" name="uiSymbolLineEdit"/>

  139. -         </item>

  140. -         <item>

  141. -          <widget class="QToolButton" name="uiSymbolToolButton">

  142. -           <property name="text">

  143. -            <string>&amp;Browse...</string>

  144. -           </property>

  145. -           <property name="toolButtonStyle">

  146. -            <enum>Qt::ToolButtonTextOnly</enum>

  147. -           </property>

  148. -          </widget>

  149. -         </item>

  150. -        </layout>

  151. +       <item row="7" column="2">

  152. +        <widget class="QComboBox" name="uiBootPriorityComboBox"/>

  153.         </item>
  154. -       <item row="3" column="0">

  155. -        <widget class="QLabel" name="uiCategoryLabel">

  156. -         <property name="text">

  157. -          <string>Category:</string>

  158. +       <item row="6" column="2">

  159. +        <widget class="QComboBox" name="uiQemuListComboBox">

  160. +         <property name="sizePolicy">

  161. +          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

  162. +           <horstretch>0</horstretch>

  163. +           <verstretch>0</verstretch>

  164. +          </sizepolicy>

  165.           </property>
  166.          </widget>
  167.         </item>
  168. -       <item row="3" column="1">

  169. +       <item row="3" column="2">

  170.          <widget class="QComboBox" name="uiCategoryComboBox"/>
  171.         </item>
  172. -       <item row="4" column="0">

  173. -        <widget class="QLabel" name="uiRamLabel">

  174. -         <property name="text">

  175. -          <string>RAM:</string>

  176. -         </property>

  177. -        </widget>

  178. -       </item>

  179. -       <item row="4" column="1">

  180. -        <widget class="QSpinBox" name="uiRamSpinBox">

  181. -         <property name="suffix">

  182. -          <string> MB</string>

  183. -         </property>

  184. -         <property name="minimum">

  185. -          <number>32</number>

  186. -         </property>

  187. -         <property name="maximum">

  188. -          <number>65535</number>

  189. -         </property>

  190. -         <property name="value">

  191. -          <number>256</number>

  192. -         </property>

  193. -        </widget>

  194. -       </item>

  195. -       <item row="5" column="0">

  196. -        <widget class="QLabel" name="uiCPULabel">

  197. -         <property name="text">

  198. -          <string>vCPUs:</string>

  199. -         </property>

  200. -        </widget>

  201. -       </item>

  202. -       <item row="5" column="1">

  203. +       <item row="5" column="2">

  204.          <widget class="QSpinBox" name="uiCPUSpinBox">
  205.           <property name="minimum">
  206.            <number>1</number>
  207. @@ -125,16 +81,33 @@

  208.           </property>
  209.          </widget>
  210.         </item>
  211. -       <item row="6" column="1">

  212. -        <widget class="QComboBox" name="uiQemuListComboBox">

  213. -         <property name="sizePolicy">

  214. -          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

  215. -           <horstretch>0</horstretch>

  216. -           <verstretch>0</verstretch>

  217. -          </sizepolicy>

  218. +       <item row="8" column="0">

  219. +        <widget class="QLabel" name="uiOnCloseLabel">

  220. +         <property name="text">

  221. +          <string>On close:</string>

  222.           </property>
  223.          </widget>
  224.         </item>
  225. +       <item row="9" column="0">

  226. +        <widget class="QLabel" name="uiConsoleTypeLabel">

  227. +         <property name="text">

  228. +          <string>Console type:</string>

  229. +         </property>

  230. +        </widget>

  231. +       </item>

  232. +       <item row="11" column="2">

  233. +        <spacer name="spacer">

  234. +         <property name="orientation">

  235. +          <enum>Qt::Vertical</enum>

  236. +         </property>

  237. +         <property name="sizeHint" stdset="0">

  238. +          <size>

  239. +           <width>263</width>

  240. +           <height>94</height>

  241. +          </size>

  242. +         </property>

  243. +        </spacer>

  244. +       </item>

  245.         <item row="7" column="0">
  246.          <widget class="QLabel" name="uiBootPriorityLabel">
  247.           <property name="text">
  248. @@ -142,27 +115,67 @@

  249.           </property>
  250.          </widget>
  251.         </item>
  252. -       <item row="7" column="1">

  253. -        <widget class="QComboBox" name="uiBootPriorityComboBox"/>

  254. +       <item row="4" column="2">

  255. +        <widget class="QSpinBox" name="uiRamSpinBox">

  256. +         <property name="suffix">

  257. +          <string> MB</string>

  258. +         </property>

  259. +         <property name="minimum">

  260. +          <number>32</number>

  261. +         </property>

  262. +         <property name="maximum">

  263. +          <number>65535</number>

  264. +         </property>

  265. +         <property name="value">

  266. +          <number>256</number>

  267. +         </property>

  268. +        </widget>

  269.         </item>
  270. -       <item row="8" column="0">

  271. -        <widget class="QLabel" name="uiOnCloseLabel">

  272. +       <item row="0" column="2">

  273. +        <widget class="QLineEdit" name="uiNameLineEdit"/>

  274. +       </item>

  275. +       <item row="3" column="0">

  276. +        <widget class="QLabel" name="uiCategoryLabel">

  277.           <property name="text">
  278. -          <string>On close:</string>

  279. +          <string>Category:</string>

  280.           </property>
  281.          </widget>
  282.         </item>
  283. -       <item row="8" column="1">

  284. -        <widget class="QComboBox" name="uiOnCloseComboBox"/>

  285. +       <item row="1" column="2">

  286. +        <widget class="QLineEdit" name="uiDefaultNameFormatLineEdit"/>

  287.         </item>
  288. -       <item row="9" column="0">

  289. -        <widget class="QLabel" name="uiConsoleTypeLabel">

  290. +       <item row="4" column="0">

  291. +        <widget class="QLabel" name="uiRamLabel">

  292.           <property name="text">
  293. -          <string>Console type:</string>

  294. +          <string>RAM:</string>

  295.           </property>
  296.          </widget>
  297.         </item>
  298. -       <item row="9" column="1">

  299. +       <item row="2" column="2">

  300. +        <layout class="QHBoxLayout" name="horizontalLayout_7">

  301. +         <item>

  302. +          <widget class="QLineEdit" name="uiSymbolLineEdit"/>

  303. +         </item>

  304. +         <item>

  305. +          <widget class="QToolButton" name="uiSymbolToolButton">

  306. +           <property name="text">

  307. +            <string>&amp;Browse...</string>

  308. +           </property>

  309. +           <property name="toolButtonStyle">

  310. +            <enum>Qt::ToolButtonTextOnly</enum>

  311. +           </property>

  312. +          </widget>

  313. +         </item>

  314. +        </layout>

  315. +       </item>

  316. +       <item row="5" column="0">

  317. +        <widget class="QLabel" name="uiCPULabel">

  318. +         <property name="text">

  319. +          <string>vCPUs:</string>

  320. +         </property>

  321. +        </widget>

  322. +       </item>

  323. +       <item row="9" column="2">

  324.          <layout class="QHBoxLayout" name="horizontalLayout_2">
  325.           <item>
  326.            <widget class="QComboBox" name="uiConsoleTypeComboBox">
  327. @@ -202,18 +215,15 @@

  328.           </item>
  329.          </layout>
  330.         </item>
  331. -       <item row="10" column="1">

  332. -        <spacer name="spacer">

  333. -         <property name="orientation">

  334. -          <enum>Qt::Vertical</enum>

  335. -         </property>

  336. -         <property name="sizeHint" stdset="0">

  337. -          <size>

  338. -           <width>263</width>

  339. -           <height>94</height>

  340. -          </size>

  341. +       <item row="10" column="2">

  342. +        <widget class="QLineEdit" name="uiEnvvarLineEdit"/>

  343. +       </item>

  344. +       <item row="10" column="0">

  345. +        <widget class="QLabel" name="uiEnvvarLabel">

  346. +         <property name="text">

  347. +          <string>Environment variables:</string>

  348.           </property>
  349. -        </spacer>

  350. +        </widget>

  351.         </item>
  352.        </layout>
  353.       </widget>
  354. @@ -470,7 +480,16 @@

  355.         <string>CD/DVD</string>
  356.        </attribute>
  357.        <layout class="QVBoxLayout" name="verticalLayout_4">
  358. -       <property name="margin">

  359. +       <property name="leftMargin">

  360. +        <number>10</number>

  361. +       </property>

  362. +       <property name="topMargin">

  363. +        <number>10</number>

  364. +       </property>

  365. +       <property name="rightMargin">

  366. +        <number>10</number>

  367. +       </property>

  368. +       <property name="bottomMargin">

  369.          <number>10</number>
  370.         </property>
  371.         <item>
  372. 

  373. --- a/gns3/modules/qemu/pages/qemu_vm_configuration_page.py

  374. +++ b/gns3/modules/qemu/pages/qemu_vm_configuration_page.py

  375. @@ -444,6 +444,8 @@

  376.              self.uiInitrdLineEdit.setText(settings["initrd"])
  377.              self.uiKernelImageLineEdit.setText(settings["kernel_image"])
  378.          else:
  379. +            self.uiEnvvarLabel.hide()

  380. +            self.uiEnvvarLineEdit.hide()

  381.              self.uiNameLabel.hide()
  382.              self.uiNameLineEdit.hide()
  383.              self.uiHddTab.hide()
  384. @@ -542,6 +544,7 @@

  385.              self.uiProcessPriorityComboBox.setCurrentIndex(index)
  386.          self.uiQemuOptionsLineEdit.setText(settings["options"])
  387.          self.uiUsageTextEdit.setPlainText(settings["usage"])
  388. +        self.uiEnvvarLineEdit.setText(settings["env_vars"])

  389.  
  390.      def saveSettings(self, settings, node=None, group=False):
  391.          """
  392. @@ -653,4 +656,5 @@

  393.          settings["process_priority"] = self.uiProcessPriorityComboBox.currentText().lower()
  394.          settings["options"] = self.uiQemuOptionsLineEdit.text()
  395.          settings["usage"] = self.uiUsageTextEdit.toPlainText()
  396. +        settings["env_vars"] = self.uiEnvvarLineEdit.text()

  397.          return settings
  398. 

  399. --- a/gns3/modules/qemu/pages/qemu_vm_preferences_page.py

  400. +++ b/gns3/modules/qemu/pages/qemu_vm_preferences_page.py

  401. @@ -117,7 +117,7 @@

  402.              QtWidgets.QTreeWidgetItem(section_item, ["Base MAC address:", qemu_vm["mac_address"]])
  403.  
  404.          # fill out the Linux boot section
  405. -        if qemu_vm["initrd"] or qemu_vm["kernel_image"] or qemu_vm["kernel_command_line"]:

  406. +        if qemu_vm["initrd"] or qemu_vm["kernel_image"] or qemu_vm["kernel_command_line"] or qemu_vm["env_vars"]:

  407.              section_item = self._createSectionItem("Linux boot")
  408.              if qemu_vm["initrd"]:
  409.                  QtWidgets.QTreeWidgetItem(section_item, ["Initial RAM disk:", qemu_vm["initrd"]])
  410. @@ -125,6 +125,8 @@

  411.                  QtWidgets.QTreeWidgetItem(section_item, ["Kernel image:", qemu_vm["kernel_image"]])
  412.              if qemu_vm["kernel_command_line"]:
  413.                  QtWidgets.QTreeWidgetItem(section_item, ["Kernel command line:", qemu_vm["kernel_command_line"]])
  414. +            if qemu_vm["env_vars"]:

  415. +                QtWidgets.QTreeWidgetItem(section_item, ["Environment variables:", qemu_vm["env_vars"]])

  416.  
  417.          # performance section
  418.          section_item = self._createSectionItem("Optimizations")
  419. --- a/gns3/schemas/appliance.json

  420. +++ b/gns3/schemas/appliance.json

  421. @@ -329,6 +329,10 @@

  422.              "title": "KVM requirements",
  423.              "enum": ["require", "allow", "disable"]
  424.          },
  425. +        "env_vars": {

  426. +          "type": "string",

  427. +          "title": "Environment variables"

  428. +        },

  429.          "options": {
  430.              "type": "string",
  431.              "title": "Optional additional qemu command line options"
  432.