Merge "Update underlay DG for integration issues"

Former-commit-id: aa55a34ef42aee8472221a948a295d97779dc89c

3 files changed, 147 insertions, 103 deletions

diff --git a/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json b/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json
index 016879c3..585c3114 100644
--- a/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json
+++ b/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json
@@ -23,18 +23,24 @@
   "site":[
   {
   "site-id": ${prop.l3vpn.site1_name},
+  "site-name":"Site-forhuawei1",
+  "vrf-control-option": {
+    "custom-vrf": "true",
+    "vrf-definition-policy": "site-and-vpn-policy"
+  },
   "vpn-policies": {
     "vpn-policy": [
       {
         "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id},
+        "vpn-policy-name": "policy-forhuawei1",
         "entries": [
-          {
-            "id": ${prop.l3vpn.entry1-id},
-            "vpn": {
-              "vpn-id": ${prop.l3vpn.name},
-              "site-role": "huawei-ac-net-l3vpn-svc:any-to-any-role"
-            }
+        {
+          "id": ${prop.l3vpn.entry1-id},
+          "vpn": {
+          "vpn-id": ${prop.l3vpn.name},
+          "site-role": "huawei-ac-net-l3vpn-svc:any-to-any-role"
           }
+        }
         ]
       }
     ]
@@ -47,136 +53,93 @@
           "appointed-access": {
             "ne-id": ${prop.l3vpn.pe1_id},
             "ltp-id": ${prop.l3vpn.ac1_id},
+            "admin-status":"admin-up",
             "vlan": {
-              "type": "huawei-ac-net-l3vpn-svc:vlan-dot1q",
-              "vlan-id": ${prop.l3vpn.sna1_svlan}
+              "huawei-ac-net-l3vpn-svc:type": "vlan-dot1q",
+              "vlan-id": ${prop.l3vpn.ac1_svlan},
+              "sub-if-number":"dyn-allocate"
             }
           }
         },
         "ip-connection": {
           "ipv4": {
-            "address-allocation-type": "huawei-ac-net-l3vpn-svc:static-address",
             "addresses": {
-              "provider-address": ${prop.l3vpn.ac1-peer-ip},
-              "customer-address": ${prop.l3vpn.ac1-ip},
-              "mask": "24"
+              "provider-address": ${prop.l3vpn.ac1_ip},
+              "customer-address": ${prop.l3vpn.ac1_peer_ip},
+              "mask": "30"
             }
           }
         },
-        "service": {
-          "mtu": "1500"
-        },
         "routing-protocols": {
           "routing-protocol": [
             {
               "type": ${prop.l3vpn.ac1_protocol},
               "static": {
-                "cascaded-lan-prefixes": [
+                "cascaded-lan-prefixes": 
                   {
                     "ipv4-lan-prefixes": [
                       {
                         "ip-prefix": ${prop.l3vpn.sna1-route.ip-prefix},
-                        "next-hop": ${prop.l3vpn.sna1-route.next-hop}
+                        "next-hop": ${prop.l3vpn.sna1-route.next-hop},
+                        "preference":"100"
                       }
                     ]
                   }
-                ]
-              }
-              "bgp": {
-                "peers": [
-                  {
-                    "peer-ip": ${prop.l3vpn.peer1-ip},
-                    "remote-as": ${prop.l3vpn.ac1_protocol_bgp_as}
-                  }
-                ]
               }
             }
-            }
           ]
         },
         "vpn-attachment": {
-          "vpn-policy-id": ${prop.l3vpn.name}
-        }
-      }
-    ]
-  },
-  {
-    "site-id": ${prop.l3vpn.site2_name},
-    "vpn-policies": {
-    "vpn-policy": [
-      {
-        "vpn-policy-id": ${prop.l3vpn.vpn-policy2-id},
-        "entries": [
-        {
-          "id": ${prop.l3vpn.entry2-id},
-          "vpn": {
-          "vpn-id": ${prop.l3vpn.name},
-          "site-role": "huawei-ac-net-l3vpn-svc:any-to-any-role"
-          }
+          "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id}
         }
-        ]
-      }
-      ]
-    },
-    "site-network-accesses": {
-    "site-network-access": [
+      },
       {
-        "site-network-access-id": ${prop.l3vpn.sna2_name},
-      "bearer": {
-        "appointed-access": {
-          "ne-id": ${prop.l3vpn.pe2_id},
+  "site-network-access-id": ${prop.l3vpn.sna2_name},
+  "bearer": {
+    "appointed-access": {
+      "ne-id": ${prop.l3vpn.pe2_id},
       "ltp-id": ${prop.l3vpn.ac2_id},
+      "admin-status": "admin-up",
       "vlan": {
-        "type": "huawei-ac-net-l3vpn-svc:vlan-dot1q",
-        "vlan-id": ${prop.l3vpn.sna2_svlan}
-    }
+        "huawei-ac-net-l3vpn-svc:type": "vlan-dot1q",
+        "vlan-id": ${prop.l3vpn.ac2_svlan},
+        "sub-if-number": "dyn-allocate"
+      }
     }
-    },
-      "ip-connection": {
-        "ipv4": {
-          "address-allocation-type": "huawei-ac-net-l3vpn-svc:static-address",
-          "addresses": {
-            "provider-address": ${prop.l3vpn.ac2-peer-ip},
-      "customer-address": ${prop.l3vpn.ac2-ip},
-      "mask": "24"
+  },
+  "ip-connection": {
+    "ipv4": {
+      "addresses": {
+        "provider-address": ${prop.l3vpn.ac2_ip},
+        "customer-address": ${prop.l3vpn.ac2_peer_ip},
+        "mask": "30"
       }
     }
-    },
-      "service": {
-        "mtu": "1500"
-      },
-      "routing-protocols": {
-        "routing-protocol": [
-          {
-            "type": ${prop.l3vpn.ac2_protocol},
-            "static": {
-              "cascaded-lan-prefixes": [
-                {
-                  "ipv4-lan-prefixes": [
-                    {
-                      "ip-prefix": ${prop.l3vpn.sna2-route.ip-prefix},
-                      "next-hop": ${prop.l3vpn.sna2-route.next-hop}
-                  }
-                  ]
-                }
-              ]
-            }
-            "bgp": {
-              "peers": [
-                {
-                  "peer-ip": ${prop.l3vpn.peer2-ip},
-                  "remote-as": ${prop.l3vpn.ac2_protocol_bgp_as}
-                }
-              ]
-            }
+  },
+  "routing-protocols": {
+    "routing-protocol": [
+      {
+        "huawei-ac-net-l3vpn-svc:type": ${prop.l3vpn.ac2_protocol},
+        "static": {
+          "cascaded-lan-prefixes": {
+            "ipv4-lan-prefixes": [
+              {
+                "ip-prefix": ${prop.l3vpn.sna2-route.ip-prefix},
+                "next-hop": ${prop.l3vpn.sna2-route.next-hop},
+                "preference": "100"
+              }
+            ]
           }
-        ]
-      },
-      "vpn-attachment": {
-        "vpn-policy-id": ${prop.l3vpn.name}
-    }
-    }
+        }
+      }
     ]
+  },
+  "vpn-attachment": {
+    "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id}
+  }
+}
+]
+}
   }
  ]
 }
diff --git a/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json b/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json
index 67f127ce..fa940a48 100644
--- a/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json
+++ b/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json
@@ -25,7 +25,8 @@
       "vpn-id": ${prop.l3vpn.name},
       "customer-name": "huawei",
       "vpn-service-topology": ${prop.l3vpn.topology},
-      "route-exchange-policy": "huawei-ac-net-l3vpn-svc:vpnv4-way"
+      "route-exchange-policy": "vpnv4-way",
+      "address-family":"ipv4", 
     }
   ]
 }
diff --git a/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json b/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json
index 732af278..1957135f 100644
--- a/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json
+++ b/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json
@@ -20,16 +20,96 @@
  */
 
 {
+  "huawei-ac-net-l3vpn-svc-vfi:vrf-attributes": {
     "vrf-attribute": [
         {
             "vrf-attribute-id": ${prop.l3vpn.vrf1-id},
             "ne-id": ${prop.l3vpn.pe1_id},
-            "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id}
+            "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id},
+            "site-id": ${prop.l3vpn.site1_name},
+          "address-families": {
+    "address-family": [
+      {
+        "af-type": "ipv4",
+        "tunnel-service": {
+          "type": "huawei-ac-net-l3vpn-svc-vfi:auto-select",
+          "auto-select": {
+            "select-tunnels": {
+              "select-tunnel": {
+                "type": "ldp",
+                "priority": 3
+              }
+            }
+          }
+        },
+        "access-protocols": {
+          "protocol": {
+            "type": "huawei-ac-net-l3vpn-svc:bgp",
+            "bgp": {
+              "import-routes": {
+                "import-route": [{
+                  "type": "huawei-ac-net-l3vpn-svc:static",
+                  "policy-type": "none"
+                },
+                {
+                  "type": "huawei-ac-net-l3vpn-svc:direct",
+                  "policy-type": "none"
+                }
+                ]
+              }
+            }
+          }
+        },
+        "popgo": true
+      }
+    ]
+  }
         },
         {
             "vrf-attribute-id": ${prop.l3vpn.vrf2-id},
             "ne-id": ${prop.l3vpn.pe2_id},
-            "vpn-policy-id": ${prop.l3vpn.vpn-policy2-id}
+            "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id},
+            "site-id": ${prop.l3vpn.site1_name},
+              "address-families": {
+    "address-family": [
+      {
+        "af-type": "ipv4",
+        "tunnel-service": {
+          "type": "huawei-ac-net-l3vpn-svc-vfi:auto-select",
+          "auto-select": {
+            "select-tunnels": {
+              "select-tunnel": [
+                {
+                  "type": "ldp",
+                  "priority": 3
+                }
+              ]
+            }
+          }
+        },
+        "access-protocols": {
+          "protocol": {
+            "type": "huawei-ac-net-l3vpn-svc:bgp",
+            "bgp": {
+              "import-routes": {
+                "import-route": [{
+                  "type": "huawei-ac-net-l3vpn-svc:static",
+                  "policy-type": "none"
+                },
+                {
+                  "type": "huawei-ac-net-l3vpn-svc:direct",
+                  "policy-type": "none"
+                }
+                ]
+              }
+            }
+          }
+        },
+        "popgo": true
+      }
+    ]
+  }
         }
     ]
+  }
 }