From 16d190d24cfb3286ffd941d690c656d7e5d73928 Mon Sep 17 00:00:00 2001
From: Marek Gradzki <mgradzki@cisco.com>
Date: Thu, 14 Jun 2018 12:12:07 +0200
Subject: HC2VPP-343: enable validation for acl list

This patch moves all validation for acl list to VppAclValidator,
implementation of Validator interface brought by (HONEYCOMB-431):
https://gerrit.fd.io/r/#/c/14022/

To test <validate> RPC, run ncclient tests with:
./edit_config.py acl/copy_config_unsupported-acl-type.xml -v

Support for <validate> RPC requres:
https://gerrit.fd.io/r/#/c/14040/

Change-Id: Iea591a76022e893f6aaf2a52637f45cadb284e4e
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
---
 .../acl/copy_config_unsupported-acl-type.xml       | 15 ++++++++
 examples/ncclient/acl/test_invalid_acl.sh          | 18 +++++++++
 examples/ncclient/edit_config.py                   | 43 ++++++++++++++++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 examples/ncclient/acl/copy_config_unsupported-acl-type.xml
 create mode 100755 examples/ncclient/acl/test_invalid_acl.sh
 create mode 100755 examples/ncclient/edit_config.py

(limited to 'examples')

diff --git a/examples/ncclient/acl/copy_config_unsupported-acl-type.xml b/examples/ncclient/acl/copy_config_unsupported-acl-type.xml
new file mode 100644
index 000000000..b86a11924
--- /dev/null
+++ b/examples/ncclient/acl/copy_config_unsupported-acl-type.xml
@@ -0,0 +1,15 @@
+<!--
+  ~ Copyright (c) 2018 Cisco Systems, Inc. and others.  All rights reserved.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
+  -->
+<config xmlns:xc="urn:ietf:params:xml:ns:netconf:base:1.0">
+    <access-lists xmlns="urn:ietf:params:xml:ns:yang:ietf-access-control-list" xc:operation="create">
+        <acl>
+            <acl-name>acl0</acl-name>
+            <acl-type>ipv4-acl</acl-type>
+        </acl>
+    </access-lists>
+</config>
diff --git a/examples/ncclient/acl/test_invalid_acl.sh b/examples/ncclient/acl/test_invalid_acl.sh
new file mode 100755
index 000000000..aedb842af
--- /dev/null
+++ b/examples/ncclient/acl/test_invalid_acl.sh
@@ -0,0 +1,18 @@
+#!/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/edit_config.py b/examples/ncclient/edit_config.py
new file mode 100755
index 000000000..cafb7d475
--- /dev/null
+++ b/examples/ncclient/edit_config.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python2
+#
+# 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.
+
+import argparse
+import logging
+from ncclient import manager
+
+
+def _edit_config(config_filename, host='localhost', port=2831, username='admin', password='admin',
+                 validate=False, commit=False):
+    with manager.connect(host=host, port=port, username=username, password=password, hostkey_verify=False) as m:
+        logger.info("Connected to HC")
+        with open(config_filename, 'r') as f:
+            ret = m.edit_config(config=f.read())
+            logger.debug("EditConfig successful:\n%s" % ret)
+            validate = m.validate()
+            logger.debug("Validate successful:\n%s" % validate)
+            commit = m.commit()
+            logger.debug("Commit successful:\n%s" % commit)
+
+if __name__ == '__main__':
+    logger = logging.getLogger("hc2vpp.examples.edit_config")
+    logging.basicConfig(level=logging.WARNING)
+    argparser = argparse.ArgumentParser(description="Configures VPP using <edit-config> RPC")
+    argparser.add_argument('config_filename', help="name of XML file with <config> element")
+    argparser.add_argument('-v', '--validate', help="sends <validate> RPC is <edit-config> was successful",
+                           action="store_true")
+    argparser.add_argument('-c', '--commit', help="commits candidate configuration",
+                           action="store_true")
+    args = argparser.parse_args()
+    _edit_config(args.config_filename, validate=args.validate, commit=args.commit)
-- 
cgit 1.2.3-korg