Merge pull request #34 from natali-rs1985/T7488

T7488: Make VPP restartable

Author: sever-sever

data/templates/vpp/override.conf.j2

@@ -3,12 +3,12 @@ After=
 After=vyos-router.service
 ConditionPathExists=
 ConditionPathExists=/run/vpp/vpp.conf
+OnFailure=vpp-failure-handler.service
 
 [Service]
 EnvironmentFile=
 ExecStart=
 ExecStart=/usr/bin/vpp -c /run/vpp/vpp.conf
 WorkingDirectory=
 WorkingDirectory=/run/vpp
-Restart=always
-RestartSec=10
+Restart=no

src/conf_mode/vpp_acl.py

@@ -147,6 +147,10 @@ def get_config(config=None) -> dict:
         with_recursive_defaults=True,
     )
 
+    if not conf.exists(['vpp']):
+        config['remove_vpp'] = True
+        return config
+
     # Get effective config as we need full dictionary for deletion
     effective_config = conf.get_config_dict(
         base,
@@ -190,7 +194,7 @@ def get_config(config=None) -> dict:
 
 
 def verify(config):
-    if 'remove' in config:
+    if 'remove' in config or 'remove_vpp' in config:
         return None
 
     for acl_type in ['ip', 'macip']:
@@ -319,6 +323,9 @@ def generate(config):
 
 
 def apply(config):
+    if 'remove_vpp' in config:
+        return None
+
     acl = Acl()
 
     if 'effective' in config:

src/conf_mode/vpp_interfaces_bonding.py

@@ -86,6 +86,10 @@ def get_config(config=None) -> dict:
         with_recursive_defaults=True,
     )
 
+    if not conf.exists(['vpp']):
+        config['remove_vpp'] = True
+        return config
+
     # Get effective config as we need full dicitonary per interface delete
     effective_config = conf.get_config_dict(
         base + [ifname],
@@ -155,6 +159,9 @@ def get_config(config=None) -> dict:
 
 
 def verify(config):
+    if 'remove_vpp' in config:
+        return None
+
     verify_vpp_remove_kernel_interface(config)
     verify_vpp_remove_xconnect_interface(config)
 
@@ -175,6 +182,9 @@ def generate(config):
 
 
 def apply(config):
+    if 'remove_vpp' in config:
+        return None
+
     ifname = config.get('ifname')
     # remove old members
     if 'effective' in config:

src/conf_mode/vpp_interfaces_bridge.py

@@ -53,6 +53,10 @@ def get_config(config=None) -> dict:
         with_recursive_defaults=True,
     )
 
+    if not conf.exists(['vpp']):
+        config['remove_vpp'] = True
+        return config
+
     # Get effective config as we need full dicitonary per interface delete
     effective_config = conf.get_config_dict(
         base + [ifname],
@@ -87,7 +91,7 @@ def get_config(config=None) -> dict:
 
 
 def verify(config):
-    if 'remove' in config:
+    if 'remove' in config or 'remove_vpp' in config:
         return None
 
     # Check if interface exists in vpp before adding to bridge-domain
@@ -122,6 +126,9 @@ def generate(config):
 
 
 def apply(config):
+    if 'remove_vpp' in config:
+        return None
+
     ifname = config.get('ifname')
     # vxlan10 in the vpp is vxlan_tunnel10
     interface_transform_filter = ('geneve', 'vxlan')

src/conf_mode/vpp_interfaces_geneve.py

@@ -65,6 +65,10 @@ def get_config(config=None) -> dict:
         with_recursive_defaults=True,
     )
 
+    if not conf.exists(['vpp']):
+        config['remove_vpp'] = True
+        return config
+
     # Get effective config as we need full dicitonary per interface delete
     effective_config = conf.get_config_dict(
         base + [ifname],
@@ -112,6 +116,10 @@ def get_config(config=None) -> dict:
 
 
 def verify(config):
+    # No need to verify anything if vpp is removed
+    if 'remove_vpp' in config:
+        return None
+
     # Verify that removed kernel interface is not used in 'vpp kernel-interfaces'.
     # vpp interfaces geneve geneveX kernel-interface vpp-tunX
     # vpp kernel-interface vpp-tunX
@@ -141,6 +149,9 @@ def generate(config):
 
 
 def apply(config):
+    if 'remove_vpp' in config:
+        return None
+
     ifname = config.get('ifname')
     # Delete interface
     if 'effective' in config:

src/conf_mode/vpp_interfaces_gre.py

@@ -65,6 +65,10 @@ def get_config(config=None) -> dict:
         with_recursive_defaults=True,
     )
 
+    if not conf.exists(['vpp']):
+        config['remove_vpp'] = True
+        return config
+
     # Get effective config as we need full dicitonary per interface delete
     effective_config = conf.get_config_dict(
         base + [ifname],
@@ -125,6 +129,10 @@ def get_config(config=None) -> dict:
 
 
 def verify(config):
+    # No need to verify anything if vpp is removed
+    if 'remove_vpp' in config:
+        return None
+
     # Verify that removed kernel interface is not used in 'vpp kernel-interfaces'.
     # vpp interfaces gre greX kernel-interface vpp-tunX
     # vpp kernel-interface vpp-tunX
@@ -167,6 +175,9 @@ def generate(config):
 
 
 def apply(config):
+    if 'remove_vpp' in config:
+        return None
+
     ifname = config.get('ifname')
     # Delete interface
     if 'effective' in config:

src/conf_mode/vpp_interfaces_ipip.py

@@ -64,6 +64,10 @@ def get_config(config=None) -> dict:
         with_recursive_defaults=True,
     )
 
+    if not conf.exists(['vpp']):
+        config['remove_vpp'] = True
+        return config
+
     # Get effective config as we need full dicitonary per interface delete
     effective_config = conf.get_config_dict(
         base + [ifname],
@@ -125,6 +129,10 @@ def get_config(config=None) -> dict:
 
 
 def verify(config):
+    # No need to verify anything if vpp is removed
+    if 'remove_vpp' in config:
+        return None
+
     # Verify that removed kernel interface is not used in 'vpp kernel-interfaces'.
     # vpp interfaces ipip ipipX kernel-interface vpp-tunX
     # vpp kernel-interface vpp-tunX
@@ -161,6 +169,9 @@ def generate(config):
 
 
 def apply(config):
+    if 'remove_vpp' in config:
+        return None
+
     ifname = config.get('ifname')
     # Delete interface
     if 'effective' in config:

src/conf_mode/vpp_interfaces_loopback.py

@@ -62,6 +62,10 @@ def get_config(config=None) -> dict:
         with_recursive_defaults=True,
     )
 
+    if not conf.exists(['vpp']):
+        config['remove_vpp'] = True
+        return config
+
     # Get effective config as we need full dicitonary per interface delete
     effective_config = conf.get_config_dict(
         base + [ifname],
@@ -114,6 +118,10 @@ def get_config(config=None) -> dict:
 
 
 def verify(config):
+    # No need to verify anything if vpp is removed
+    if 'remove_vpp' in config:
+        return None
+
     verify_vpp_remove_kernel_interface(config)
 
     if 'remove' in config:
@@ -128,6 +136,9 @@ def generate(config):
 
 
 def apply(config):
+    if 'remove_vpp' in config:
+        return None
+
     ifname = config.get('ifname')
     # Delete interface
     if 'effective' in config:

src/conf_mode/vpp_interfaces_vxlan.py

@@ -66,6 +66,10 @@ def get_config(config=None) -> dict:
         with_recursive_defaults=True,
     )
 
+    if not conf.exists(['vpp']):
+        config['remove_vpp'] = True
+        return config
+
     # Get effective config as we need full dicitonary per interface delete
     effective_config = conf.get_config_dict(
         base + [ifname],
@@ -131,6 +135,10 @@ def get_config(config=None) -> dict:
 
 
 def verify(config):
+    # No need to verify anything if vpp is removed
+    if 'remove_vpp' in config:
+        return None
+
     # Verify that removed kernel interface is not used in 'vpp kernel-interfaces'.
     # vpp interfaces vxlan vxlanX kernel-interface vpp-tunX
     # vpp kernel-interface vpp-tunX
@@ -165,6 +173,9 @@ def generate(config):
 
 
 def apply(config):
+    if 'remove_vpp' in config:
+        return None
+
     ifname = config.get('ifname')
     # Delete interface
     if 'effective' in config:

src/conf_mode/vpp_interfaces_xconnect.py

@@ -53,6 +53,10 @@ def get_config(config=None) -> dict:
         with_recursive_defaults=True,
     )
 
+    if not conf.exists(['vpp']):
+        config['remove_vpp'] = True
+        return config
+
     # Get effective config as we need full dicitonary per interface delete
     effective_config = conf.get_config_dict(
         base + [ifname],
@@ -85,7 +89,7 @@ def get_config(config=None) -> dict:
 
 
 def verify(config):
-    if 'remove' in config:
+    if 'remove' in config or 'remove_vpp' in config:
         return None
 
     # Xconnect requires 2 members
@@ -110,6 +114,9 @@ def generate(config):
 
 
 def apply(config):
+    if 'remove_vpp' in config:
+        return None
+
     ifname = config.get('ifname')
 
     # Delete xconnect