diff options
Diffstat (limited to 'examples/ncclient')
-rw-r--r-- | examples/ncclient/Readme.adoc | 51 | ||||
-rw-r--r-- | examples/ncclient/acl/config_acl.xml (renamed from examples/ncclient/acl/copy_config_acl.xml) | 0 | ||||
-rw-r--r-- | examples/ncclient/acl/config_acl_update.xml (renamed from examples/ncclient/acl/copy_config_acl_update.xml) | 0 | ||||
-rw-r--r-- | examples/ncclient/acl/config_invalid_acl.xml (renamed from examples/ncclient/acl/copy_config_unsupported-acl-type.xml) | 0 | ||||
-rwxr-xr-x | examples/ncclient/acl/test_acl.sh | 2 | ||||
-rwxr-xr-x | examples/ncclient/acl/test_acl_update.sh | 4 | ||||
-rwxr-xr-x | examples/ncclient/acl/test_invalid_acl.sh | 18 | ||||
-rw-r--r-- | examples/ncclient/nat/config_nat.xml (renamed from examples/ncclient/nat/copy_config_nat.xml) | 0 | ||||
-rw-r--r-- | examples/ncclient/nat/config_nat_update.xml (renamed from examples/ncclient/nat/copy_config_nat_update.xml) | 0 | ||||
-rwxr-xr-x | examples/ncclient/nat/test_nat.sh | 2 | ||||
-rwxr-xr-x | examples/ncclient/nat/test_nat_update.sh | 4 |
11 files changed, 46 insertions, 35 deletions
diff --git a/examples/ncclient/Readme.adoc b/examples/ncclient/Readme.adoc index cc1d63e12..ec856c6a3 100644 --- a/examples/ncclient/Readme.adoc +++ b/examples/ncclient/Readme.adoc @@ -24,22 +24,42 @@ git fetch https://git.opendaylight.org/gerrit/netconf refs/changes/81/71181/1 && mvn clean install -pl netconf/netconf-util,netconf/netconf-netty-util,netconf/mdsal-netconf-connector ---- -== Custom HC2VPP build +=== <validate> support: [source] ---- -git clone https://gerrit.fd.io/r/hc2vpp -cd hc2vpp +git fetch https://git.opendaylight.org/gerrit/netconf refs/changes/56/72756/4 && git cherry-pick FETCH_HEAD +git fetch https://git.opendaylight.org/gerrit/netconf refs/changes/34/73034/2 && git cherry-pick FETCH_HEAD +git fetch https://git.opendaylight.org/gerrit/netconf refs/changes/95/74795/3 && git cherry-pick FETCH_HEAD +mvn clean install -pl netconf/mdsal-netconf-connector ---- -1. Checkout desired branch or use master branch, e.g. +== Custom Honeycomb build + +Clone project, checkout desired branch or use master branch: [source] ---- -git checkout -b stable1804 origin/stable/1804 +git clone https://gerrit.fd.io/r/honeycomb +cd honeycomb ---- -2. Build vpp-integration module from hc2vpp project: +=== <validate> support: +[source] +---- +git fetch ssh://mgradzki@gerrit.fd.io:29418/honeycomb refs/changes/40/14040/3 && git cherry-pick FETCH_HEAD +mvn clean install -pl infra/data-impl +---- + +== Custom HC2VPP build +1. Clone project, checkout desired branch or use master branch: +[source] +---- +git clone https://gerrit.fd.io/r/hc2vpp +cd hc2vpp +---- + +2. Build vpp-integration module from hc2vpp project: [source] ---- mvn clean install -pl vpp-integration/minimal-distribution @@ -67,21 +87,30 @@ Start vpp. Start honeycomb (either from hc2vpp builddir or using package built in previous steps). -Then invoke: +NOTE: Remember that HC by default persists config and restores it after restart. +You can disable this behaviour using config/honeycomb.json. + +== <copy-config> examples -ACL: +=== ACL [source] ---- ./acl/test_acl.sh ./acl/test_acl_updates.sh ---- -NAT: +=== NAT [source] ---- ./acl/test_nat.sh ./acl/test_nat_updates.sh ---- -NOTE: Remember that HC by default persists config and restores it after restart. -You can disable this behaviour using config/honeycomb.json. +== <validate> examples + +== ACL <edit-config> + <validate> +[source] +---- +./edit_config.py --validate acl/config_invalid_acl.xml +---- + diff --git a/examples/ncclient/acl/copy_config_acl.xml b/examples/ncclient/acl/config_acl.xml index 164fd5aaa..164fd5aaa 100644 --- a/examples/ncclient/acl/copy_config_acl.xml +++ b/examples/ncclient/acl/config_acl.xml diff --git a/examples/ncclient/acl/copy_config_acl_update.xml b/examples/ncclient/acl/config_acl_update.xml index 5b99994c3..5b99994c3 100644 --- a/examples/ncclient/acl/copy_config_acl_update.xml +++ b/examples/ncclient/acl/config_acl_update.xml diff --git a/examples/ncclient/acl/copy_config_unsupported-acl-type.xml b/examples/ncclient/acl/config_invalid_acl.xml index b86a11924..b86a11924 100644 --- a/examples/ncclient/acl/copy_config_unsupported-acl-type.xml +++ b/examples/ncclient/acl/config_invalid_acl.xml diff --git a/examples/ncclient/acl/test_acl.sh b/examples/ncclient/acl/test_acl.sh index aedb842af..e55296ebd 100755 --- a/examples/ncclient/acl/test_acl.sh +++ b/examples/ncclient/acl/test_acl.sh @@ -15,4 +15,4 @@ DIR_NAME=$(dirname $0) -${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/copy_config_acl.xml ${DIR_NAME}/expected_config_acl.xml +${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_acl.xml ${DIR_NAME}/expected_config_acl.xml diff --git a/examples/ncclient/acl/test_acl_update.sh b/examples/ncclient/acl/test_acl_update.sh index 6dedbfeaa..cb62c183e 100755 --- a/examples/ncclient/acl/test_acl_update.sh +++ b/examples/ncclient/acl/test_acl_update.sh @@ -15,6 +15,6 @@ DIR_NAME=$(dirname $0) -${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/copy_config_acl.xml ${DIR_NAME}/expected_config_acl.xml +${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_acl.xml ${DIR_NAME}/expected_config_acl.xml -${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/copy_config_acl_update.xml ${DIR_NAME}/expected_config_acl_update.xml +${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_acl_update.xml ${DIR_NAME}/expected_config_acl_update.xml diff --git a/examples/ncclient/acl/test_invalid_acl.sh b/examples/ncclient/acl/test_invalid_acl.sh deleted file mode 100755 index aedb842af..000000000 --- a/examples/ncclient/acl/test_invalid_acl.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2018 Cisco and/or its affiliates. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -DIR_NAME=$(dirname $0) - -${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/copy_config_acl.xml ${DIR_NAME}/expected_config_acl.xml diff --git a/examples/ncclient/nat/copy_config_nat.xml b/examples/ncclient/nat/config_nat.xml index eb261f1d2..eb261f1d2 100644 --- a/examples/ncclient/nat/copy_config_nat.xml +++ b/examples/ncclient/nat/config_nat.xml diff --git a/examples/ncclient/nat/copy_config_nat_update.xml b/examples/ncclient/nat/config_nat_update.xml index 7c8bd9b9b..7c8bd9b9b 100644 --- a/examples/ncclient/nat/copy_config_nat_update.xml +++ b/examples/ncclient/nat/config_nat_update.xml diff --git a/examples/ncclient/nat/test_nat.sh b/examples/ncclient/nat/test_nat.sh index 272a1d6d9..b9ec896ce 100755 --- a/examples/ncclient/nat/test_nat.sh +++ b/examples/ncclient/nat/test_nat.sh @@ -15,4 +15,4 @@ DIR_NAME=$(dirname $0) -${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/copy_config_nat.xml ${DIR_NAME}/expected_config_nat.xml +${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_nat.xml ${DIR_NAME}/expected_config_nat.xml diff --git a/examples/ncclient/nat/test_nat_update.sh b/examples/ncclient/nat/test_nat_update.sh index b37e4c6a9..c5ae446b6 100755 --- a/examples/ncclient/nat/test_nat_update.sh +++ b/examples/ncclient/nat/test_nat_update.sh @@ -15,6 +15,6 @@ DIR_NAME=$(dirname $0) -${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/copy_config_nat.xml ${DIR_NAME}/expected_config_nat.xml +${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_nat.xml ${DIR_NAME}/expected_config_nat.xml -${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/copy_config_nat_update.xml ${DIR_NAME}/expected_config_nat_update.xml +${DIR_NAME}/../test_copy_config.sh ${DIR_NAME}/config_nat_update.xml ${DIR_NAME}/expected_config_nat_update.xml |