slapos_jio_ui_test: Update ORS UI Tests to 1.0.327 release

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD1900eNB.zpt

@@ -14,16 +14,10 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd1900.cfg</td>
-      </tr>
+      <tal:block define="name string:tdd1900">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
-
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_rx_tx_scenario" />
 
     </tbody>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD1900eNBReadOnly.zpt

@@ -14,15 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd1900.cfg</td>
-      </tr>
-
+      <tal:block define="name string:tdd1900">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_rx_tx_scenario_readonly" />
 
     </tbody>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD1900gNBEPCSimCard.zpt

@@ -14,14 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd1900.cfg</td>
-      </tr>
+      <tal:block define="name string:tdd1900">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
 
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_gnb_sim_card_scenario" />

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD1900gNBEPCSimCardReadOnly.zpt

@@ -14,15 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd1900.cfg</td>
-      </tr>
-
+      <tal:block define="name string:tdd1900">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_gnb_sim_card_scenario_readonly" />
 
     </tbody>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD2600eNB.zpt

@@ -14,14 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd2600.cfg</td>
-      </tr>
+      <tal:block define="name string:tdd2600">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
 
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_rx_tx_scenario" />

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD2600eNBReadOnly.zpt

@@ -14,15 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd2600.cfg</td>
-      </tr>
-
+      <tal:block define="name string:tdd2600">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_rx_tx_scenario_readonly" />
 
     </tbody>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD2600gNBEPCSimCard.zpt

@@ -14,14 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd2600.cfg</td>
-      </tr>
+      <tal:block define="name string:tdd2600">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
 
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_gnb_sim_card_scenario" />

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD2600gNBEPCSimCardReadOnly.zpt

@@ -14,14 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd2600.cfg</td>
-      </tr>
+      <tal:block define="name string:tdd2600">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
 
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_gnb_sim_card_scenario_readonly" />
 

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD3500eNB.zpt

@@ -14,14 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd3500.cfg</td>
-      </tr>
+      <tal:block define="name string:tdd3500">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
 
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_rx_tx_scenario" />

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD3500eNBReadOnly.zpt

@@ -14,15 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd3500.cfg</td>
-      </tr>
-
+      <tal:block define="name string:tdd3500">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_rx_tx_scenario_readonly" />
 
     </tbody>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD3500gNBEPCSimCard.zpt

@@ -14,14 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd3500.cfg</td>
-      </tr>
+      <tal:block define="name string:tdd3500">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
 
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_gnb_sim_card_scenario" />

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD3500gNBEPCSimCardReadOnly.zpt

@@ -14,15 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd3500.cfg</td>
-      </tr>
-
+      <tal:block define="name string:tdd3500">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_gnb_sim_card_scenario_readonly" />
 
     </tbody>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD3700eNB.zpt

@@ -14,14 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd3700.cfg</td>
-      </tr>
+      <tal:block define="name string:tdd3700">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
 
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_rx_tx_scenario" />

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD3700eNBReadOnly.zpt

@@ -14,15 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd3700.cfg</td>
-      </tr>
-
+      <tal:block define="name string:tdd3700">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_rx_tx_scenario_readonly" />
 
     </tbody>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD3700gNBEPCSimCard.zpt

@@ -14,14 +14,9 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd3700.cfg</td>
-      </tr>
+      <tal:block define="name string:tdd3700">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/click_proceed" />
 
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_gnb_sim_card_scenario" />

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTestParameterEditorORSAmarisoftTD3700gNBEPCSimCardReadOnly.zpt

@@ -14,17 +14,10 @@
     </thead>
     <tbody>
       <tal:block metal:use-macro="here/Zuite_SlapOSParameterCommonTemplate/macros/init_readonly" />
-      <tr>
-        <td colspan="3"><b> Set URL for the software release </b></td>
-      </tr>
-      <tr>
-        <td>type</td>
-        <td>//input[@name='url_string']</td>
-        <td>https://lab.nexedi.com/nexedi/slapos/raw/1.0.286/software/ors-amarisoft/software-tdd3700.cfg</td>
-      </tr>
-
+      <tal:block define="name string:tdd3700">
+        <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/set_ors_software" />
+      </tal:block>
       <tal:block metal:use-macro="here/Zuite_SlapOSORSParameterCommonTemplate/macros/basic_gnb_sim_card_scenario_readonly" />
-
     </tbody>
   </table>
 </body>

master/bt5/slapos_jio_ui_test/SkinTemplateItem/portal_skins/slapos_ui_test/Zuite_SlapOSORSParameterCommonTemplate.zpt

@@ -53,14 +53,14 @@
     <tr>
       <td>waitForElementPresent</td>
       <td>//div[contains(@data-gadget-url,
-        'gadget_erp5_page_slap_parameter_form.html')]//select[@name="software_type"]//option[text()="gNB-EPC Sim Card"]
+      'gadget_erp5_page_slap_parameter_form.html')]//select[@name="software_type"]//option[text()="Core Network Sim Card"]
       </td>
       <td></td>
     </tr>
     <tr>
       <td>assertElementPresent</td>
       <td>//div[contains(@data-gadget-url,
-        'gadget_erp5_page_slap_parameter_form.html')]//select[@name="software_type"]//option[text()="gNB-EPC Sim Card"]
+        'gadget_erp5_page_slap_parameter_form.html')]//select[@name="software_type"]//option[text()="Core Network Sim Card"]
       </td>
       <td></td>
     </tr>
@@ -69,7 +69,7 @@
       <td>//div[contains(@data-gadget-url,
         'gadget_erp5_page_slap_parameter_form.html')]//select[@name="software_type"]
       </td>
-      <td>gNB-EPC Sim Card</td>
+      <td>Core Network Sim Card</td>
     </tr>
     <tr>
       <td>waitForElementPresent</td>
@@ -264,7 +264,7 @@
     <tr>
       <td>type</td>
       <td>//input[@name='software_type']</td>
-      <td tal:content="python: 'gnb-epc'"></td>
+      <td tal:content="python: 'core-network'"></td>
     </tr>
     <tr>
       <td>type</td>
@@ -278,14 +278,14 @@
     <tr>
       <td>waitForElementPresent</td>
       <td>//div[contains(@data-gadget-url,
-        'gadget_erp5_page_slap_parameter_form.html')]//select[@name="software_type"]//option[text()="gNB-EPC Sim Card"]
+        'gadget_erp5_page_slap_parameter_form.html')]//select[@name="software_type"]//option[text()="Core Network Sim Card"]
       </td>
       <td></td>
     </tr>
     <tr>
       <td>assertElementPresent</td>
       <td>//div[contains(@data-gadget-url,
-        'gadget_erp5_page_slap_parameter_form.html')]//select[@name="software_type"]//option[text()="gNB-EPC Sim Card"]
+        'gadget_erp5_page_slap_parameter_form.html')]//select[@name="software_type"]//option[text()="Core Network Sim Card"]
       </td>
       <td></td>
     </tr>
@@ -294,7 +294,7 @@
       <td>//div[contains(@data-gadget-url,
         'gadget_erp5_page_slap_parameter_form.html')]//select[@name="software_type"]
       </td>
-      <td>gnb-epc</td>
+      <td>core-network</td>
     </tr>
 
     <tal:block tal:define="name python: '//sim_algo'; value python: 'some value'">    
@@ -330,5 +330,16 @@
     </tal:block>
   </tal:block>
 
+  <tal:block metal:define-macro="set_ors_software">
+    <tr>
+      <td colspan="3"><b> Set URL for the software release </b></td>
+    </tr>
+    <tr>
+      <td>type</td>
+      <td>//input[@name='url_string']</td>
+      <td tal:content="python: 'https://lab.nexedi.com/nexedi/slapos/raw/1.0.327/software/ors-amarisoft/software-%s.cfg' % name"></td>
+      <td></td>
+    </tr>
+  </tal:block>
 
 </tal:block>
\ No newline at end of file

master/bt5/slapos_jio_ui_test/SkinTemplateItem/portal_skins/slapos_ui_test/Zuite_SlapOSParameterCommonTemplate.zpt

@@ -283,5 +283,4 @@
       <td tal:content="python: value"></td>
     </tr>
   </tal:block>
-
 </tal:block>
\ No newline at end of file