From 2c592263a4150c0f70a261efe7a1830272d07eaf Mon Sep 17 00:00:00 2001
From: Julien Fortin <julien@cumulusnetworks.com>
Date: Mon, 1 Aug 2016 17:20:44 +0200
Subject: [PATCH] ifupdown: valivals keyword: remove <auto> and renaming
 <ipaddr> to <ip>

Ticket: None
Reviewed By: Daniel Walton
Testing Done:

This commit was need to keep nclu and ifupdown2 consistent.
The naming were differing and we decided to keep nclu version.

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
---
 addons/addressvirtual.py |  2 +-
 addons/vrf.py            |  2 +-
 ifupdown/ifupdownmain.py | 20 ++++++++------------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/addons/addressvirtual.py b/addons/addressvirtual.py
index 71efbe2..dd5f339 100644
--- a/addons/addressvirtual.py
+++ b/addons/addressvirtual.py
@@ -26,7 +26,7 @@ class addressvirtual(moduleBase):
                 'attrs' : {
                     'address-virtual' :
                         { 'help' : 'bridge router virtual mac and ips',
-                          'validvals' : ['<mac-ipaddr/prefixlen-list>',],
+                          'validvals' : ['<mac-ip/prefixlen-list>',],
                           'example' : ['address-virtual 00:11:22:33:44:01 11.0.1.1/24 11.0.1.2/24']}
                  }}
 
diff --git a/addons/vrf.py b/addons/vrf.py
index 343f5b9..96adb72 100644
--- a/addons/vrf.py
+++ b/addons/vrf.py
@@ -34,7 +34,7 @@ class vrf(moduleBase):
                                    'creating a vrf device. ' +
                                    'Table id is either \'auto\' or '+
                                    '\'valid routing table id\'',
-                          'validvals': ['<auto>', '<number>'],
+                          'validvals': ['auto', '<number>'],
                           'example': ['vrf-table auto', 'vrf-table 1001']},
                     'vrf':
                          {'help' : 'vrf the interface is part of.',
diff --git a/ifupdown/ifupdownmain.py b/ifupdown/ifupdownmain.py
index 0691a56..dd2ac06 100644
--- a/ifupdown/ifupdownmain.py
+++ b/ifupdown/ifupdownmain.py
@@ -277,8 +277,7 @@ class ifupdownMain(ifupdownBase):
             '<text>': self._keyword_text,
             '<ipv4>': self._keyword_ipv4,
             '<ipv6>': self._keyword_ipv6,
-            '<auto>': self._keyword_auto,
-            '<ipaddr>': self._keyword_ipaddr,
+            '<ip>': self._keyword_ip,
             '<number>': self._keyword_number,
             '<interface>': self._keyword_interface,
             '<ipv4-vrf-text>': self._keyword_ipv4_vrf_text,
@@ -286,10 +285,10 @@ class ifupdownMain(ifupdownBase):
             '<interface-list>': self._keyword_interface_list,
             '<ipv4/prefixlen>': self._keyword_ipv4_prefixlen,
             '<ipv6/prefixlen>': self._keyword_ipv6_prefixlen,
-            '<ipaddr/prefixlen>': self._keyword_ipaddr_prefixlen,
+            '<ip/prefixlen>': self._keyword_ip_prefixlen,
             '<number-range-list>': self._keyword_number_range_list,
             '<interface-range-list>': self._keyword_interface_range_list,
-            '<mac-ipaddr/prefixlen-list>': self._keyword_mac_ipaddr_prefixlen_list,
+            '<mac-ip/prefixlen-list>': self._keyword_mac_ip_prefixlen_list,
             '<number-interface-list>': self._keyword_number_interface_list,
             '<interface-yes-no-list>': self._keyword_interface_yes_no_list,
             '<interface-yes-no-0-1-list>': self._keyword_interface_yes_no_0_1_list,
@@ -783,15 +782,15 @@ class ifupdownMain(ifupdownBase):
     def _keyword_ipv6_prefixlen(self, value, validrange=None):
         return self._keyword_check_list(value.split(), IPv6Network, limit=1)
 
-    def _keyword_ipaddr(self, value, validrange=None):
+    def _keyword_ip(self, value, validrange=None):
         return self._keyword_check_list(value.split(), IPAddress, limit=1)
 
-    def _keyword_ipaddr_prefixlen(self, value, validrange=None):
+    def _keyword_ip_prefixlen(self, value, validrange=None):
         return self._keyword_check_list(value.split(), IPNetwork, limit=1)
 
-    def _keyword_mac_ipaddr_prefixlen_list(self, value, validrange=None):
+    def _keyword_mac_ip_prefixlen_list(self, value, validrange=None):
         """
-            <mac> <ipaddr> [<ipaddr> ...]
+            <mac> <ip> [<ip> ...]
             ex: address-virtual 00:11:22:33:44:01 11.0.1.1/24 11.0.1.2/24
         """
         try:
@@ -801,7 +800,7 @@ class ifupdownMain(ifupdownBase):
             if not self._keyword_mac(res[0]):
                 return False
             for ip in res[1:]:
-                if not self._keyword_ipaddr_prefixlen(ip):
+                if not self._keyword_ip_prefixlen(ip):
                     return False
             return True
         except Exception as e:
@@ -1005,9 +1004,6 @@ class ifupdownMain(ifupdownBase):
             self.logger.debug('keyword: number interface list: %s' % str(e))
             return False
 
-    def _keyword_auto(self, value, validrange=None):
-        return value == 'auto'
-
     def _keyword_number(self, value, validrange=None):
         try:
             int(value)
-- 
2.39.2