diff options
| author |   selias <samelias@cisco.com> | 2017-08-11 09:33:56 +0200 |
|---|---|---|
| committer |   Tibor Frank <tifrank@cisco.com> | 2017-09-27 12:26:34 +0000 |
| commit | f3350420711cfa08c0cc7a77de51f1732668bac3 (patch) | |
| tree | 58e4088ea529ded817979672185933061001ca53 /resources/templates/honeycomb | |
| parent | cefe08af5bd7ac810fe367bf25b11761d1c06928 (diff) | |
HC Test: update ODL startup in hc2vpp jobs
- mountpoint configuration through controller-config is deprecated. Use the
new method through odl-netconf-topology feature.
Change-Id: I1297622db7ab6a3853b3c97ab7f59c31b4269b6d
Signed-off-by: selias <samelias@cisco.com>
Diffstat (limited to 'resources/templates/honeycomb')
3 files changed, 12 insertions, 34 deletions
diff --git a/resources/templates/honeycomb/odl_client/mount_honeycomb.json b/resources/templates/honeycomb/odl_client/mount_honeycomb.json new file mode 100644 index 0000000000..6041e53c20 --- /dev/null +++ b/resources/templates/honeycomb/odl_client/mount_honeycomb.json @@ -0,0 +1,11 @@ +{ + "node": { + "node-id": "vpp", + "netconf-node-topology:host": "127.0.0.1", + "netconf-node-topology:port": "2831", + "netconf-node-topology:username": "admin", + "netconf-node-topology:password": "admin", + "netconf-node-topology:tcp-only": "false", + "netconf-node-topology:keepalive-delay": "0" + } +}
\ 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 deleted file mode 100644 index 97f43e1119..0000000000 --- a/resources/templates/honeycomb/odl_client/mount_honeycomb.xml +++ /dev/null @@ -1,33 +0,0 @@ -<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 index 4d7e7d0732..e76f47ce8c 100644 --- a/resources/templates/honeycomb/odl_client/odl_netconf_connector.url +++ b/resources/templates/honeycomb/odl_client/odl_netconf_connector.url @@ -1 +1 @@ -/restconf/config/network-topology:network-topology/topology/topology-netconf/node/controller-config/yang-ext:mount/config:modules
\ No newline at end of file +/restconf/config/network-topology:network-topology/topology/topology-netconf
\ No newline at end of file |