Merge branch 'master' into bitpanda

VWD_ServiceProvider_Template/res.txt

@@ -1,136 +1,143 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !switch-vwd-1,switch-vwd-2
  conf t
- vlan 809
- name oracle
+ vlan 810
+ name bitpanda
  end
  wr mem
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  !switch-vwd-sp1, switch-vwd-sp2
  conf t
- vrf definition oracle
- rd 65000:1009
+ vrf definition bitpanda
+ rd 65000:1010
  address-family ipv4
  exit-address-family
  
- vlan 809
- name oracle
+ vlan 810
+ name bitpanda
  
- ip access-list standard routes2oracle
- permit # routes acl
+ vlan 101
+ name bitpanda-aws
+ 
+ ip access-list standard routes2bitpanda
+ permit 10.200.0.32 0.0.0.15
+ permit 10.201.0.0 0.0.0.15
+ permit 192.168.112.0 0.0.0.255
+ permit 192.168.220.0 0.0.0.255
  
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !switch-vwd-sp1
  conf t
  
- interface vlan809
- description oracle
- vrf forwarding oracle
- ip address 10.120.2.2 255.255.255.0
+ interface vlan810
+ description bitpanda
+ vrf forwarding bitpanda
+ ip address 10.120.1.98 255.255.255.248
  
- int Gi1/0/9
- description Cust: VWD-Transit (oracle)
- # vrf definition oracle
- # ip address 192.168.239.25 255.255.255.254
- # switchport mode trunk|access
- # switchport access vlan ...
+ int Gi1/0/10
+ description Cust: VWD-Transit (bitpanda)
+ # vrf forwarding bitpanda
+ # ip address 192.168.239.26 255.255.255.254
+ switchport mode trunk
+ switchport trunk allowed vlan 102
  # switchport trunk allowed vlan ...
  # channel-group X mode on|active
+ speed nonegotiate
  
- int Vlan1900
- description Cust: VWD-Transit (oracle)
- vrf definition oracle
- ip address 192.168.239.25 255.255.255.254
+ int Vlan102
+ description Cust: VWD-Transit (bitpanda)
+ vrf forwarding bitpanda
+ ip address 192.168.239.26 255.255.255.254
  
  router bgp 65148
- address-family ipv4 vrf oracle
+ address-family ipv4 vrf bitpanda
  bgp router-id auto-assign
  redistribute static
- neighbor 10.120.2.1 remote-as 65148
+ neighbor 10.120.1.97 remote-as 65148
  
- neighbor 10.120.2.3 remote-as 65159
- neighbor 10.120.2.3 local-as 65159
+ neighbor 10.120.1.99 remote-as 65160
+ neighbor 10.120.1.99 local-as 65160
  
- neighbor 192.168.239.25 remote-as 31898
- neighbor 192.168.239.25 local-as 65159
+ neighbor 192.168.239.27 remote-as 65202
+ neighbor 192.168.239.27 local-as 65160
  
- distribute-list routes2oracle
+ distribute-list routes2bitpanda
  exit-address-family
  
- ip route vrf oracle # static routes 1
+! ip route vrf bitpanda # static routes 1
  
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  !switch-vwd-sp2
  conf t
  
- interface vlan809
- description oracle
- vrf forwarding oracle
- ip address 10.120.2.3 255.255.255.0
+ interface vlan810
+ description bitpanda
+ vrf forwarding bitpanda
+ ip address 10.120.1.99 255.255.255.248
  
- int Gi1/0/9
- description Cust: VWD-Transit (oracle)
- # vrf definition oracle
- # ip address xxx zzz
- # switchport mode trunk|access
- # switchport access vlan ...
+ int Gi1/0/10
+ description Cust: VWD-Transit (bitpanda)
+ # vrf forwarding bitpanda
+ # ip address 192.168.239.154 255.255.255.254
+ switchport mode trunk
+ switchport trunk allowed vlan 101
  # switchport trunk allowed vlan ...
  # channel-group X mode on|active
+ speed nonegotiate
  
- int Vlan1900
- description Cust: VWD-Transit (oracle)
- vrf definition oracle
- ip address xxx zzz
+ 
+ int Vlan101
+ description Cust: VWD-Transit (bitpanda)
+ vrf forwarding bitpanda
+ ip address 192.168.239.154 255.255.255.254
  
  router bgp 65148
- address-family ipv4 vrf oracle
+ address-family ipv4 vrf bitpanda
  bgp router-id auto-assign
  redistribute static
- neighbor 10.120.2.1 remote-as 65148
+ neighbor 10.120.1.97 remote-as 65148
  
- neighbor 10.120.2.2 remote-as 65159
- neighbor 10.120.2.2 local-as 65159
+ neighbor 10.120.1.98 remote-as 65160
+ neighbor 10.120.1.98 local-as 65160
  
- neighbor yyy remote-as 31898
- neighbor yyy local-as 65159
+ neighbor 192.168.239.155 remote-as 65201
+ neighbor 192.168.239.155 local-as 65160
  
- distribute-list routes2oracle
+ distribute-list routes2bitpanda
  exit-address-family
  
- ip route vrf oracle # static routes 2
+ ip route vrf bitpanda # static routes 2
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  !asa-vwd-1
  conf t
- interface Port-channel2.809
- vlan 809
- nameif oracle
+ interface Port-channel2.810
+ vlan 810
+ nameif bitpanda
  security-level 100
- ip address 10.120.2.1 255.255.255.0 
+ ip address 10.120.1.97 255.255.255.248 
  
- access-list oracle_access_in extended permit icmp any any 
- access-list oracle_access_in extended deny ip any any 
+ access-list bitpanda_access_in extended permit icmp any any 
+ access-list bitpanda_access_in extended deny ip any any 
 
- no monitor-interface oracle
+ no monitor-interface bitpanda
 
- access-group oracle_access_in in interface oracle
+ access-group bitpanda_access_in in interface bitpanda
 
- access-list oracle_access_in extended permit icmp any any 
- access-list oracle_access_in extended deny ip any any 
 
  router bgp 65148
  bgp log-neighbor-changes
  address-family ipv4 unicast
-  neighbor 10.120.2.2 remote-as 65148
-  neighbor 10.120.2.2 description oracle primary weight 200
-  neighbor 10.120.2.2 activate
-  neighbor 10.120.2.2 next-hop-self
-  neighbor 10.120.2.2 weight 200
-  neighbor 10.120.2.3 remote-as 65148
-  neighbor 10.120.2.3 description oracle secondary weight 100
-  neighbor 10.120.2.3 activate
-  neighbor 10.120.2.3 next-hop-self
-  neighbor 10.120.2.3 weight 100
+  neighbor 10.120.1.98 remote-as 65148
+  neighbor 10.120.1.98 description bitpanda primary weight 200
+  neighbor 10.120.1.98 activate
+  neighbor 10.120.1.98 next-hop-self
+  neighbor 10.120.1.98 weight 200
+  neighbor 10.120.1.99 remote-as 65148
+  neighbor 10.120.1.99 description bitpanda secondary weight 100
+  neighbor 10.120.1.99 activate
+  neighbor 10.120.1.99 next-hop-self
+  neighbor 10.120.1.99 weight 100
   
   

VWD_ServiceProvider_Template/temp.txt

@@ -17,6 +17,9 @@
  vlan __VRFXFERVLAN__
  name __VRFNAME__
 
+ vlan __CUSTINT__
+ name __VRFNAME____CUSTINT__
+ 
  ip access-list standard routes2__VRFNAME__
  permit # routes acl
  

VWD_ServiceProvider_Template/var.txt

@@ -1,21 +1,23 @@
-! __VRFXFERVLAN__ 8xx
-! __VRFNAME__ template
-! __VRFID__ 1009
+! __VRFXFERVLAN__ 810
+! __VRFNAME__ bitpanda
+! __VRFID__ 1010
 ! __VRFXFERIPASA__ 10.120.1.97
 ! __VRFXFERIPSW1__ 10.120.1.98
-! __VRFXFERIPSW2__ 10.120.1.9
+! __VRFXFERIPSW2__ 10.120.1.99
 ! __VRFXFERIPMASK__ 255.255.255.248
 ! __VRFXFERAS__ 65160
-! __VRFCUSTIP1__ 192.168.239.25
-! __VRFCUSTAS__ 31898
+! __VRFCUSTAS__ 6520x                          ??
+
 ! __CUSTINTP__ Gi1/0/10
-! __CUSTINT__ Vlan1900
-! __VRFCUSTIP1__ 192.168.239.24
-! __VRFCUSTIP1R__ 192.168.239.25
+! __CUSTINT__ Vlan10x                         ??
+
+! __VRFCUSTIP1__ 192.168.239.26
+! __VRFCUSTIP1R__ 192.168.239.27
 ! __VRFCUSTIP1M__ 255.255.255.254
-! __VRFCUSTIP2__ xxx
-! __VRFCUSTIP2R__ yyy
-! __VRFCUSTIP2M__ zzz
+
+! __VRFCUSTIP2__ 192.168.239.154
+! __VRFCUSTIP2R__ 192.168.239.155
+! __VRFCUSTIP2M__ 255.255.255.254
 
 # static routes 1
 # 172.20.20.0 255.255.255.0 10.120.2.1