Modify data-store URLs for NetVirt data collection

1) Added config/ebgp:bgp
2) operational/l3vpn:vpn-interfaces is not used anymore from Oxygen. It
has been replaced by operational/odl-l3vpn:vpn-interface-op-data. Keep
both models and just let it be empty for the different branches.

Change-Id: Ie82adead893060f1dc70ae39b4fd28556148e9d0
Signed-off-by: Kiran N Upadhyaya <kiran.n.upadhyaya@ericsson.com>
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/csit/variables/netvirt/Modules.py b/csit/variables/netvirt/Modules.py
index 9cc9eed5a08af7311ff04eede2d970dc779b473e..0bafe4ef8b30e87196125ee0f0e5daf65ad28ca6 100644 (file)
--- a/csit/variables/netvirt/Modules.py
+++ b/csit/variables/netvirt/Modules.py
@@ -1,4 +1,5 @@
 netvirt_data_models = [
+    'config/ebgp:bgp',
     'config/elan:elan-instances',
     'config/elan:elan-interfaces',
     'config/id-manager:id-pools',
@@ -40,7 +41,7 @@ netvirt_data_models = [
     'operational/interface-service-bindings:bound-services-state-list',
     'operational/itm-state:tunnels_state',
     'operational/l3nexthop:l3nexthop',
-    'operational/l3vpn:vpn-interfaces',
+    'operational/l3vpn:vpn-interfaces'
     'operational/network-topology:network-topology/topology/ovsdb:1',
     'operational/neutron:neutron/neutron:ports',
     'operational/odl-fib:label-route-map',
@@ -50,6 +51,7 @@ netvirt_data_models = [
     'operational/odl-l3vpn:prefix-to-interface',
     'operational/odl-l3vpn:subnet-op-data',
     'operational/odl-l3vpn:vpn-instance-op-data',
+    'operational/odl-l3vpn:vpn-interface-op-data',
     'operational/odl-l3vpn:vpn-to-extraroute',
     'operational/odl-nat:external-ips-counter',
     'operational/odl-nat:floating-ip-info',