From 553e78124fff57cbe8404445de759091ae92424b Mon Sep 17 00:00:00 2001
From: Prakash Bailkeri <prakashmb@juniper.net>
Date: Wed, 3 Feb 2016 11:07:35 +0530
Subject: [PATCH] Routing policy schema update

 Remove usage of keywords from schema
 Suffix Type to each type def

Change-Id: If5a2ffda5cebbbd49a3bbf4be296083e0e117ee2
Related-bug: #1500698
---
 src/bgp/bgp_config_ifmap.cc                  | 34 ++++++++---------
 src/bgp/bgp_config_parser.cc                 |  4 +-
 src/bgp/testdata/config_listener_test_10.xml |  8 ++--
 src/bgp/testdata/config_listener_test_11.xml |  8 ++--
 src/bgp/testdata/config_listener_test_14.xml | 16 ++++----
 src/bgp/testdata/config_listener_test_9.xml  | 20 +++++-----
 src/bgp/testdata/routing_policy_0.xml        | 18 ++++-----
 src/bgp/testdata/routing_policy_0a.xml       |  8 ++--
 src/bgp/testdata/routing_policy_0b.xml       | 16 ++++----
 src/bgp/testdata/routing_policy_0c.xml       | 10 ++---
 src/bgp/testdata/routing_policy_0d.xml       | 10 ++---
 src/bgp/testdata/routing_policy_0e.xml       |  8 ++--
 src/bgp/testdata/routing_policy_0f.xml       |  8 ++--
 src/bgp/testdata/routing_policy_0g.xml       |  8 ++--
 src/bgp/testdata/routing_policy_0h.xml       |  8 ++--
 src/bgp/testdata/routing_policy_1.xml        | 16 ++++----
 src/bgp/testdata/routing_policy_1a.xml       | 16 ++++----
 src/bgp/testdata/routing_policy_1b.xml       |  4 +-
 src/bgp/testdata/routing_policy_2.xml        | 30 +++++++--------
 src/bgp/testdata/routing_policy_2a.xml       | 28 +++++++-------
 src/bgp/testdata/routing_policy_2b.xml       | 10 ++---
 src/bgp/testdata/routing_policy_2c.xml       | 10 ++---
 src/bgp/testdata/routing_policy_2d.xml       | 10 ++---
 src/bgp/testdata/routing_policy_2e.xml       | 10 ++---
 src/bgp/testdata/routing_policy_2f.xml       | 10 ++---
 src/bgp/testdata/routing_policy_2g.xml       | 10 ++---
 src/bgp/testdata/routing_policy_3.xml        |  8 ++--
 src/bgp/testdata/routing_policy_3a.xml       | 16 ++++----
 src/bgp/testdata/routing_policy_3d.xml       | 16 ++++----
 src/bgp/testdata/routing_policy_4.xml        | 16 ++++----
 src/bgp/testdata/routing_policy_4a.xml       | 16 ++++----
 src/bgp/testdata/routing_policy_4b.xml       | 16 ++++----
 src/bgp/testdata/routing_policy_4c.xml       | 16 ++++----
 src/bgp/testdata/routing_policy_4d.xml       | 16 ++++----
 src/bgp/testdata/routing_policy_5.xml        | 10 ++---
 src/bgp/testdata/routing_policy_5a.xml       | 10 ++---
 src/bgp/testdata/routing_policy_5b.xml       | 10 ++---
 src/bgp/testdata/routing_policy_6.xml        | 28 +++++++-------
 src/bgp/testdata/routing_policy_6a.xml       | 26 ++++++-------
 src/bgp/testdata/routing_policy_6b.xml       | 18 ++++-----
 src/bgp/testdata/routing_policy_6c.xml       | 40 ++++++++++----------
 src/bgp/testdata/routing_policy_7.xml        | 10 ++---
 src/bgp/testdata/routing_policy_7a.xml       | 10 ++---
 src/bgp/testdata/routing_policy_7b.xml       | 20 +++++-----
 src/bgp/testdata/routing_policy_7c.xml       | 10 ++---
 src/bgp/testdata/routing_policy_7d.xml       | 10 ++---
 src/bgp/testdata/routing_policy_7e.xml       | 10 ++---
 src/bgp/testdata/routing_policy_7f.xml       | 10 ++---
 src/bgp/testdata/routing_policy_7g.xml       | 10 ++---
 src/bgp/testdata/routing_policy_7h.xml       |  8 ++--
 src/bgp/testdata/routing_policy_8.xml        | 10 ++---
 src/schema/routing_policy.xsd                | 38 +++++++++----------
 52 files changed, 373 insertions(+), 373 deletions(-)

diff --git a/src/bgp/bgp_config_ifmap.cc b/src/bgp/bgp_config_ifmap.cc
index 9d78a3922cb..f26c35a85f4 100644
--- a/src/bgp/bgp_config_ifmap.cc
+++ b/src/bgp/bgp_config_ifmap.cc
@@ -1567,45 +1567,45 @@ void BgpIfmapRoutingPolicyConfig::RemoveInstance(BgpIfmapInstanceConfig *rti) {
 }
 
 
-static void BuildPolicyTerm(autogen::PolicyTerm cfg_term,
+static void BuildPolicyTerm(autogen::PolicyTermType cfg_term,
                             RoutingPolicyTerm *term) {
-    term->match.protocols_match = cfg_term.fromxx.protocol;
-    term->match.community_match = cfg_term.fromxx.community;
-    BOOST_FOREACH(const autogen::PrefixMatch &prefix_match,
-                  cfg_term.fromxx.prefix) {
+    term->match.protocols_match = cfg_term.term_match_condition.protocol;
+    term->match.community_match = cfg_term.term_match_condition.community;
+    BOOST_FOREACH(const autogen::PrefixMatchType &prefix_match,
+                  cfg_term.term_match_condition.prefix) {
         PrefixMatchConfig match;
         match.prefix_to_match = prefix_match.prefix;
-        match.prefix_match_type =
-            prefix_match.type_.empty() ? "exact" : prefix_match.type_;
+        match.prefix_match_type = prefix_match.prefix_type.empty() ?
+            "exact" : prefix_match.prefix_type;
         term->match.prefixes_to_match.push_back(match);
     }
 
     BOOST_FOREACH(const std::string community,
-                  cfg_term.then.update.community.add.community) {
+                  cfg_term.term_action_list.update.community.add.community) {
         term->action.update.community_add.push_back(community);
     }
     BOOST_FOREACH(const std::string community,
-                  cfg_term.then.update.community.remove.community) {
+                  cfg_term.term_action_list.update.community.remove.community) {
         term->action.update.community_remove.push_back(community);
     }
     BOOST_FOREACH(const std::string community,
-                  cfg_term.then.update.community.set.community) {
+                  cfg_term.term_action_list.update.community.set.community) {
         term->action.update.community_set.push_back(community);
     }
-    term->action.update.local_pref = cfg_term.then.update.local_pref;
-    term->action.update.med = cfg_term.then.update.med;
+    term->action.update.local_pref =
+        cfg_term.term_action_list.update.local_pref;
+    term->action.update.med = cfg_term.term_action_list.update.med;
     term->action.action = RoutingPolicyActionConfig::NEXT_TERM;
-    if (strcmp(cfg_term.then.action.c_str(), "reject") == 0) {
+    if (strcmp(cfg_term.term_action_list.action.c_str(), "reject") == 0)
         term->action.action = RoutingPolicyActionConfig::REJECT;
-    } else if (strcmp(cfg_term.then.action.c_str(), "accept") == 0) {
+    else if (strcmp(cfg_term.term_action_list.action.c_str(), "accept") == 0)
         term->action.action = RoutingPolicyActionConfig::ACCEPT;
-    }
 }
 
 static void BuildPolicyTerms(BgpRoutingPolicyConfig *policy_cfg,
                              const autogen::RoutingPolicy *policy) {
-    std::vector<autogen::PolicyTerm> terms = policy->entries();
-    BOOST_FOREACH(autogen::PolicyTerm cfg_term, terms) {
+    std::vector<autogen::PolicyTermType> terms = policy->entries();
+    BOOST_FOREACH(autogen::PolicyTermType cfg_term, terms) {
         RoutingPolicyTerm policy_term;
         BuildPolicyTerm(cfg_term, &policy_term);
         policy_cfg->add_term(policy_term);
diff --git a/src/bgp/bgp_config_parser.cc b/src/bgp/bgp_config_parser.cc
index 950d2784161..13dea4688ad 100644
--- a/src/bgp/bgp_config_parser.cc
+++ b/src/bgp/bgp_config_parser.cc
@@ -600,8 +600,8 @@ bool BgpConfigParser::ParseRoutingPolicy(const xml_node &node,
     string policy_name(node.attribute("name").value());
     assert(!policy_name.empty());
 
-    auto_ptr<autogen::PolicyStatement> policy_statement(
-        new autogen::PolicyStatement());
+    auto_ptr<autogen::PolicyStatementType> policy_statement(
+        new autogen::PolicyStatementType());
     assert(policy_statement->XmlParse(node));
 
     if (add_change) {
diff --git a/src/bgp/testdata/config_listener_test_10.xml b/src/bgp/testdata/config_listener_test_10.xml
index 304df61bdfd..d9a92d5b988 100644
--- a/src/bgp/testdata/config_listener_test_10.xml
+++ b/src/bgp/testdata/config_listener_test_10.xml
@@ -2,15 +2,15 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>23:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test_0">
diff --git a/src/bgp/testdata/config_listener_test_11.xml b/src/bgp/testdata/config_listener_test_11.xml
index a77c079d6ec..7be696e5fe4 100644
--- a/src/bgp/testdata/config_listener_test_11.xml
+++ b/src/bgp/testdata/config_listener_test_11.xml
@@ -3,12 +3,12 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>23:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/config_listener_test_14.xml b/src/bgp/testdata/config_listener_test_14.xml
index ef40388e24f..85176c9ff35 100644
--- a/src/bgp/testdata/config_listener_test_14.xml
+++ b/src/bgp/testdata/config_listener_test_14.xml
@@ -2,22 +2,22 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>23:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test_0">
diff --git a/src/bgp/testdata/config_listener_test_9.xml b/src/bgp/testdata/config_listener_test_9.xml
index fa10c924190..2b4fe785876 100644
--- a/src/bgp/testdata/config_listener_test_9.xml
+++ b/src/bgp/testdata/config_listener_test_9.xml
@@ -2,33 +2,33 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>23:13</community>
                 <prefix>
                     <prefix> 1/8 </prefix>
-                    <type> orlonger </type>
+                    <prefix-type> orlonger </prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>23:11</community>
                 <prefix>
                     <prefix> 2001:db8:85a3:aaaa::b:c:d/64 </prefix>
-                    <type> longer </type>
+                    <prefix-type> longer </prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
 
diff --git a/src/bgp/testdata/routing_policy_0.xml b/src/bgp/testdata/routing_policy_0.xml
index e2b6911a57d..7b4e90dad68 100644
--- a/src/bgp/testdata/routing_policy_0.xml
+++ b/src/bgp/testdata/routing_policy_0.xml
@@ -2,26 +2,26 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>10.0.1.1/32</prefix>
-                    <type> exact </type>
+                    <prefix-type> exact </prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_0a.xml b/src/bgp/testdata/routing_policy_0a.xml
index 0862ed8427d..93bfd5f4641 100644
--- a/src/bgp/testdata/routing_policy_0a.xml
+++ b/src/bgp/testdata/routing_policy_0a.xml
@@ -2,12 +2,12 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
 </config>
diff --git a/src/bgp/testdata/routing_policy_0b.xml b/src/bgp/testdata/routing_policy_0b.xml
index d8b292fccdb..53f03d817c3 100644
--- a/src/bgp/testdata/routing_policy_0b.xml
+++ b/src/bgp/testdata/routing_policy_0b.xml
@@ -2,20 +2,20 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <community>22:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
 </config>
diff --git a/src/bgp/testdata/routing_policy_0c.xml b/src/bgp/testdata/routing_policy_0c.xml
index a5df285da25..8efeee20908 100644
--- a/src/bgp/testdata/routing_policy_0c.xml
+++ b/src/bgp/testdata/routing_policy_0c.xml
@@ -2,21 +2,21 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>2001:db8:85a3::8a2e:370:7335/128</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                     <local-pref>300</local-pref>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_0d.xml b/src/bgp/testdata/routing_policy_0d.xml
index 867b236e7a9..654bb271f87 100644
--- a/src/bgp/testdata/routing_policy_0d.xml
+++ b/src/bgp/testdata/routing_policy_0d.xml
@@ -2,21 +2,21 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>10.0.1.1/32</prefix>
                 </prefix>
                 <prefix>
                     <prefix>20.1.1.0/24</prefix>
-                    <type>longer</type>
+                    <prefix-type>longer</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_0e.xml b/src/bgp/testdata/routing_policy_0e.xml
index 2314a8e6d03..bc62b41626c 100644
--- a/src/bgp/testdata/routing_policy_0e.xml
+++ b/src/bgp/testdata/routing_policy_0e.xml
@@ -2,16 +2,16 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <protocol>bgp</protocol>
                 <protocol>xmpp</protocol>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_0f.xml b/src/bgp/testdata/routing_policy_0f.xml
index 42b7a265250..2f78fe4861a 100644
--- a/src/bgp/testdata/routing_policy_0f.xml
+++ b/src/bgp/testdata/routing_policy_0f.xml
@@ -8,15 +8,15 @@
     </virtual-network>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <protocol>service-chain</protocol>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="red">
diff --git a/src/bgp/testdata/routing_policy_0g.xml b/src/bgp/testdata/routing_policy_0g.xml
index 774f744deec..828896e9bd1 100644
--- a/src/bgp/testdata/routing_policy_0g.xml
+++ b/src/bgp/testdata/routing_policy_0g.xml
@@ -2,17 +2,17 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <protocol>service-chain</protocol>
                 <protocol>bgp</protocol>
                 <protocol>xmpp</protocol>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>999</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
 </config>
diff --git a/src/bgp/testdata/routing_policy_0h.xml b/src/bgp/testdata/routing_policy_0h.xml
index c9874751aa7..9ac5a41ec30 100644
--- a/src/bgp/testdata/routing_policy_0h.xml
+++ b/src/bgp/testdata/routing_policy_0h.xml
@@ -2,15 +2,15 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <protocol>static</protocol>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="nat">
diff --git a/src/bgp/testdata/routing_policy_1.xml b/src/bgp/testdata/routing_policy_1.xml
index c2cd44a15e2..c292468ccf0 100644
--- a/src/bgp/testdata/routing_policy_1.xml
+++ b/src/bgp/testdata/routing_policy_1.xml
@@ -2,25 +2,25 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>23:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>23:11</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
 
diff --git a/src/bgp/testdata/routing_policy_1a.xml b/src/bgp/testdata/routing_policy_1a.xml
index 0e35bf0f84d..001b58369f0 100644
--- a/src/bgp/testdata/routing_policy_1a.xml
+++ b/src/bgp/testdata/routing_policy_1a.xml
@@ -2,25 +2,25 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>23:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>23:11</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
 
diff --git a/src/bgp/testdata/routing_policy_1b.xml b/src/bgp/testdata/routing_policy_1b.xml
index b4c530d860b..af5758a6398 100644
--- a/src/bgp/testdata/routing_policy_1b.xml
+++ b/src/bgp/testdata/routing_policy_1b.xml
@@ -2,11 +2,11 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <then>
+            <term-action-list>
                 <update>
                     <med>1234</med>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_2.xml b/src/bgp/testdata/routing_policy_2.xml
index 1d448b10bbb..68c556d83ae 100644
--- a/src/bgp/testdata/routing_policy_2.xml
+++ b/src/bgp/testdata/routing_policy_2.xml
@@ -2,45 +2,45 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>3.1.0.0/16</prefix>
-                    <type>longer</type>
+                    <prefix-type>longer</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>3.1.1.1/32</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1/8</prefix>
-                    <type>orlonger</type>
+                    <prefix-type>orlonger</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:44</community></add>
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_2a.xml b/src/bgp/testdata/routing_policy_2a.xml
index 7b219dde263..249629c9a0b 100644
--- a/src/bgp/testdata/routing_policy_2a.xml
+++ b/src/bgp/testdata/routing_policy_2a.xml
@@ -2,40 +2,40 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <then>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix> 3.1.1.1 </prefix>
-                    <type> exact </type>
+                    <prefix-type> exact </prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix> 1/8 </prefix>
-                    <type> orlonger </type>
+                    <prefix-type> orlonger </prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <then>
+            <term-action-list>
                 <update>
                     <local-pref>103</local-pref>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_2b.xml b/src/bgp/testdata/routing_policy_2b.xml
index 15809284746..f9776ffe731 100644
--- a/src/bgp/testdata/routing_policy_2b.xml
+++ b/src/bgp/testdata/routing_policy_2b.xml
@@ -2,20 +2,20 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1/8</prefix>
-                    <type>orlonger</type>
+                    <prefix-type>orlonger</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <remove><community>11:13</community></remove>
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_2c.xml b/src/bgp/testdata/routing_policy_2c.xml
index 611d08a9f59..46ff988da96 100644
--- a/src/bgp/testdata/routing_policy_2c.xml
+++ b/src/bgp/testdata/routing_policy_2c.xml
@@ -2,20 +2,20 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1/8</prefix>
-                    <type>orlonger</type>
+                    <prefix-type>orlonger</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <set><community>11:13</community></set>
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_2d.xml b/src/bgp/testdata/routing_policy_2d.xml
index 5c010b5a2f9..d144f9b6517 100644
--- a/src/bgp/testdata/routing_policy_2d.xml
+++ b/src/bgp/testdata/routing_policy_2d.xml
@@ -2,13 +2,13 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1/8</prefix>
-                    <type>orlonger</type>
+                    <prefix-type>orlonger</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <remove>
@@ -19,7 +19,7 @@
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_2e.xml b/src/bgp/testdata/routing_policy_2e.xml
index 506fbcc4471..cf25bc62ff7 100644
--- a/src/bgp/testdata/routing_policy_2e.xml
+++ b/src/bgp/testdata/routing_policy_2e.xml
@@ -2,13 +2,13 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1/8</prefix>
-                    <type>orlonger</type>
+                    <prefix-type>orlonger</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add>
@@ -19,7 +19,7 @@
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_2f.xml b/src/bgp/testdata/routing_policy_2f.xml
index 0f2c7f31faa..e0f8e06e071 100644
--- a/src/bgp/testdata/routing_policy_2f.xml
+++ b/src/bgp/testdata/routing_policy_2f.xml
@@ -2,13 +2,13 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1/8</prefix>
-                    <type>orlonger</type>
+                    <prefix-type>orlonger</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <set>
@@ -19,7 +19,7 @@
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_2g.xml b/src/bgp/testdata/routing_policy_2g.xml
index a2a9fa753d7..1c220225b96 100644
--- a/src/bgp/testdata/routing_policy_2g.xml
+++ b/src/bgp/testdata/routing_policy_2g.xml
@@ -2,13 +2,13 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1/8</prefix>
-                    <type>orlonger</type>
+                    <prefix-type>orlonger</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add>
@@ -20,7 +20,7 @@
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_3.xml b/src/bgp/testdata/routing_policy_3.xml
index c56de6cc390..13a341ae74d 100644
--- a/src/bgp/testdata/routing_policy_3.xml
+++ b/src/bgp/testdata/routing_policy_3.xml
@@ -2,12 +2,12 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_3a.xml b/src/bgp/testdata/routing_policy_3a.xml
index e76fa39adbe..0038634c5ec 100644
--- a/src/bgp/testdata/routing_policy_3a.xml
+++ b/src/bgp/testdata/routing_policy_3a.xml
@@ -2,22 +2,22 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>22:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_3d.xml b/src/bgp/testdata/routing_policy_3d.xml
index e163b34d921..d8067d93e82 100644
--- a/src/bgp/testdata/routing_policy_3d.xml
+++ b/src/bgp/testdata/routing_policy_3d.xml
@@ -2,22 +2,22 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>22:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_4.xml b/src/bgp/testdata/routing_policy_4.xml
index e76fa39adbe..0038634c5ec 100644
--- a/src/bgp/testdata/routing_policy_4.xml
+++ b/src/bgp/testdata/routing_policy_4.xml
@@ -2,22 +2,22 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>22:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_4a.xml b/src/bgp/testdata/routing_policy_4a.xml
index a855e0ee270..265f6d6d8af 100644
--- a/src/bgp/testdata/routing_policy_4a.xml
+++ b/src/bgp/testdata/routing_policy_4a.xml
@@ -2,22 +2,22 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>22:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_4b.xml b/src/bgp/testdata/routing_policy_4b.xml
index cbebbf04c3a..6f59dadf3e5 100644
--- a/src/bgp/testdata/routing_policy_4b.xml
+++ b/src/bgp/testdata/routing_policy_4b.xml
@@ -2,22 +2,22 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>22:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_4c.xml b/src/bgp/testdata/routing_policy_4c.xml
index fb9064a98cf..34a06f544fe 100644
--- a/src/bgp/testdata/routing_policy_4c.xml
+++ b/src/bgp/testdata/routing_policy_4c.xml
@@ -2,26 +2,26 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>22:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_4d.xml b/src/bgp/testdata/routing_policy_4d.xml
index 0ab99a4eace..5c22c86b227 100644
--- a/src/bgp/testdata/routing_policy_4d.xml
+++ b/src/bgp/testdata/routing_policy_4d.xml
@@ -2,30 +2,30 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>22:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-policy name='basic_1'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>22:44</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_5.xml b/src/bgp/testdata/routing_policy_5.xml
index 3bdd5069d6b..1f936557b1b 100644
--- a/src/bgp/testdata/routing_policy_5.xml
+++ b/src/bgp/testdata/routing_policy_5.xml
@@ -2,13 +2,13 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1/8</prefix>
-                    <type>longer</type>
+                    <prefix-type>longer</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <set>
@@ -19,7 +19,7 @@
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_5a.xml b/src/bgp/testdata/routing_policy_5a.xml
index dd3e1251038..fc47808c962 100644
--- a/src/bgp/testdata/routing_policy_5a.xml
+++ b/src/bgp/testdata/routing_policy_5a.xml
@@ -2,13 +2,13 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1.1.1.1/32</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <set>
@@ -19,7 +19,7 @@
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_5b.xml b/src/bgp/testdata/routing_policy_5b.xml
index 64d3ffbb388..7a8212d44fa 100644
--- a/src/bgp/testdata/routing_policy_5b.xml
+++ b/src/bgp/testdata/routing_policy_5b.xml
@@ -3,13 +3,13 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1.1.0.0/16</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <set>
@@ -20,7 +20,7 @@
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_6.xml b/src/bgp/testdata/routing_policy_6.xml
index 3adcfb4b933..e30986eaad9 100644
--- a/src/bgp/testdata/routing_policy_6.xml
+++ b/src/bgp/testdata/routing_policy_6.xml
@@ -2,46 +2,46 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1.1.1.1/32</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>22:44</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1.1.0.0/16</prefix>
-                    <type>longer</type>
+                    <prefix-type>longer</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>44:88</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_6a.xml b/src/bgp/testdata/routing_policy_6a.xml
index 7934c3d70f2..1bf64893a35 100644
--- a/src/bgp/testdata/routing_policy_6a.xml
+++ b/src/bgp/testdata/routing_policy_6a.xml
@@ -2,43 +2,43 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1.1.1.1/32</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:22</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>22:44</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <community>22:44</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>44:88</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_6b.xml b/src/bgp/testdata/routing_policy_6b.xml
index ae9adeac1ab..5ba2fbf4867 100644
--- a/src/bgp/testdata/routing_policy_6b.xml
+++ b/src/bgp/testdata/routing_policy_6b.xml
@@ -2,27 +2,27 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1.1.1.1/32</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:22</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_6c.xml b/src/bgp/testdata/routing_policy_6c.xml
index b754db48b74..f8dbd5254a2 100644
--- a/src/bgp/testdata/routing_policy_6c.xml
+++ b/src/bgp/testdata/routing_policy_6c.xml
@@ -2,20 +2,20 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1.1.1.1/32</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
                 <prefix>
                     <prefix>4.4.4.4/32</prefix>
                 </prefix>
                 <prefix>
                     <prefix>5.5.5.5/32</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>500</local-pref>
                     <community>
@@ -23,47 +23,47 @@
                     </community>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>400</local-pref>
                     <community>
                         <set><community>22:44</community></set>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1.1.0.0/16</prefix>
-                    <type>longer</type>
+                    <prefix-type>longer</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>300</local-pref>
                     <community>
                         <remove><community>44:88</community></remove>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>2001:db8:85a3::/64</prefix>
-                    <type>orlonger</type>
+                    <prefix-type>orlonger</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_7.xml b/src/bgp/testdata/routing_policy_7.xml
index 9144445d542..05c99b413cf 100644
--- a/src/bgp/testdata/routing_policy_7.xml
+++ b/src/bgp/testdata/routing_policy_7.xml
@@ -2,19 +2,19 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>2001:db8:85a3::8a2e:370:7334/128</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_7a.xml b/src/bgp/testdata/routing_policy_7a.xml
index d0d9c73bd64..6a2f66d139c 100644
--- a/src/bgp/testdata/routing_policy_7a.xml
+++ b/src/bgp/testdata/routing_policy_7a.xml
@@ -2,19 +2,19 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1.1.1.1/32</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_7b.xml b/src/bgp/testdata/routing_policy_7b.xml
index 1741aff6622..a39aa1579d2 100644
--- a/src/bgp/testdata/routing_policy_7b.xml
+++ b/src/bgp/testdata/routing_policy_7b.xml
@@ -2,34 +2,34 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>1.1.1.1/32</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>2001:db8:85a3::8a2e:370:7334/128</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_7c.xml b/src/bgp/testdata/routing_policy_7c.xml
index ee760d3e483..23229d2b5d8 100644
--- a/src/bgp/testdata/routing_policy_7c.xml
+++ b/src/bgp/testdata/routing_policy_7c.xml
@@ -2,20 +2,20 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>2001:db8:85a3::8a2e:370:7334/128</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_7d.xml b/src/bgp/testdata/routing_policy_7d.xml
index fac6bc07f96..28570d2d402 100644
--- a/src/bgp/testdata/routing_policy_7d.xml
+++ b/src/bgp/testdata/routing_policy_7d.xml
@@ -2,21 +2,21 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>2001:db8:85a3::8a2e:370:7334/128</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
                 <community>11:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                     <local-pref>999</local-pref>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_7e.xml b/src/bgp/testdata/routing_policy_7e.xml
index 0cffb87d6be..70c9786f9ff 100644
--- a/src/bgp/testdata/routing_policy_7e.xml
+++ b/src/bgp/testdata/routing_policy_7e.xml
@@ -2,19 +2,19 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>2001:db8:85a3::/64</prefix>
-                    <type>longer</type>
+                    <prefix-type>longer</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <remove><community>33:66</community></remove>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_7f.xml b/src/bgp/testdata/routing_policy_7f.xml
index 30ab7cb60f7..7883dbb15db 100644
--- a/src/bgp/testdata/routing_policy_7f.xml
+++ b/src/bgp/testdata/routing_policy_7f.xml
@@ -2,15 +2,15 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>2001:db8:85a3::8a2e:370:7334/128</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <action>reject</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
 </config>
diff --git a/src/bgp/testdata/routing_policy_7g.xml b/src/bgp/testdata/routing_policy_7g.xml
index 00e36d35133..f432f448f4f 100644
--- a/src/bgp/testdata/routing_policy_7g.xml
+++ b/src/bgp/testdata/routing_policy_7g.xml
@@ -2,19 +2,19 @@
 <config>
     <routing-policy name='basic_0'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>2001:db8:85a3::8a2e:370:7334/128</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>44:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/bgp/testdata/routing_policy_7h.xml b/src/bgp/testdata/routing_policy_7h.xml
index 040fdda9ba8..933ca668e43 100644
--- a/src/bgp/testdata/routing_policy_7h.xml
+++ b/src/bgp/testdata/routing_policy_7h.xml
@@ -2,15 +2,15 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <community>23:13</community>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <local-pref>102</local-pref>
                 </update>
                 <action>accept</action>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test_0">
diff --git a/src/bgp/testdata/routing_policy_8.xml b/src/bgp/testdata/routing_policy_8.xml
index c207104909f..39336d5535c 100644
--- a/src/bgp/testdata/routing_policy_8.xml
+++ b/src/bgp/testdata/routing_policy_8.xml
@@ -2,19 +2,19 @@
 <config>
     <routing-policy name='basic'>
         <term>
-            <from>
+            <term-match-condition>
                 <prefix>
                     <prefix>2001:db8:85a3::8a2e:370:7334/128</prefix>
-                    <type>exact</type>
+                    <prefix-type>exact</prefix-type>
                 </prefix>
-            </from>
-            <then>
+            </term-match-condition>
+            <term-action-list>
                 <update>
                     <community>
                         <add><community>11:22</community></add>
                     </community>
                 </update>
-            </then>
+            </term-action-list>
         </term>
     </routing-policy>
     <routing-instance name="test">
diff --git a/src/schema/routing_policy.xsd b/src/schema/routing_policy.xsd
index 1cc0570c538..92003bd7d36 100644
--- a/src/schema/routing_policy.xsd
+++ b/src/schema/routing_policy.xsd
@@ -6,12 +6,12 @@
     xmlns:smi="urn:ietf:params:xml:ns:opsawg:smi:base:1.0">
 
 <xsd:element name='routing-policy' type='ifmap::IdentityType'/>
-<xsd:element name='routing-policy-entries' type='PolicyStatement'/>
+<xsd:element name='routing-policy-entries' type='PolicyStatementType'/>
 <!--#IFMAP-SEMANTICS-IDL 
      Property('routing-policy-entries', 'routing-policy') -->
 
-<xsd:complexType name='PolicyStatement'> 
-    <xsd:element name='term' type='PolicyTerm' maxOccurs='unbounded'/>
+<xsd:complexType name='PolicyStatementType'>
+    <xsd:element name='term' type='PolicyTermType' maxOccurs='unbounded'/>
 </xsd:complexType>
 
 <xsd:simpleType name='ActionType'>
@@ -26,24 +26,24 @@
     <xsd:element name='community' type='xsd:string' maxOccurs='unbounded'/>
 </xsd:complexType>
 
-<xsd:complexType name="ActionCommunity">
+<xsd:complexType name="ActionCommunityType">
     <xsd:element name='add'    type='CommunityListType'/>
     <xsd:element name='remove' type='CommunityListType'/>
     <xsd:element name='set'    type='CommunityListType'/>
 </xsd:complexType>
 
-<xsd:complexType name="ActionUpdate">
-    <xsd:element name="community"   type="ActionCommunity"/>
+<xsd:complexType name="ActionUpdateType">
+    <xsd:element name="community"   type="ActionCommunityType"/>
     <xsd:element name="local-pref"  type="xsd:integer"/>
     <xsd:element name="med"         type="xsd:integer"/>
 </xsd:complexType>
 
-<xsd:complexType name='PolicyAction'>
-    <xsd:element name='update'  type='ActionUpdate'/>
+<xsd:complexType name='TermActionListType'>
+    <xsd:element name='update'  type='ActionUpdateType'/>
     <xsd:element name='action'  type='ActionType'/>
 </xsd:complexType>
 
-<xsd:simpleType name='PrefixMatchType'>
+<xsd:simpleType name='PrefixType'>
     <xsd:restriction base="xsd:string" default="exact">
         <xsd:enumeration value="exact"/>
         <xsd:enumeration value="longer"/>
@@ -61,19 +61,19 @@
     </xsd:restriction>
 </xsd:simpleType>
 
-<xsd:complexType name="PrefixMatch">
-    <xsd:element name="prefix"   type="xsd:string"/>
-    <xsd:element name="type"     type="PrefixMatchType"/>
+<xsd:complexType name="PrefixMatchType">
+    <xsd:element name="prefix"      type="xsd:string"/>
+    <xsd:element name="prefix-type" type="PrefixType"/>
 </xsd:complexType>
 
-<xsd:complexType name="PolicyMatch">
-    <xsd:element name="protocol"    type="PathSourceType" maxOccurs="unbounded"/>
-    <xsd:element name="community"   type="xsd:string"/>
-    <xsd:element name="prefix"      type="PrefixMatch" maxOccurs="unbounded"/>
+<xsd:complexType name="TermMatchConditionType">
+    <xsd:element name="protocol"  type="PathSourceType" maxOccurs="unbounded"/>
+    <xsd:element name="community" type="xsd:string"/>
+    <xsd:element name="prefix"    type="PrefixMatchType" maxOccurs="unbounded"/>
 </xsd:complexType>
 
-<xsd:complexType name='PolicyTerm'>
-    <xsd:element name='from' type='PolicyMatch'/>
-    <xsd:element name='then' type='PolicyAction'/>
+<xsd:complexType name='PolicyTermType'>
+    <xsd:element name='term-match-condition' type='TermMatchConditionType'/>
+    <xsd:element name='term-action-list'     type='TermActionListType'/>
 </xsd:complexType>
 </xsd:schema>