Fix opensand_cli XML files to latest format

CNES · Feb 28, 2023 · 0de0250 · 0de0250
1 parent f132a0c
commit 0de0250
Show file tree

Hide file tree

Showing 54 changed files with 426 additions and 159 deletions.
diff --git a/opensand-network/opensand_cli/ethernet/gw/Makefile b/opensand-network/opensand_cli/ethernet/gw/Makefile
@@ -31,6 +31,7 @@
 
 GW_ID=0
 ST_ID=1
+SAT_ID=2
 EMU_IFACE=ens4
 EMU_IP_GW=192.168.18.42
 EMU_IP_SAT=192.168.18.1
@@ -77,6 +78,7 @@ generate-xml:
 	cp infrastructure.xml infrastructure_updated.xml
 	sed -i "s|GW_ID|$(GW_ID)|g" infrastructure_updated.xml
 	sed -i "s|ST_ID|$(ST_ID)|g" infrastructure_updated.xml
+	sed -i "s|SAT_ID|$(SAT_ID)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_GW|$(EMU_IP_GW)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_SAT|$(EMU_IP_SAT)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_ST|$(EMU_IP_ST)|g" infrastructure_updated.xml
@@ -89,9 +91,12 @@ generate-xml:
 	sed -i "s|COLLECTOR_IP|$(COLLECTOR_IP)|g" infrastructure_updated.xml
 	sed -i "s|ENABLE_LOCAL_LOGS|$(ENABLE_LOCAL_LOGS)|g" infrastructure_updated.xml
 	sed -i "s|LOG_FOLDER|$(LOG_FOLDER)|g" infrastructure_updated.xml
+	cp topology.xml topology_updated.xml
+	sed -i "s|GW_ID|$(GW_ID)|g" topology_updated.xml
+	sed -i "s|SAT_ID|$(SAT_ID)|g" topology_updated.xml
 
 run: generate-xml
-	opensand -i infrastructure_updated.xml -t topology.xml -p profile.xml &
+	opensand -i infrastructure_updated.xml -t topology_updated.xml -p profile.xml &
 
 stop:
 	killall -q opensand || true

diff --git a/opensand-network/opensand_cli/ethernet/gw/infrastructure.xml b/opensand-network/opensand_cli/ethernet/gw/infrastructure.xml
@@ -4,13 +4,15 @@
     <entity>
       <entity_type>Gateway</entity_type>
       <entity_sat>
+        <entity_id>SAT_ID</entity_id>
         <emu_address>EMU_IP_SAT</emu_address>
-        <default_gw>-1</default_gw>
+        <isl_settings/>
       </entity_sat>
       <entity_gw>
         <entity_id>GW_ID</entity_id>
         <emu_address>EMU_IP_GW</emu_address>
         <tap_iface>TAP_IFACE</tap_iface>
+        <mac_address>TAP_MAC_GW</mac_address>
       </entity_gw>
       <entity_gw_net_acc>
       </entity_gw_net_acc>
@@ -20,6 +22,7 @@
         <entity_id>ST_ID</entity_id>
         <emu_address>EMU_IP_ST</emu_address>
         <tap_iface>TAP_IFACE</tap_iface>
+        <mac_address>TAP_MAC_ST</mac_address>
       </entity_st>
     </entity>
     <logs>
@@ -52,9 +55,12 @@
       <collector_address>COLLECTOR_IP</collector_address>
     </storage>
     <infrastructure>
-      <satellite>
-        <emu_address>EMU_IP_SAT</emu_address>
-      </satellite>
+      <satellites>
+        <item>
+          <entity_id>SAT_ID</entity_id>
+          <emu_address>EMU_IP_SAT</emu_address>
+        </item>
+      </satellites>
       <gateways>
         <item>
           <entity_id>GW_ID</entity_id>
@@ -77,7 +83,7 @@
           <mac_address>WS_ST_MAC</mac_address>
         </item>
       </terminals>
-      <default_gw>-1</default_gw>
+      <default_gw>GW_ID</default_gw>
     </infrastructure>
   </root>
 </model>
diff --git a/opensand-network/opensand_cli/ethernet/gw/topology.xml b/opensand-network/opensand_cli/ethernet/gw/topology.xml
@@ -5,7 +5,11 @@
       <spots>
         <item>
           <assignments>
-            <gateway_id>0</gateway_id>
+            <gateway_id>GW_ID</gateway_id>
+            <sat_id_gw>SAT_ID</sat_id_gw>
+            <sat_id_st>SAT_ID</sat_id_st>
+            <forward_regen_level>Transparent</forward_regen_level>
+            <return_regen_level>Transparent</return_regen_level>
           </assignments>
           <roll_off>
             <forward>0.350000</forward>
@@ -32,7 +36,7 @@
     </frequency_plan>
     <st_assignment>
       <defaults>
-        <default_gateway>0</default_gateway>
+        <default_gateway>GW_ID</default_gateway>
         <default_group>Standard</default_group>
       </defaults>
       <assignments/>
@@ -423,4 +427,4 @@
       </delay>
     </advanced_settings>
   </root>
-</model>
+</model>
diff --git a/opensand-network/opensand_cli/ethernet/sat/Makefile b/opensand-network/opensand_cli/ethernet/sat/Makefile
@@ -31,6 +31,7 @@
 
 GW_ID=0
 ST_ID=1
+SAT_ID=2
 EMU_IFACE=ens4
 EMU_IP_GW=192.168.18.42
 EMU_IP_SAT=192.168.18.1
@@ -59,6 +60,7 @@ generate-xml:
 	cp infrastructure.xml infrastructure_updated.xml
 	sed -i "s|GW_ID|$(GW_ID)|g" infrastructure_updated.xml
 	sed -i "s|ST_ID|$(ST_ID)|g" infrastructure_updated.xml
+	sed -i "s|SAT_ID|$(SAT_ID)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_GW|$(EMU_IP_GW)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_SAT|$(EMU_IP_SAT)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_ST|$(EMU_IP_ST)|g" infrastructure_updated.xml
@@ -69,9 +71,12 @@ generate-xml:
 	sed -i "s|COLLECTOR_IP|$(COLLECTOR_IP)|g" infrastructure_updated.xml
 	sed -i "s|ENABLE_LOCAL_LOGS|$(ENABLE_LOCAL_LOGS)|g" infrastructure_updated.xml
 	sed -i "s|LOG_FOLDER|$(LOG_FOLDER)|g" infrastructure_updated.xml
+	cp topology.xml topology_updated.xml
+	sed -i "s|GW_ID|$(GW_ID)|g" topology_updated.xml
+	sed -i "s|SAT_ID|$(SAT_ID)|g" topology_updated.xml
 
 run: generate-xml
-	opensand -i infrastructure_updated.xml -t topology.xml &
+	opensand -i infrastructure_updated.xml -t topology_updated.xml &
 
 stop:
 	killall -q opensand || true

diff --git a/opensand-network/opensand_cli/ethernet/sat/infrastructure.xml b/opensand-network/opensand_cli/ethernet/sat/infrastructure.xml
@@ -4,13 +4,15 @@
     <entity>
       <entity_type>Satellite</entity_type>
       <entity_sat>
+        <entity_id>SAT_ID</entity_id>
         <emu_address>EMU_IP_SAT</emu_address>
-        <default_gw>-1</default_gw>
+        <isl_settings/>
       </entity_sat>
       <entity_gw>
         <entity_id>GW_ID</entity_id>
         <emu_address>EMU_IP_GW</emu_address>
         <tap_iface>TAP_IFACE</tap_iface>
+        <mac_address>TAP_MAC_GW</mac_address>
       </entity_gw>
       <entity_gw_net_acc>
       </entity_gw_net_acc>
@@ -20,6 +22,7 @@
         <entity_id>ST_ID</entity_id>
         <emu_address>EMU_IP_ST</emu_address>
         <tap_iface>TAP_IFACE</tap_iface>
+        <mac_address>TAP_MAC_ST</mac_address>
       </entity_st>
     </entity>
     <logs>
@@ -52,9 +55,12 @@
       <collector_address>COLLECTOR_IP</collector_address>
     </storage>
     <infrastructure>
-      <satellite>
-        <emu_address>EMU_IP_SAT</emu_address>
-      </satellite>
+      <satellites>
+        <item>
+          <entity_id>SAT_ID</entity_id>
+          <emu_address>EMU_IP_SAT</emu_address>
+        </item>
+      </satellites>
       <gateways>
         <item>
           <entity_id>GW_ID</entity_id>
@@ -75,7 +81,7 @@
           <entity_id>ST_ID</entity_id>
         </item>
       </terminals>
-      <default_gw>-1</default_gw>
+      <default_gw>GW_ID</default_gw>
     </infrastructure>
   </root>
 </model>
diff --git a/opensand-network/opensand_cli/ethernet/sat/topology.xml b/opensand-network/opensand_cli/ethernet/sat/topology.xml
@@ -5,7 +5,11 @@
       <spots>
         <item>
           <assignments>
-            <gateway_id>0</gateway_id>
+            <gateway_id>GW_ID</gateway_id>
+            <sat_id_gw>SAT_ID</sat_id_gw>
+            <sat_id_st>SAT_ID</sat_id_st>
+            <forward_regen_level>Transparent</forward_regen_level>
+            <return_regen_level>Transparent</return_regen_level>
           </assignments>
           <roll_off>
             <forward>0.350000</forward>
@@ -32,7 +36,7 @@
     </frequency_plan>
     <st_assignment>
       <defaults>
-        <default_gateway>0</default_gateway>
+        <default_gateway>GW_ID</default_gateway>
         <default_group>Standard</default_group>
       </defaults>
       <assignments/>

diff --git a/opensand-network/opensand_cli/ethernet/st/Makefile b/opensand-network/opensand_cli/ethernet/st/Makefile
@@ -31,6 +31,7 @@
 
 GW_ID=0
 ST_ID=1
+SAT_ID=2
 EMU_IFACE=ens4
 EMU_IP_GW=192.168.18.42
 EMU_IP_SAT=192.168.18.1
@@ -77,6 +78,7 @@ generate-xml:
 	cp infrastructure.xml infrastructure_updated.xml
 	sed -i "s|GW_ID|$(GW_ID)|g" infrastructure_updated.xml
 	sed -i "s|ST_ID|$(ST_ID)|g" infrastructure_updated.xml
+	sed -i "s|SAT_ID|$(SAT_ID)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_GW|$(EMU_IP_GW)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_SAT|$(EMU_IP_SAT)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_ST|$(EMU_IP_ST)|g" infrastructure_updated.xml
@@ -89,9 +91,12 @@ generate-xml:
 	sed -i "s|COLLECTOR_IP|$(COLLECTOR_IP)|g" infrastructure_updated.xml
 	sed -i "s|ENABLE_LOCAL_LOGS|$(ENABLE_LOCAL_LOGS)|g" infrastructure_updated.xml
 	sed -i "s|LOG_FOLDER|$(LOG_FOLDER)|g" infrastructure_updated.xml
+	cp topology.xml topology_updated.xml
+	sed -i "s|GW_ID|$(GW_ID)|g" topology_updated.xml
+	sed -i "s|SAT_ID|$(SAT_ID)|g" topology_updated.xml
 
 run: generate-xml
-	opensand -i infrastructure_updated.xml -t topology.xml -p profile.xml &
+	opensand -i infrastructure_updated.xml -t topology_updated.xml -p profile.xml &
 
 stop:
 	killall -q opensand || true

diff --git a/opensand-network/opensand_cli/ethernet/st/infrastructure.xml b/opensand-network/opensand_cli/ethernet/st/infrastructure.xml
@@ -4,13 +4,15 @@
     <entity>
       <entity_type>Terminal</entity_type>
       <entity_sat>
+        <entity_id>SAT_ID</entity_id>
         <emu_address>EMU_IP_SAT</emu_address>
-        <default_gw>-1</default_gw>
+        <isl_settings/>
       </entity_sat>
       <entity_gw>
         <entity_id>GW_ID</entity_id>
         <emu_address>EMU_IP_GW</emu_address>
         <tap_iface>TAP_IFACE</tap_iface>
+        <mac_address>TAP_MAC_GW</mac_address>
       </entity_gw>
       <entity_gw_net_acc>
       </entity_gw_net_acc>
@@ -20,6 +22,7 @@
         <entity_id>ST_ID</entity_id>
         <emu_address>EMU_IP_ST</emu_address>
         <tap_iface>TAP_IFACE</tap_iface>
+        <mac_address>TAP_MAC_ST</mac_address>
       </entity_st>
     </entity>
     <logs>
@@ -52,9 +55,12 @@
       <collector_address>COLLECTOR_IP</collector_address>
     </storage>
     <infrastructure>
-      <satellite>
-        <emu_address>EMU_IP_SAT</emu_address>
-      </satellite>
+      <satellites>
+        <item>
+          <entity_id>SAT_ID</entity_id>
+          <emu_address>EMU_IP_SAT</emu_address>
+        </item>
+      </satellites>
       <gateways>
         <item>
           <entity_id>GW_ID</entity_id>
@@ -77,7 +83,7 @@
           <mac_address>WS_ST_MAC</mac_address>
         </item>
       </terminals>
-      <default_gw>-1</default_gw>
+      <default_gw>GW_ID</default_gw>
     </infrastructure>
   </root>
 </model>
diff --git a/opensand-network/opensand_cli/ethernet/st/topology.xml b/opensand-network/opensand_cli/ethernet/st/topology.xml
@@ -5,7 +5,11 @@
       <spots>
         <item>
           <assignments>
-            <gateway_id>0</gateway_id>
+            <gateway_id>GW_ID</gateway_id>
+            <sat_id_gw>SAT_ID</sat_id_gw>
+            <sat_id_st>SAT_ID</sat_id_st>
+            <forward_regen_level>Transparent</forward_regen_level>
+            <return_regen_level>Transparent</return_regen_level>
           </assignments>
           <roll_off>
             <forward>0.350000</forward>
@@ -32,7 +36,7 @@
     </frequency_plan>
     <st_assignment>
       <defaults>
-        <default_gateway>0</default_gateway>
+        <default_gateway>GW_ID</default_gateway>
         <default_group>Standard</default_group>
       </defaults>
       <assignments/>
@@ -423,4 +427,4 @@
       </delay>
     </advanced_settings>
   </root>
-</model>
+</model>
diff --git a/opensand-network/opensand_cli/ethernet_vlan/gw/Makefile b/opensand-network/opensand_cli/ethernet_vlan/gw/Makefile
@@ -31,6 +31,7 @@
 
 GW_ID=0
 ST_ID=1
+SAT_ID=2
 EMU_IFACE=ens4
 EMU_IP_GW=192.168.18.42
 EMU_IP_SAT=192.168.18.1
@@ -82,6 +83,7 @@ generate-xml:
 	cp infrastructure.xml infrastructure_updated.xml
 	sed -i "s|GW_ID|$(GW_ID)|g" infrastructure_updated.xml
 	sed -i "s|ST_ID|$(ST_ID)|g" infrastructure_updated.xml
+	sed -i "s|SAT_ID|$(SAT_ID)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_GW|$(EMU_IP_GW)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_SAT|$(EMU_IP_SAT)|g" infrastructure_updated.xml
 	sed -i "s|EMU_IP_ST|$(EMU_IP_ST)|g" infrastructure_updated.xml
@@ -94,9 +96,12 @@ generate-xml:
 	sed -i "s|COLLECTOR_IP|$(COLLECTOR_IP)|g" infrastructure_updated.xml
 	sed -i "s|ENABLE_LOCAL_LOGS|$(ENABLE_LOCAL_LOGS)|g" infrastructure_updated.xml
 	sed -i "s|LOG_FOLDER|$(LOG_FOLDER)|g" infrastructure_updated.xml
+	cp topology.xml topology_updated.xml
+	sed -i "s|GW_ID|$(GW_ID)|g" topology_updated.xml
+	sed -i "s|SAT_ID|$(SAT_ID)|g" topology_updated.xml
 
 run: generate-xml
-	opensand -i infrastructure_updated.xml -t topology.xml -p profile.xml &
+	opensand -i infrastructure_updated.xml -t topology_updated.xml -p profile.xml &
 
 stop:
 	killall -q opensand || true

diff --git a/opensand-network/opensand_cli/ethernet_vlan/gw/infrastructure.xml b/opensand-network/opensand_cli/ethernet_vlan/gw/infrastructure.xml
@@ -4,13 +4,15 @@
     <entity>
       <entity_type>Gateway</entity_type>
       <entity_sat>
+        <entity_id>SAT_ID</entity_id>
         <emu_address>EMU_IP_SAT</emu_address>
-        <default_gw>-1</default_gw>
+        <isl_settings/>
       </entity_sat>
       <entity_gw>
         <entity_id>GW_ID</entity_id>
         <emu_address>EMU_IP_GW</emu_address>
         <tap_iface>TAP_IFACE</tap_iface>
+        <mac_address>TAP_MAC_GW</mac_address>
       </entity_gw>
       <entity_gw_net_acc>
       </entity_gw_net_acc>
@@ -20,6 +22,7 @@
         <entity_id>ST_ID</entity_id>
         <emu_address>EMU_IP_ST</emu_address>
         <tap_iface>TAP_IFACE</tap_iface>
+        <mac_address>TAP_MAC_ST</mac_address>
       </entity_st>
     </entity>
     <logs>
@@ -52,9 +55,12 @@
       <collector_address>COLLECTOR_IP</collector_address>
     </storage>
     <infrastructure>
-      <satellite>
-        <emu_address>EMU_IP_SAT</emu_address>
-      </satellite>
+      <satellites>
+        <item>
+          <entity_id>SAT_ID</entity_id>
+          <emu_address>EMU_IP_SAT</emu_address>
+        </item>
+      </satellites>
       <gateways>
         <item>
           <entity_id>GW_ID</entity_id>
@@ -77,7 +83,7 @@
           <mac_address>WS_ST_MAC</mac_address>
         </item>
       </terminals>
-      <default_gw>-1</default_gw>
+      <default_gw>GW_ID</default_gw>
     </infrastructure>
   </root>
 </model>