From: Tetsuya Murakami <tetsuya.mrk@gmail.com>
Date: Tue, 24 Mar 2020 20:12:13 +0000 (-0700)
Subject: sr: Change the CLI keyword from address to prefix.
X-Git-Tag: v20.09-rc0~341
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=b24e287b9295bcc3e904753e9e2bfde89d6666db

sr: Change the CLI keyword from address to prefix.

Change the CLI keyword from address to prefix in sr localsid command.

Type: feature

Signed-off-by: Tetsuya Murakami <tetsuya.mrk@gmail.com>
Change-Id: Icc3072404a106ab40e829d2d291e5c179a4443a8
Signed-off-by: Tetsuya Murakami <tetsuya.mrk@gmail.com>
---

diff --git a/src/plugins/srv6-mobile/test/test_srv6_mobile.py b/src/plugins/srv6-mobile/test/test_srv6_mobile.py
index 2ac37cefca9..ec94b8b9c03 100644
--- a/src/plugins/srv6-mobile/test/test_srv6_mobile.py
+++ b/src/plugins/srv6-mobile/test/test_srv6_mobile.py
@@ -236,7 +236,7 @@ class TestSRv6EndMGTP6E(VppTestCase):
         pkts = self.create_packets([("A::1", "B::1"), ("C::1", "D::1")])
 
         self.vapi.cli(
-            "sr localsid address {}/64 behavior end.m.gtp6.e"
+            "sr localsid prefix {}/64 behavior end.m.gtp6.e"
             .format(pkts[0]['IPv6'].dst))
         self.vapi.cli(
             "ip route add a1::/64 via {}".format(self.ip6_nhop))
@@ -316,7 +316,7 @@ class TestSRv6EndMGTP6D(VppTestCase):
         self.vapi.cli("set sr encaps source addr A1::1")
         self.vapi.cli("sr policy add bsid D4:: next D2:: next D3::")
         self.vapi.cli(
-            "sr localsid address 2001::/64 behavior end.m.gtp6.d D4::/64")
+            "sr localsid prefix 2001::/64 behavior end.m.gtp6.d D4::/64")
         self.vapi.cli("ip route add D2::/64 via {}".format(self.ip6_nhop))
 
         self.logger.info(self.vapi.cli("show sr policies"))
diff --git a/src/vnet/srv6/sr_localsid.c b/src/vnet/srv6/sr_localsid.c
index 6af6b7497bd..4c21edfe0ef 100755
--- a/src/vnet/srv6/sr_localsid.c
+++ b/src/vnet/srv6/sr_localsid.c
@@ -312,7 +312,7 @@ sr_cli_localsid_command_fn (vlib_main_t * vm, unformat_input_t * input,
       if (unformat (input, "del"))
 	is_del = 1;
       else if (!address_set
-	       && unformat (input, "address %U/%u", unformat_ip6_address,
+	       && unformat (input, "prefix %U/%u", unformat_ip6_address,
 			    &resulting_address, &prefix_len))
 	address_set = 1;
       else if (!address_set