From 13c4592520859a8787c71ceef7d01b9c8f4dcba1 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Mon, 3 Jun 2019 09:23:15 +0200 Subject: VAT-to-PAPI: ContainerUtils Change-Id: Id186c3c280a6b876b8212e01b261ad8c65e5f40c Signed-off-by: Tibor Frank --- .../container/memif_create_chain_functional.exec | 12 ++++++++++++ resources/templates/container/memif_create_chain_ip4.exec | 15 +++++++++++++++ .../templates/container/memif_create_chain_l2xc.exec | 10 ++++++++++ .../templates/container/memif_create_cross_horizon.exec | 8 ++++++++ .../templates/container/memif_create_pipeline_ip4.exec | 15 +++++++++++++++ resources/templates/vat/memif_create_chain_functional.vat | 12 ------------ resources/templates/vat/memif_create_chain_ip4.vat | 15 --------------- resources/templates/vat/memif_create_chain_l2xc.vat | 10 ---------- resources/templates/vat/memif_create_cross_horizon.vat | 8 -------- resources/templates/vat/memif_create_pipeline_ip4.vat | 15 --------------- 10 files changed, 60 insertions(+), 60 deletions(-) create mode 100644 resources/templates/container/memif_create_chain_functional.exec create mode 100644 resources/templates/container/memif_create_chain_ip4.exec create mode 100644 resources/templates/container/memif_create_chain_l2xc.exec create mode 100644 resources/templates/container/memif_create_cross_horizon.exec create mode 100644 resources/templates/container/memif_create_pipeline_ip4.exec delete mode 100644 resources/templates/vat/memif_create_chain_functional.vat delete mode 100644 resources/templates/vat/memif_create_chain_ip4.vat delete mode 100644 resources/templates/vat/memif_create_chain_l2xc.vat delete mode 100644 resources/templates/vat/memif_create_cross_horizon.vat delete mode 100644 resources/templates/vat/memif_create_pipeline_ip4.vat (limited to 'resources/templates') diff --git a/resources/templates/container/memif_create_chain_functional.exec b/resources/templates/container/memif_create_chain_functional.exec new file mode 100644 index 0000000000..1f3909310c --- /dev/null +++ b/resources/templates/container/memif_create_chain_functional.exec @@ -0,0 +1,12 @@ +create memif socket id $sid1 filename $socket1 +create interface memif id $mid1 socket-id $sid1 master +set interface rx-mode memif$sid1/$mid1 $rx_mode +set int state memif$sid1/$mid1 up + +create memif socket id $sid2 filename $socket2 +create interface memif id $mid2 socket-id $sid2 master +set interface rx-mode memif$sid2/$mid2 $rx_mode +set int state memif$sid2/$mid2 up + +set interface l2 xconnect memif$sid2/$mid2 memif$sid1/$mid1 +set interface l2 xconnect memif$sid1/$mid1 memif$sid2/$mid2 diff --git a/resources/templates/container/memif_create_chain_ip4.exec b/resources/templates/container/memif_create_chain_ip4.exec new file mode 100644 index 0000000000..be425f53dd --- /dev/null +++ b/resources/templates/container/memif_create_chain_ip4.exec @@ -0,0 +1,15 @@ +create memif socket id $sid1 filename $socket1 +create interface memif id $mid1 socket-id $sid1 hw-addr $mac1 master +set interface ip address memif$sid1/$mid1 1.1.$sid1.1/24 +set interface state memif$sid1/$mid1 up + +create memif socket id $sid2 filename $socket2 +create interface memif id $mid2 socket-id $sid2 hw-addr $mac2 master +set interface ip address memif$sid2/$mid2 1.1.$sid2.1/24 +set interface state memif$sid2/$mid2 up + +set ip arp static memif$sid1/$mid1 1.1.$sid1.2 $vif1_mac +set ip arp static memif$sid2/$mid2 1.1.$sid2.2 $vif2_mac + +ip route add 10.0.0.0/8 via 1.1.$sid1.2 +ip route add 20.0.0.0/8 via 1.1.$sid2.2 diff --git a/resources/templates/container/memif_create_chain_l2xc.exec b/resources/templates/container/memif_create_chain_l2xc.exec new file mode 100644 index 0000000000..6b998d8f34 --- /dev/null +++ b/resources/templates/container/memif_create_chain_l2xc.exec @@ -0,0 +1,10 @@ +create memif socket id $sid1 filename $socket1 +create interface memif id $mid1 socket-id $sid1 master +set int state memif$sid1/$mid1 up + +create memif socket id $sid2 filename $socket2 +create interface memif id $mid2 socket-id $sid2 master +set int state memif$sid2/$mid2 up + +set interface l2 xconnect memif$sid2/$mid2 memif$sid1/$mid1 +set interface l2 xconnect memif$sid1/$mid1 memif$sid2/$mid2 diff --git a/resources/templates/container/memif_create_cross_horizon.exec b/resources/templates/container/memif_create_cross_horizon.exec new file mode 100644 index 0000000000..4129aab009 --- /dev/null +++ b/resources/templates/container/memif_create_cross_horizon.exec @@ -0,0 +1,8 @@ +create memif socket id $sid1 filename $socket1 +create interface memif id $mid1 socket-id $sid1 master + +set int state memif$sid1/$mid1 up +set int state $if_name up + +set interface l2 xconnect $if_name memif$sid1/$mid1 +set interface l2 xconnect memif$sid1/$mid1 $if_name diff --git a/resources/templates/container/memif_create_pipeline_ip4.exec b/resources/templates/container/memif_create_pipeline_ip4.exec new file mode 100644 index 0000000000..f0da245328 --- /dev/null +++ b/resources/templates/container/memif_create_pipeline_ip4.exec @@ -0,0 +1,15 @@ +create memif socket id $sid1 filename $socket1 +create interface memif id $mid1 socket-id $sid1 hw-addr $mac1 $role1 +set interface ip address memif$sid1/$mid1 1.1.$sid1.1/24 +set interface state memif$sid1/$mid1 up + +create memif socket id $sid2 filename $socket2 +create interface memif id $mid2 socket-id $sid2 hw-addr $mac2 $role2 +set interface ip address memif$sid2/$mid2 1.1.$sid2.1/24 +set interface state memif$sid2/$mid2 up + +set ip arp static memif$sid1/$mid1 1.1.$sid1.2 $vif1_mac +set ip arp static memif$sid2/$mid2 1.1.$sid2.2 $vif2_mac + +ip route add 10.0.0.0/8 via 1.1.$sid1.2 +ip route add 20.0.0.0/8 via 1.1.$sid2.2 diff --git a/resources/templates/vat/memif_create_chain_functional.vat b/resources/templates/vat/memif_create_chain_functional.vat deleted file mode 100644 index c5db09315c..0000000000 --- a/resources/templates/vat/memif_create_chain_functional.vat +++ /dev/null @@ -1,12 +0,0 @@ -create memif socket id {sid1} filename {socket1} -create interface memif id {mid1} socket-id {sid1} master -set interface rx-mode memif{sid1}/{mid1} {rx_mode} -set int state memif{sid1}/{mid1} up - -create memif socket id {sid2} filename {socket2} -create interface memif id {mid2} socket-id {sid2} master -set interface rx-mode memif{sid2}/{mid2} {rx_mode} -set int state memif{sid2}/{mid2} up - -set interface l2 xconnect memif{sid2}/{mid2} memif{sid1}/{mid1} -set interface l2 xconnect memif{sid1}/{mid1} memif{sid2}/{mid2} diff --git a/resources/templates/vat/memif_create_chain_ip4.vat b/resources/templates/vat/memif_create_chain_ip4.vat deleted file mode 100644 index 1c9205a086..0000000000 --- a/resources/templates/vat/memif_create_chain_ip4.vat +++ /dev/null @@ -1,15 +0,0 @@ -create memif socket id {sid1} filename {socket1} -create interface memif id {mid1} socket-id {sid1} hw-addr {mac1} master -set interface ip address memif{sid1}/{mid1} 1.1.{sid1}.1/24 -set interface state memif{sid1}/{mid1} up - -create memif socket id {sid2} filename {socket2} -create interface memif id {mid2} socket-id {sid2} hw-addr {mac2} master -set interface ip address memif{sid2}/{mid2} 1.1.{sid2}.1/24 -set interface state memif{sid2}/{mid2} up - -set ip arp static memif{sid1}/{mid1} 1.1.{sid1}.2 {vif1_mac} -set ip arp static memif{sid2}/{mid2} 1.1.{sid2}.2 {vif2_mac} - -ip route add 10.0.0.0/8 via 1.1.{sid1}.2 -ip route add 20.0.0.0/8 via 1.1.{sid2}.2 diff --git a/resources/templates/vat/memif_create_chain_l2xc.vat b/resources/templates/vat/memif_create_chain_l2xc.vat deleted file mode 100644 index 5275f84a65..0000000000 --- a/resources/templates/vat/memif_create_chain_l2xc.vat +++ /dev/null @@ -1,10 +0,0 @@ -create memif socket id {sid1} filename {socket1} -create interface memif id {mid1} socket-id {sid1} master -set int state memif{sid1}/{mid1} up - -create memif socket id {sid2} filename {socket2} -create interface memif id {mid2} socket-id {sid2} master -set int state memif{sid2}/{mid2} up - -set interface l2 xconnect memif{sid2}/{mid2} memif{sid1}/{mid1} -set interface l2 xconnect memif{sid1}/{mid1} memif{sid2}/{mid2} diff --git a/resources/templates/vat/memif_create_cross_horizon.vat b/resources/templates/vat/memif_create_cross_horizon.vat deleted file mode 100644 index 40ff2c30fc..0000000000 --- a/resources/templates/vat/memif_create_cross_horizon.vat +++ /dev/null @@ -1,8 +0,0 @@ -create memif socket id {sid1} filename {socket1} -create interface memif id {mid1} socket-id {sid1} master - -set int state memif{sid1}/{mid1} up -set int state {if_name} up - -set interface l2 xconnect {if_name} memif{sid1}/{mid1} -set interface l2 xconnect memif{sid1}/{mid1} {if_name} diff --git a/resources/templates/vat/memif_create_pipeline_ip4.vat b/resources/templates/vat/memif_create_pipeline_ip4.vat deleted file mode 100644 index 1875a70202..0000000000 --- a/resources/templates/vat/memif_create_pipeline_ip4.vat +++ /dev/null @@ -1,15 +0,0 @@ -create memif socket id {sid1} filename {socket1} -create interface memif id {mid1} socket-id {sid1} hw-addr {mac1} {role1} -set interface ip address memif{sid1}/{mid1} 1.1.{sid1}.1/24 -set interface state memif{sid1}/{mid1} up - -create memif socket id {sid2} filename {socket2} -create interface memif id {mid2} socket-id {sid2} hw-addr {mac2} {role2} -set interface ip address memif{sid2}/{mid2} 1.1.{sid2}.1/24 -set interface state memif{sid2}/{mid2} up - -set ip arp static memif{sid1}/{mid1} 1.1.{sid1}.2 {vif1_mac} -set ip arp static memif{sid2}/{mid2} 1.1.{sid2}.2 {vif2_mac} - -ip route add 10.0.0.0/8 via 1.1.{sid1}.2 -ip route add 20.0.0.0/8 via 1.1.{sid2}.2 -- cgit 1.2.3-korg