From 4f4eaa1d52f3bdbe3caecdc1d6a024c369a2834a Mon Sep 17 00:00:00 2001
From: selias <samelias@cisco.com>
Date: Tue, 7 Mar 2017 15:42:02 +0100
Subject: CSIT-536 HC Test: support testing with ODL client

Reuses existing restconf test cases to test Honeycomb's netconf interface.
When seding the requests to ODL's Honeycomb mountpoint, ODL translates these
requests to netconf RPCs.

Add new tag "honeycomb_odl" that excludes incompatible test cases.

Change-Id: Ie293449da0129b02db85e30aa4f3266928d7d9f6
Signed-off-by: selias <samelias@cisco.com>
---
 .../templates/honeycomb/add_vpp_to_topology.xml    |  9 ------
 .../templates/honeycomb/config_bridge_domain.url   |  2 +-
 .../templates/honeycomb/config_classify_table.url  |  2 +-
 resources/templates/honeycomb/config_lisp.url      |  2 +-
 resources/templates/honeycomb/config_nat.url       |  2 +-
 .../honeycomb/config_network_topology.url          |  2 +-
 resources/templates/honeycomb/config_nsh.url       |  2 +-
 .../templates/honeycomb/config_plugin_acl.url      |  2 +-
 resources/templates/honeycomb/config_topology.url  |  1 -
 .../templates/honeycomb/config_topology_node.url   |  1 -
 .../templates/honeycomb/config_vpp_interfaces.url  |  2 +-
 .../honeycomb/odl_client/mount_honeycomb.xml       | 33 ++++++++++++++++++++++
 .../honeycomb/odl_client/odl_netconf_connector.url |  1 +
 .../templates/honeycomb/oper_bridge_domains.url    |  2 +-
 .../templates/honeycomb/oper_classify_table.url    |  2 +-
 .../honeycomb/oper_disabled_interfaces.url         |  2 +-
 resources/templates/honeycomb/oper_lisp.url        |  2 +-
 resources/templates/honeycomb/oper_nat.url         |  2 +-
 .../templates/honeycomb/oper_network_topology.url  |  2 +-
 resources/templates/honeycomb/oper_nsh.url         |  2 +-
 .../templates/honeycomb/oper_vpp_interfaces.url    |  2 +-
 resources/templates/honeycomb/oper_vpp_version.url |  2 +-
 resources/templates/honeycomb/poll_oper_data.url   |  1 -
 23 files changed, 51 insertions(+), 29 deletions(-)
 delete mode 100644 resources/templates/honeycomb/add_vpp_to_topology.xml
 delete mode 100644 resources/templates/honeycomb/config_topology.url
 delete mode 100644 resources/templates/honeycomb/config_topology_node.url
 create mode 100644 resources/templates/honeycomb/odl_client/mount_honeycomb.xml
 create mode 100644 resources/templates/honeycomb/odl_client/odl_netconf_connector.url
 delete mode 100644 resources/templates/honeycomb/poll_oper_data.url

(limited to 'resources/templates')

diff --git a/resources/templates/honeycomb/add_vpp_to_topology.xml b/resources/templates/honeycomb/add_vpp_to_topology.xml
deleted file mode 100644
index 46a84f28e8..0000000000
--- a/resources/templates/honeycomb/add_vpp_to_topology.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<node xmlns="urn:TBD:params:xml:ns:yang:network-topology">
-    <node-id>{vpp_host}</node-id>
-    <host xmlns="urn:opendaylight:netconf-node-topology">{vpp_ip}</host>
-    <port xmlns="urn:opendaylight:netconf-node-topology">{vpp_port}</port>
-    <username xmlns="urn:opendaylight:netconf-node-topology">{user}</username>
-    <password xmlns="urn:opendaylight:netconf-node-topology">{passwd}</password>
-    <tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
-    <keepalive-delay xmlns="urn:opendaylight:netconf-node-topology">0</keepalive-delay>
-</node>
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_bridge_domain.url b/resources/templates/honeycomb/config_bridge_domain.url
index 03d8f241cd..8e37a503b0 100644
--- a/resources/templates/honeycomb/config_bridge_domain.url
+++ b/resources/templates/honeycomb/config_bridge_domain.url
@@ -1 +1 @@
-/restconf/config/v3po:vpp/bridge-domains
\ No newline at end of file
+/restconf/config{odl_url_part}/v3po:vpp/bridge-domains
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_classify_table.url b/resources/templates/honeycomb/config_classify_table.url
index 986b1173ac..042055f335 100644
--- a/resources/templates/honeycomb/config_classify_table.url
+++ b/resources/templates/honeycomb/config_classify_table.url
@@ -1 +1 @@
-/restconf/config/vpp-classifier:vpp-classifier
\ No newline at end of file
+/restconf/config{odl_url_part}/vpp-classifier:vpp-classifier
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_lisp.url b/resources/templates/honeycomb/config_lisp.url
index 69e3d512e6..16652af8c6 100644
--- a/resources/templates/honeycomb/config_lisp.url
+++ b/resources/templates/honeycomb/config_lisp.url
@@ -1 +1 @@
-/restconf/config/lisp:lisp
\ No newline at end of file
+/restconf/config{odl_url_part}/lisp:lisp
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_nat.url b/resources/templates/honeycomb/config_nat.url
index e323aedea9..5471493c2d 100644
--- a/resources/templates/honeycomb/config_nat.url
+++ b/resources/templates/honeycomb/config_nat.url
@@ -1 +1 @@
-/restconf/config/ietf-nat:nat-config
\ No newline at end of file
+/restconf/config{odl_url_part}/ietf-nat:nat-config
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_network_topology.url b/resources/templates/honeycomb/config_network_topology.url
index fe1b9310c2..4232361f54 100644
--- a/resources/templates/honeycomb/config_network_topology.url
+++ b/resources/templates/honeycomb/config_network_topology.url
@@ -1 +1 @@
-/restconf/config/network-topology:network-topology
\ No newline at end of file
+/restconf/config{odl_url_part}/network-topology:network-topology
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_nsh.url b/resources/templates/honeycomb/config_nsh.url
index ad14e953e8..647c46120b 100644
--- a/resources/templates/honeycomb/config_nsh.url
+++ b/resources/templates/honeycomb/config_nsh.url
@@ -1 +1 @@
-/restconf/config/vpp-nsh:vpp-nsh
\ No newline at end of file
+/restconf/config{odl_url_part}/vpp-nsh:vpp-nsh
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_plugin_acl.url b/resources/templates/honeycomb/config_plugin_acl.url
index 79a9670f44..19a49f2b04 100644
--- a/resources/templates/honeycomb/config_plugin_acl.url
+++ b/resources/templates/honeycomb/config_plugin_acl.url
@@ -1 +1 @@
-/restconf/config/ietf-access-control-list:access-lists
\ No newline at end of file
+/restconf/config{odl_url_part}/ietf-access-control-list:access-lists
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_topology.url b/resources/templates/honeycomb/config_topology.url
deleted file mode 100644
index e76f47ce8c..0000000000
--- a/resources/templates/honeycomb/config_topology.url
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/config/network-topology:network-topology/topology/topology-netconf
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_topology_node.url b/resources/templates/honeycomb/config_topology_node.url
deleted file mode 100644
index 89b7aa851e..0000000000
--- a/resources/templates/honeycomb/config_topology_node.url
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/config/network-topology:network-topology/topology/topology-netconf/node
\ No newline at end of file
diff --git a/resources/templates/honeycomb/config_vpp_interfaces.url b/resources/templates/honeycomb/config_vpp_interfaces.url
index 3789f5e535..03ddc4f88b 100644
--- a/resources/templates/honeycomb/config_vpp_interfaces.url
+++ b/resources/templates/honeycomb/config_vpp_interfaces.url
@@ -1 +1 @@
-/restconf/config/ietf-interfaces:interfaces
\ No newline at end of file
+/restconf/config{odl_url_part}/ietf-interfaces:interfaces
\ No newline at end of file
diff --git a/resources/templates/honeycomb/odl_client/mount_honeycomb.xml b/resources/templates/honeycomb/odl_client/mount_honeycomb.xml
new file mode 100644
index 0000000000..97f43e1119
--- /dev/null
+++ b/resources/templates/honeycomb/odl_client/mount_honeycomb.xml
@@ -0,0 +1,33 @@
+<module xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+  <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">prefix:sal-netconf-connector</type>
+  <name>vpp</name>
+  <address xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">127.0.0.1</address>
+  <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">2831</port>
+  <username xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">admin</username>
+  <password xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">admin</password>
+  <tcp-only xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">false</tcp-only>
+  <event-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
+    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netty">prefix:netty-event-executor</type>
+    <name>global-event-executor</name>
+  </event-executor>
+  <binding-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
+    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">prefix:binding-broker-osgi-registry</type>
+    <name>binding-osgi-broker</name>
+  </binding-registry>
+  <dom-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
+    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-broker-osgi-registry</type>
+    <name>dom-broker</name>
+  </dom-registry>
+  <client-dispatcher xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
+    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf">prefix:netconf-client-dispatcher</type>
+    <name>global-netconf-dispatcher</name>
+  </client-dispatcher>
+  <processing-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
+    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:threadpool">prefix:threadpool</type>
+    <name>global-netconf-processing-executor</name>
+  </processing-executor>
+  <keepalive-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:connector:netconf">
+    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:threadpool">prefix:scheduled-threadpool</type>
+    <name>global-netconf-ssh-scheduled-executor</name>
+  </keepalive-executor>
+</module>
\ No newline at end of file
diff --git a/resources/templates/honeycomb/odl_client/odl_netconf_connector.url b/resources/templates/honeycomb/odl_client/odl_netconf_connector.url
new file mode 100644
index 0000000000..4d7e7d0732
--- /dev/null
+++ b/resources/templates/honeycomb/odl_client/odl_netconf_connector.url
@@ -0,0 +1 @@
+/restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules
\ No newline at end of file
diff --git a/resources/templates/honeycomb/oper_bridge_domains.url b/resources/templates/honeycomb/oper_bridge_domains.url
index 7c8584326c..f0fedb4039 100644
--- a/resources/templates/honeycomb/oper_bridge_domains.url
+++ b/resources/templates/honeycomb/oper_bridge_domains.url
@@ -1 +1 @@
-/restconf/operational/v3po:vpp-state/bridge-domains
\ No newline at end of file
+/restconf/operational{odl_url_part}/v3po:vpp-state/bridge-domains
\ No newline at end of file
diff --git a/resources/templates/honeycomb/oper_classify_table.url b/resources/templates/honeycomb/oper_classify_table.url
index f9fd294a8f..a7a0c7e3fd 100644
--- a/resources/templates/honeycomb/oper_classify_table.url
+++ b/resources/templates/honeycomb/oper_classify_table.url
@@ -1 +1 @@
-/restconf/operational/vpp-classifier:vpp-classifier-state
\ No newline at end of file
+/restconf/operational{odl_url_part}/vpp-classifier:vpp-classifier-state
\ No newline at end of file
diff --git a/resources/templates/honeycomb/oper_disabled_interfaces.url b/resources/templates/honeycomb/oper_disabled_interfaces.url
index d885c203a2..276830d7a7 100644
--- a/resources/templates/honeycomb/oper_disabled_interfaces.url
+++ b/resources/templates/honeycomb/oper_disabled_interfaces.url
@@ -1 +1 @@
-/restconf/operational/v3po-context:disabled-interfaces
\ No newline at end of file
+/restconf/operational{odl_url_part}/v3po-context:disabled-interfaces
\ No newline at end of file
diff --git a/resources/templates/honeycomb/oper_lisp.url b/resources/templates/honeycomb/oper_lisp.url
index 850d3174a1..95d19c05a8 100644
--- a/resources/templates/honeycomb/oper_lisp.url
+++ b/resources/templates/honeycomb/oper_lisp.url
@@ -1 +1 @@
-/restconf/operational/lisp:lisp-state
\ No newline at end of file
+/restconf/operational{odl_url_part}/lisp:lisp-state
\ No newline at end of file
diff --git a/resources/templates/honeycomb/oper_nat.url b/resources/templates/honeycomb/oper_nat.url
index 1445f4064b..a0101bb6de 100644
--- a/resources/templates/honeycomb/oper_nat.url
+++ b/resources/templates/honeycomb/oper_nat.url
@@ -1 +1 @@
-/restconf/operational/ietf-nat:nat-state
\ No newline at end of file
+/restconf/operational{odl_url_part}/ietf-nat:nat-state
\ No newline at end of file
diff --git a/resources/templates/honeycomb/oper_network_topology.url b/resources/templates/honeycomb/oper_network_topology.url
index e165d3f259..14e74ee3c7 100644
--- a/resources/templates/honeycomb/oper_network_topology.url
+++ b/resources/templates/honeycomb/oper_network_topology.url
@@ -1 +1 @@
-/restconf/operational/network-topology:network-topology
\ No newline at end of file
+/restconf/operational{odl_url_part}/network-topology:network-topology
\ No newline at end of file
diff --git a/resources/templates/honeycomb/oper_nsh.url b/resources/templates/honeycomb/oper_nsh.url
index 5be706d9df..1b511b3a5a 100644
--- a/resources/templates/honeycomb/oper_nsh.url
+++ b/resources/templates/honeycomb/oper_nsh.url
@@ -1 +1 @@
-/restconf/operational/vpp-nsh:vpp-nsh-state
\ No newline at end of file
+/restconf/operational{odl_url_part}/vpp-nsh:vpp-nsh-state
\ No newline at end of file
diff --git a/resources/templates/honeycomb/oper_vpp_interfaces.url b/resources/templates/honeycomb/oper_vpp_interfaces.url
index de6f950c0d..cae9e41b68 100644
--- a/resources/templates/honeycomb/oper_vpp_interfaces.url
+++ b/resources/templates/honeycomb/oper_vpp_interfaces.url
@@ -1 +1 @@
-/restconf/operational/ietf-interfaces:interfaces-state
\ No newline at end of file
+/restconf/operational{odl_url_part}/ietf-interfaces:interfaces-state
\ No newline at end of file
diff --git a/resources/templates/honeycomb/oper_vpp_version.url b/resources/templates/honeycomb/oper_vpp_version.url
index 59759be8ea..fbb8820975 100644
--- a/resources/templates/honeycomb/oper_vpp_version.url
+++ b/resources/templates/honeycomb/oper_vpp_version.url
@@ -1 +1 @@
-/restconf/operational/v3po:vpp-state/version
\ No newline at end of file
+/restconf/operational{odl_url_part}/v3po:vpp-state/version
\ No newline at end of file
diff --git a/resources/templates/honeycomb/poll_oper_data.url b/resources/templates/honeycomb/poll_oper_data.url
deleted file mode 100644
index 2fe04386f3..0000000000
--- a/resources/templates/honeycomb/poll_oper_data.url
+++ /dev/null
@@ -1 +0,0 @@
-/restconf/operations/v3po:vpp-poll-oper-data
\ No newline at end of file
-- 
cgit 1.2.3-korg