diff --git a/tests.py b/tests.py index 4684254..608672c 100755 --- a/tests.py +++ b/tests.py @@ -56,7 +56,7 @@ def load_unittest(fn): def main(): parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter) - parser.add_argument('-t', '--test', dest='test', type=str, nargs='+', default=['unittest/*.yaml'], help="""YAML test file(s)""") + parser.add_argument('-t', '--test', dest='test', type=str, nargs='+', default=['unittest/yaml/*.yaml'], help="""YAML test file(s)""") parser.add_argument('-s', '--schema', dest='schema', type=str, default='./schema.yaml', help="""YAML schema validation file""") parser.add_argument('-d', '--debug', dest='debug', action='store_true', help="""Enable debug, default False""") diff --git a/unittest/correct-address.yaml b/unittest/yaml/correct-address.yaml similarity index 100% rename from unittest/correct-address.yaml rename to unittest/yaml/correct-address.yaml diff --git a/unittest/correct-bondethernet.yaml b/unittest/yaml/correct-bondethernet.yaml similarity index 100% rename from unittest/correct-bondethernet.yaml rename to unittest/yaml/correct-bondethernet.yaml diff --git a/unittest/correct-bridgedomain.yaml b/unittest/yaml/correct-bridgedomain.yaml similarity index 100% rename from unittest/correct-bridgedomain.yaml rename to unittest/yaml/correct-bridgedomain.yaml diff --git a/unittest/correct-empty.yaml b/unittest/yaml/correct-empty.yaml similarity index 100% rename from unittest/correct-empty.yaml rename to unittest/yaml/correct-empty.yaml diff --git a/unittest/correct-empty2.yaml b/unittest/yaml/correct-empty2.yaml similarity index 100% rename from unittest/correct-empty2.yaml rename to unittest/yaml/correct-empty2.yaml diff --git a/unittest/correct-example1.yaml b/unittest/yaml/correct-example1.yaml similarity index 100% rename from unittest/correct-example1.yaml rename to unittest/yaml/correct-example1.yaml diff --git a/unittest/correct-l2xc.yaml b/unittest/yaml/correct-l2xc.yaml similarity index 100% rename from unittest/correct-l2xc.yaml rename to unittest/yaml/correct-l2xc.yaml diff --git a/unittest/correct-loopback.yaml b/unittest/yaml/correct-loopback.yaml similarity index 100% rename from unittest/correct-loopback.yaml rename to unittest/yaml/correct-loopback.yaml diff --git a/unittest/correct-vxlan.yaml b/unittest/yaml/correct-vxlan.yaml similarity index 100% rename from unittest/correct-vxlan.yaml rename to unittest/yaml/correct-vxlan.yaml diff --git a/unittest/error-address1.yaml b/unittest/yaml/error-address1.yaml similarity index 100% rename from unittest/error-address1.yaml rename to unittest/yaml/error-address1.yaml diff --git a/unittest/error-bondethernet1.yaml b/unittest/yaml/error-bondethernet1.yaml similarity index 100% rename from unittest/error-bondethernet1.yaml rename to unittest/yaml/error-bondethernet1.yaml diff --git a/unittest/error-bondethernet2.yaml b/unittest/yaml/error-bondethernet2.yaml similarity index 100% rename from unittest/error-bondethernet2.yaml rename to unittest/yaml/error-bondethernet2.yaml diff --git a/unittest/error-bondethernet3.yaml b/unittest/yaml/error-bondethernet3.yaml similarity index 100% rename from unittest/error-bondethernet3.yaml rename to unittest/yaml/error-bondethernet3.yaml diff --git a/unittest/error-bondethernet4.yaml b/unittest/yaml/error-bondethernet4.yaml similarity index 100% rename from unittest/error-bondethernet4.yaml rename to unittest/yaml/error-bondethernet4.yaml diff --git a/unittest/error-bridgedomain1.yaml b/unittest/yaml/error-bridgedomain1.yaml similarity index 100% rename from unittest/error-bridgedomain1.yaml rename to unittest/yaml/error-bridgedomain1.yaml diff --git a/unittest/error-bridgedomain2.yaml b/unittest/yaml/error-bridgedomain2.yaml similarity index 100% rename from unittest/error-bridgedomain2.yaml rename to unittest/yaml/error-bridgedomain2.yaml diff --git a/unittest/error-bridgedomain3.yaml b/unittest/yaml/error-bridgedomain3.yaml similarity index 100% rename from unittest/error-bridgedomain3.yaml rename to unittest/yaml/error-bridgedomain3.yaml diff --git a/unittest/error-bridgedomain4.yaml b/unittest/yaml/error-bridgedomain4.yaml similarity index 100% rename from unittest/error-bridgedomain4.yaml rename to unittest/yaml/error-bridgedomain4.yaml diff --git a/unittest/error-bridgedomain5.yaml b/unittest/yaml/error-bridgedomain5.yaml similarity index 100% rename from unittest/error-bridgedomain5.yaml rename to unittest/yaml/error-bridgedomain5.yaml diff --git a/unittest/error-bridgedomain6.yaml b/unittest/yaml/error-bridgedomain6.yaml similarity index 100% rename from unittest/error-bridgedomain6.yaml rename to unittest/yaml/error-bridgedomain6.yaml diff --git a/unittest/error-bridgedomain7.yaml b/unittest/yaml/error-bridgedomain7.yaml similarity index 100% rename from unittest/error-bridgedomain7.yaml rename to unittest/yaml/error-bridgedomain7.yaml diff --git a/unittest/error-interface-mtu1.yaml b/unittest/yaml/error-interface-mtu1.yaml similarity index 100% rename from unittest/error-interface-mtu1.yaml rename to unittest/yaml/error-interface-mtu1.yaml diff --git a/unittest/error-interface-mtu2.yaml b/unittest/yaml/error-interface-mtu2.yaml similarity index 100% rename from unittest/error-interface-mtu2.yaml rename to unittest/yaml/error-interface-mtu2.yaml diff --git a/unittest/error-l2xc1.yaml b/unittest/yaml/error-l2xc1.yaml similarity index 100% rename from unittest/error-l2xc1.yaml rename to unittest/yaml/error-l2xc1.yaml diff --git a/unittest/error-l2xc2.yaml b/unittest/yaml/error-l2xc2.yaml similarity index 100% rename from unittest/error-l2xc2.yaml rename to unittest/yaml/error-l2xc2.yaml diff --git a/unittest/error-l2xc3.yaml b/unittest/yaml/error-l2xc3.yaml similarity index 100% rename from unittest/error-l2xc3.yaml rename to unittest/yaml/error-l2xc3.yaml diff --git a/unittest/error-l2xc4.yaml b/unittest/yaml/error-l2xc4.yaml similarity index 100% rename from unittest/error-l2xc4.yaml rename to unittest/yaml/error-l2xc4.yaml diff --git a/unittest/error-l2xc5.yaml b/unittest/yaml/error-l2xc5.yaml similarity index 100% rename from unittest/error-l2xc5.yaml rename to unittest/yaml/error-l2xc5.yaml diff --git a/unittest/error-l2xc6.yaml b/unittest/yaml/error-l2xc6.yaml similarity index 100% rename from unittest/error-l2xc6.yaml rename to unittest/yaml/error-l2xc6.yaml diff --git a/unittest/error-l2xc7.yaml b/unittest/yaml/error-l2xc7.yaml similarity index 100% rename from unittest/error-l2xc7.yaml rename to unittest/yaml/error-l2xc7.yaml diff --git a/unittest/error-l2xc8.yaml b/unittest/yaml/error-l2xc8.yaml similarity index 100% rename from unittest/error-l2xc8.yaml rename to unittest/yaml/error-l2xc8.yaml diff --git a/unittest/error-lcp-unique1.yaml b/unittest/yaml/error-lcp-unique1.yaml similarity index 100% rename from unittest/error-lcp-unique1.yaml rename to unittest/yaml/error-lcp-unique1.yaml diff --git a/unittest/error-lcp-unique2.yaml b/unittest/yaml/error-lcp-unique2.yaml similarity index 100% rename from unittest/error-lcp-unique2.yaml rename to unittest/yaml/error-lcp-unique2.yaml diff --git a/unittest/error-loopback1.yaml b/unittest/yaml/error-loopback1.yaml similarity index 100% rename from unittest/error-loopback1.yaml rename to unittest/yaml/error-loopback1.yaml diff --git a/unittest/error-schema-field1.yaml b/unittest/yaml/error-schema-field1.yaml similarity index 100% rename from unittest/error-schema-field1.yaml rename to unittest/yaml/error-schema-field1.yaml diff --git a/unittest/error-schema-field2.yaml b/unittest/yaml/error-schema-field2.yaml similarity index 100% rename from unittest/error-schema-field2.yaml rename to unittest/yaml/error-schema-field2.yaml diff --git a/unittest/error-subinterface1.yaml b/unittest/yaml/error-subinterface1.yaml similarity index 100% rename from unittest/error-subinterface1.yaml rename to unittest/yaml/error-subinterface1.yaml diff --git a/unittest/error-subinterface2.yaml b/unittest/yaml/error-subinterface2.yaml similarity index 100% rename from unittest/error-subinterface2.yaml rename to unittest/yaml/error-subinterface2.yaml diff --git a/unittest/error-subinterface3.yaml b/unittest/yaml/error-subinterface3.yaml similarity index 100% rename from unittest/error-subinterface3.yaml rename to unittest/yaml/error-subinterface3.yaml diff --git a/unittest/error-subinterface4.yaml b/unittest/yaml/error-subinterface4.yaml similarity index 100% rename from unittest/error-subinterface4.yaml rename to unittest/yaml/error-subinterface4.yaml diff --git a/unittest/error-subinterface5.yaml b/unittest/yaml/error-subinterface5.yaml similarity index 100% rename from unittest/error-subinterface5.yaml rename to unittest/yaml/error-subinterface5.yaml diff --git a/unittest/error-subinterface6.yaml b/unittest/yaml/error-subinterface6.yaml similarity index 100% rename from unittest/error-subinterface6.yaml rename to unittest/yaml/error-subinterface6.yaml diff --git a/unittest/error-subinterface7.yaml b/unittest/yaml/error-subinterface7.yaml similarity index 100% rename from unittest/error-subinterface7.yaml rename to unittest/yaml/error-subinterface7.yaml diff --git a/unittest/error-subinterface8.yaml b/unittest/yaml/error-subinterface8.yaml similarity index 100% rename from unittest/error-subinterface8.yaml rename to unittest/yaml/error-subinterface8.yaml diff --git a/unittest/error-vxlan1.yaml b/unittest/yaml/error-vxlan1.yaml similarity index 100% rename from unittest/error-vxlan1.yaml rename to unittest/yaml/error-vxlan1.yaml diff --git a/unittest/error-vxlan2.yaml b/unittest/yaml/error-vxlan2.yaml similarity index 100% rename from unittest/error-vxlan2.yaml rename to unittest/yaml/error-vxlan2.yaml