added 1e-sec and a4 variants

Co-authored-by: jbemmel <[email protected]>

Author: hellt

sros/README.md

@@ -23,21 +23,23 @@ To give vrnetlab users the flexibility of choice, this fork provides a number of
 
 By selecting a certain variant (referred by its `name`) the VSIM will start with a certain configuration as per the following table:
 
-|     Name     |    mode     |     Control plane      |            Line card            | RAM (GB) | Max NICs |
-| :----------: | :---------: | :--------------------: | :-----------------------------: | :------: | :------: |
-|     sr-1     | integrated  |         cpm-1          |        me12-100gb-qsfp28        |    5     |    12    |
-|    sr-1e     | distributed |         cpm-e          |          me40-1gb-csfp          |   4+4    |    40    |
-|    sr-1s     | integrated  |         xcm-1s         |        s36-100gb-qsfp28         |    6     |    36    |
-| sr-1s-macsec | integrated  |         xcm-1s         | ms16-100gb-sfpdd+4-100gb-qsfp28 |    6     |    20    |
-|    sr-2s     | distributed |         cpm-2s         | ms8-100gb-sfpdd+2-100gb-qsfp28  |   3+4    |    10    |
-|    sr-7s     | distributed |     sfm2-s+xcm2-7s     |    x2-s36-800g-qsfpdd-18.0t     |   4+6    |    36    |
-|  sr-7s-fp4   | distributed |      sfm-s+xcm-7s      |        s36-100gb-qsfp28         |   4+6    |    36    |
-|    sr-14s    | distributed |     sfm-s+xcm-14s      |        s36-100gb-qsfp28         |   4+6    |    36    |
-| ixr-e-small  | distributed | imm14-10g-sfp++4-1g-tx |      m14-10g-sfp++4-1g-tx       |   3+4    |    18    |
-|  ixr-e-big   | distributed |       cpm-ixr-e        |    m24-sfp++8-sfp28+2-qsfp28    |   3+4    |    34    |
-|    ixr-ec    | integrated  |       cpm-ixr-e        |  m4-1g-tx+20-1g-sfp+6-10g-sfp+  |    4     |    34    |
-|    ixr-r6    | integrated  |      cpiom-ixr-r6      |    m6-10g-sfp++1-100g-qsfp28    |    6     |    10    |
-|    ixr-s     | integrated  |       cpm-ixr-s        |        m48-sfp++6-qsfp28        |   3+4    |    54    |
+|     Name     |    mode     |     Control plane      |            Line card             | RAM (GB) | Max NICs |
+| :----------: | :---------: | :--------------------: | :------------------------------: | :------: | :------: |
+|     sr-1     | integrated  |         cpm-1          |        me12-100gb-qsfp28         |    5     |    12    |
+|    sr-1e     | distributed |         cpm-e          |          me40-1gb-csfp           |   4+4    |    40    |
+|  sr-1e-sec   | distributed |         cpm-e          | me12-10/1gb-sfp+ and isa2-tunnel |   4+4    |    12    |
+|    sr-1s     | integrated  |         xcm-1s         |         s36-100gb-qsfp28         |    6     |    36    |
+| sr-1s-macsec | integrated  |         xcm-1s         | ms16-100gb-sfpdd+4-100gb-qsfp28  |    6     |    20    |
+|    sr-2s     | distributed |         cpm-2s         |  ms8-100gb-sfpdd+2-100gb-qsfp28  |   3+4    |    10    |
+|    sr-7s     | distributed |     sfm2-s+xcm2-7s     |     x2-s36-800g-qsfpdd-18.0t     |   4+6    |    36    |
+|  sr-7s-fp4   | distributed |      sfm-s+xcm-7s      |         s36-100gb-qsfp28         |   4+6    |    36    |
+|    sr-14s    | distributed |     sfm-s+xcm-14s      |         s36-100gb-qsfp28         |   4+6    |    36    |
+|    sr-a4     | distributed |         cpm-a          |     maxp10-10/1gb-msec-sfp+      |   4+4    |    10    |
+| ixr-e-small  | distributed | imm14-10g-sfp++4-1g-tx |       m14-10g-sfp++4-1g-tx       |   3+4    |    18    |
+|  ixr-e-big   | distributed |       cpm-ixr-e        |    m24-sfp++8-sfp28+2-qsfp28     |   3+4    |    34    |
+|    ixr-ec    | integrated  |       cpm-ixr-e        |  m4-1g-tx+20-1g-sfp+6-10g-sfp+   |    4     |    34    |
+|    ixr-r6    | integrated  |      cpiom-ixr-r6      |    m6-10g-sfp++1-100g-qsfp28     |    6     |    10    |
+|    ixr-s     | integrated  |       cpm-ixr-s        |        m48-sfp++6-qsfp28         |   3+4    |    54    |
 
 The variants are [defined in the code](https://github.com/hellt/vrnetlab/blob/bf70a9a9f2f060a68797a7ec29ce6aea96acb779/sros/docker/launch.py#L58) as a dictionary. If a variant you need is not in the table, use the `custom` variant and define the emulated platform yourself as described below.
 

sros/docker/launch.py

@@ -323,6 +323,40 @@ def line_card_config(
             }
         ],
     },
+    "sr-1e-sec": {
+        "deployment_model": "distributed",
+        # control plane (CPM)
+        "max_nics": 12,
+        "cp": {
+            "min_ram": 4,
+            "timos_line": "slot=A chassis=sr-1e card=cpm-e",
+        },
+        # line card (IOM/XCM)
+        "lc": {
+            "min_ram": 4,
+            "timos_line": "chassis=sr-1e slot=1 card=iom-e mda/1=me12-10/1gb-sfp+ mda/2=isa2-tunnel",
+            "card_config": """/configure card 1 card-type iom-e
+            /configure card 1 mda 1 mda-type me12-10/1gb-sfp+
+            /configure card 1 mda 2 mda-type isa2-tunnel
+            """,
+        },
+    },
+    "sr-a4": {
+        "deployment_model": "distributed",
+        # control plane (CPM)
+        "max_nics": 10,
+        "cp": {
+            "min_ram": 4,
+            "timos_line": "slot=A chassis=sr-a4 card=cpm-a",
+        },
+        # line card (IOM/XCM)
+        "lc": {
+            "min_ram": 4,
+            **line_card_config(
+                chassis="sr-a4", card="iom-a", mda="maxp10-10/1gb-msec-sfp+"
+            ),
+        },
+    },
     "sr-1x-48d": {
         "deployment_model": "distributed",
         # control plane (CPM)