Merge pull request #1567 from aapostoliuk/T4660-sagitta

policy: T4660: Changed CLI syntax in route-map set community

6 files changed, 218 insertions, 131 deletions

diff --git a/interface-definitions/include/policy/community-clear.xml.i b/interface-definitions/include/policy/community-clear.xml.i
new file mode 100644
index 000000000..0fd57cdf0
--- /dev/null
+++ b/interface-definitions/include/policy/community-clear.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from policy/community-clear.xml.i -->
+<leafNode name="none">
+  <properties>
+    <help>Completely remove communities attribute from a prefix</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/policy/community-value-list.xml.i b/interface-definitions/include/policy/community-value-list.xml.i
new file mode 100644
index 000000000..8c665c5f0
--- /dev/null
+++ b/interface-definitions/include/policy/community-value-list.xml.i
@@ -0,0 +1,90 @@
+<!-- include start from policy/community-value-list.xml.i -->
+<completionHelp>
+    <list>
+      local-as
+      no-advertise
+      no-export
+      internet
+      graceful-shutdown
+      accept-own
+      route-filter-translated-v4
+      route-filter-v4
+      route-filter-translated-v6
+      route-filter-v6
+      llgr-stale
+      no-llgr
+      accept-own-nexthop
+      blackhole
+      no-peer
+    </list>
+</completionHelp>
+<valueHelp>
+    <format>&lt;AS:VAL&gt;</format>
+    <description>Community number in &lt;0-65535:0-65535&gt; format</description>
+</valueHelp>
+<valueHelp>
+    <format>local-as</format>
+    <description>Well-known communities value NO_EXPORT_SUBCONFED 0xFFFFFF03</description>
+</valueHelp>
+<valueHelp>
+    <format>no-advertise</format>
+    <description>Well-known communities value NO_ADVERTISE 0xFFFFFF02</description>
+</valueHelp>
+<valueHelp>
+    <format>no-export</format>
+    <description>Well-known communities value NO_EXPORT 0xFFFFFF01</description>
+</valueHelp>
+<valueHelp>
+    <format>internet</format>
+    <description>Well-known communities value 0</description>
+</valueHelp>
+<valueHelp>
+    <format>graceful-shutdown</format>
+    <description>Well-known communities value GRACEFUL_SHUTDOWN 0xFFFF0000</description>
+</valueHelp>
+<valueHelp>
+    <format>accept-own</format>
+    <description>Well-known communities value ACCEPT_OWN 0xFFFF0001</description>
+</valueHelp>
+<valueHelp>
+    <format>route-filter-translated-v4</format>
+    <description>Well-known communities value ROUTE_FILTER_TRANSLATED_v4 0xFFFF0002</description>
+</valueHelp>
+<valueHelp>
+    <format>route-filter-v4</format>
+    <description>Well-known communities value ROUTE_FILTER_v4 0xFFFF0003</description>
+</valueHelp>
+<valueHelp>
+    <format>route-filter-translated-v6</format>
+    <description>Well-known communities value ROUTE_FILTER_TRANSLATED_v6 0xFFFF0004</description>
+</valueHelp>
+<valueHelp>
+    <format>route-filter-v6</format>
+    <description>Well-known communities value ROUTE_FILTER_v6 0xFFFF0005</description>
+</valueHelp>
+<valueHelp>
+    <format>llgr-stale</format>
+    <description>Well-known communities value LLGR_STALE 0xFFFF0006</description>
+</valueHelp>
+<valueHelp>
+    <format>no-llgr</format>
+    <description>Well-known communities value NO_LLGR 0xFFFF0007</description>
+</valueHelp>
+<valueHelp>
+    <format>accept-own-nexthop</format>
+    <description>Well-known communities value accept-own-nexthop 0xFFFF0008</description>
+</valueHelp>
+<valueHelp>
+    <format>blackhole</format>
+    <description>Well-known communities value BLACKHOLE 0xFFFF029A</description>
+</valueHelp>
+<valueHelp>
+    <format>no-peer</format>
+    <description>Well-known communities value NOPEER 0xFFFFFF04</description>
+</valueHelp>
+<multi/>
+<constraint>
+    <regex>local-as|no-advertise|no-export|internet|graceful-shutdown|accept-own|route-filter-translated-v4|route-filter-v4|route-filter-translated-v6|route-filter-v6|llgr-stale|no-llgr|accept-own-nexthop|blackhole|no-peer</regex>
+    <validator name="bgp-regular-community"/>
+</constraint>
+        <!-- include end -->
diff --git a/interface-definitions/include/policy/extended-community-value-list.xml.i b/interface-definitions/include/policy/extended-community-value-list.xml.i
new file mode 100644
index 000000000..c79f78c67
--- /dev/null
+++ b/interface-definitions/include/policy/extended-community-value-list.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from policy/community-value-list.xml.i -->
+<valueHelp>
+  <format>ASN:NN</format>
+  <description>based on autonomous system number in format &lt;0-65535:0-4294967295&gt;</description>
+</valueHelp>
+<valueHelp>
+  <format>IP:NN</format>
+  <description>Based on a router-id IP address in format &lt;IP:0-65535&gt;</description>
+</valueHelp>
+<constraint>
+  <validator name="bgp-extended-community"/>
+</constraint>
+<constraintErrorMessage>Should be in form: ASN:NN or IPADDR:NN where ASN is autonomous system number</constraintErrorMessage>
+<multi/>
+        <!-- include end -->
diff --git a/interface-definitions/include/policy/large-community-value-list.xml.i b/interface-definitions/include/policy/large-community-value-list.xml.i
new file mode 100644
index 000000000..33b1f13a2
--- /dev/null
+++ b/interface-definitions/include/policy/large-community-value-list.xml.i
@@ -0,0 +1,10 @@
+<!-- include start from policy/community-value-list.xml.i -->
+<valueHelp>
+    <description>Community in format &lt;0-4294967295:0-4294967295:0-4294967295&gt;</description>
+    <format>&lt;GA:LDP1:LDP2&gt;</format>
+</valueHelp>
+<multi/>
+<constraint>
+    <validator name="bgp-large-community"/>
+</constraint>
+        <!-- include end -->
diff --git a/interface-definitions/include/version/policy-version.xml.i b/interface-definitions/include/version/policy-version.xml.i
index 426173a19..89bde20c7 100644
--- a/interface-definitions/include/version/policy-version.xml.i
+++ b/interface-definitions/include/version/policy-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/policy-version.xml.i -->
-<syntaxVersion component='policy' version='3'></syntaxVersion>
+<syntaxVersion component='policy' version='4'></syntaxVersion>
 <!-- include end -->
diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in
index e794c4b90..6c60276d5 100644
--- a/interface-definitions/policy.xml.in
+++ b/interface-definitions/policy.xml.in
@@ -1118,67 +1118,120 @@
                       <valueless/>
                     </properties>
                   </leafNode>
-                  <node name="comm-list">
+                  <node name="community">
                     <properties>
-                      <help>BGP communities matching a community-list</help>
+                      <help>BGP community attribute</help>
                     </properties>
                     <children>
-                      <leafNode name="comm-list">
+                      <leafNode name="add">
+                        <properties>
+                          <help>Add communities to a prefix</help>
+                          #include <include/policy/community-value-list.xml.i>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="replace">
+                        <properties>
+                          <help>Set communities for a prefix</help>
+                          #include <include/policy/community-value-list.xml.i>
+                        </properties>
+                      </leafNode>
+                      #include <include/policy/community-clear.xml.i>
+                      <leafNode name="delete">
                         <properties>
-                          <help>BGP communities with a community-list</help>
+                          <help>Remove communities defined in a list from a prefix</help>
                           <completionHelp>
                             <path>policy community-list</path>
                           </completionHelp>
                           <valueHelp>
+                            <description>Community-list</description>
                             <format>txt</format>
-                            <description>BGP communities with a community-list</description>
                           </valueHelp>
                         </properties>
                       </leafNode>
+                    </children>
+                  </node>
+                  <node name="large-community">
+                    <properties>
+                      <help>BGP large community attribute</help>
+                    </properties>
+                    <children>
+                      <leafNode name="add">
+                        <properties>
+                          <help>Add large communities to a prefix ;</help>
+                          #include <include/policy/large-community-value-list.xml.i>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="replace">
+                        <properties>
+                          <help>Set large communities for a prefix</help>
+                          #include <include/policy/large-community-value-list.xml.i>
+                        </properties>
+                      </leafNode>
+                      #include <include/policy/community-clear.xml.i>
                       <leafNode name="delete">
                         <properties>
-                          <help>Delete BGP communities matching the community-list</help>
-                          <valueless/>
+                          <help>Remove communities defined in a list from a prefix</help>
+                          <completionHelp>
+                            <path>policy large-community-list</path>
+                          </completionHelp>
+                          <valueHelp>
+                            <description>Community-list</description>
+                            <format>txt</format>
+                          </valueHelp>
                         </properties>
                       </leafNode>
                     </children>
                   </node>
-                  <leafNode name="community">
+                  <node name="extcommunity">
                     <properties>
-                      <help>Border Gateway Protocl (BGP) community attribute</help>
-                      <completionHelp>
-                        <list>local-AS no-advertise no-export internet additive none</list>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>&lt;aa:nn&gt;</format>
-                        <description>Community number in AA:NN format</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>local-AS</format>
-                        <description>Well-known communities value NO_EXPORT_SUBCONFED 0xFFFFFF03</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>no-advertise</format>
-                        <description>Well-known communities value NO_ADVERTISE 0xFFFFFF02</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>no-export</format>
-                        <description>Well-known communities value NO_EXPORT 0xFFFFFF01</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>internet</format>
-                        <description>Well-known communities value 0</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>additive</format>
-                        <description>New value is appended to the existing value</description>
-                      </valueHelp>
-                      <valueHelp>
-                        <format>none</format>
-                        <description>No community attribute</description>
-                      </valueHelp>
+                      <help>BGP extended community attribute</help>
                     </properties>
-                  </leafNode>
+                    <children>
+                      <leafNode name="bandwidth">
+                        <properties>
+                          <help>Bandwidth value in Mbps</help>
+                          <completionHelp>
+                            <list>cumulative num-multipaths</list>
+                          </completionHelp>
+                          <valueHelp>
+                            <format>u32:1-25600</format>
+                            <description>Bandwidth value in Mbps</description>
+                          </valueHelp>
+                          <valueHelp>
+                            <format>cumulative</format>
+                            <description>Cumulative bandwidth of all multipaths (outbound-only)</description>
+                          </valueHelp>
+                          <valueHelp>
+                            <format>num-multipaths</format>
+                            <description>Internally computed bandwidth based on number of multipaths (outbound-only)</description>
+                          </valueHelp>
+                          <constraint>
+                            <validator name="numeric" argument="--range 1-25600"/>
+                            <regex>(cumulative|num-multipaths)</regex>
+                          </constraint>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="bandwidth-non-transitive">
+                        <properties>
+                          <help>The link bandwidth extended community is encoded as non-transitive</help>
+                          <valueless/>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="rt">
+                        <properties>
+                          <help>Set route target value</help>
+                          #include <include/policy/extended-community-value-list.xml.i>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="soo">
+                        <properties>
+                          <help>Set Site of Origin value</help>
+                          #include <include/policy/extended-community-value-list.xml.i>
+                        </properties>
+                      </leafNode>
+                      #include <include/policy/community-clear.xml.i>
+                    </children>
+                  </node>
                   <leafNode name="distance">
                     <properties>
                       <help>Locally significant administrative distance</help>
@@ -1229,71 +1282,6 @@
                       </node>
                     </children>
                   </node>
-                  <node name="extcommunity">
-                    <properties>
-                      <help>BGP extended community attribute</help>
-                    </properties>
-                    <children>
-                      <leafNode name="bandwidth">
-                        <properties>
-                          <help>Bandwidth value in Mbps</help>
-                          <completionHelp>
-                            <list>cumulative num-multipaths</list>
-                          </completionHelp>
-                          <valueHelp>
-                            <format>u32:1-25600</format>
-                            <description>Bandwidth value in Mbps</description>
-                          </valueHelp>
-                          <valueHelp>
-                            <format>cumulative</format>
-                            <description>Cumulative bandwidth of all multipaths (outbound-only)</description>
-                          </valueHelp>
-                          <valueHelp>
-                            <format>num-multipaths</format>
-                            <description>Internally computed bandwidth based on number of multipaths (outbound-only)</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-25600"/>
-                            <regex>(cumulative|num-multipaths)</regex>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="rt">
-                        <properties>
-                          <help>Set route target value</help>
-                          <valueHelp>
-                            <format>ASN:NN</format>
-                            <description>based on autonomous system number</description>
-                          </valueHelp>
-                          <valueHelp>
-                            <format>IP:NN</format>
-                            <description>Based on a router-id IP address</description>
-                          </valueHelp>
-                          <constraint>
-                            <regex>(((\b(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b)|(\d+)):(\d+) ?)+</regex>
-                          </constraint>
-                          <constraintErrorMessage>Should be in form: ASN:NN or IPADDR:NN where ASN is autonomous system number</constraintErrorMessage>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="soo">
-                        <properties>
-                          <help>Set Site of Origin value</help>
-                          <valueHelp>
-                            <format>ASN:NN</format>
-                            <description>based on autonomous system number</description>
-                          </valueHelp>
-                          <valueHelp>
-                            <format>IP:NN</format>
-                            <description>Based on a router-id IP address</description>
-                          </valueHelp>
-                          <constraint>
-                            <regex>((?:[0-9]{1,3}\.){3}[0-9]{1,3}|\d+):\d+</regex>
-                          </constraint>
-                          <constraintErrorMessage>Should be in form: ASN:NN or IPADDR:NN where ASN is autonomous system number</constraintErrorMessage>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
                   <leafNode name="ip-next-hop">
                     <properties>
                       <help>Nexthop IP address</help>
@@ -1368,30 +1356,6 @@
                       </leafNode>
                     </children>
                   </node>
-                  <leafNode name="large-community">
-                    <properties>
-                      <help>Set BGP large community value</help>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>ASN:nn:mm BGP large community</description>
-                      </valueHelp>
-                      <completionHelp>
-                        <path>policy large-community-list</path>
-                      </completionHelp>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="large-comm-list-delete">
-                    <properties>
-                      <help>Delete BGP communities matching the large community-list</help>
-                      <completionHelp>
-                        <path>policy large-community-list</path>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>BGP large community-list</description>
-                      </valueHelp>
-                    </properties>
-                  </leafNode>
                   <leafNode name="local-preference">
                     <properties>
                       <help>BGP local preference attribute</help>