Move experimental items undo the experiments directory and some minor name cleanuos
Change-Id: I748e0546a80a593ddef6b8a4ac749d592b9d26b1
diff --git a/experiments/proto2yang/addressbook.proto b/experiments/netconf/proto2yang/addressbook.proto
similarity index 100%
rename from experiments/proto2yang/addressbook.proto
rename to experiments/netconf/proto2yang/addressbook.proto
diff --git a/experiments/proto2yang/descriptor.desc b/experiments/netconf/proto2yang/descriptor.desc
similarity index 100%
rename from experiments/proto2yang/descriptor.desc
rename to experiments/netconf/proto2yang/descriptor.desc
Binary files differ
diff --git a/experiments/proto2yang/descriptor_parser.py b/experiments/netconf/proto2yang/descriptor_parser.py
similarity index 100%
rename from experiments/proto2yang/descriptor_parser.py
rename to experiments/netconf/proto2yang/descriptor_parser.py
diff --git a/experiments/proto2yang/proto2yang.py b/experiments/netconf/proto2yang/proto2yang.py
similarity index 100%
rename from experiments/proto2yang/proto2yang.py
rename to experiments/netconf/proto2yang/proto2yang.py
diff --git a/experiments/proto2yang/yang.proto b/experiments/netconf/proto2yang/yang.proto
similarity index 100%
rename from experiments/proto2yang/yang.proto
rename to experiments/netconf/proto2yang/yang.proto
diff --git a/experiments/plugin/__init__.py b/experiments/netconf/tests/proto2yang/__init__.py
similarity index 100%
copy from experiments/plugin/__init__.py
copy to experiments/netconf/tests/proto2yang/__init__.py
diff --git a/tests/utests/netconf/proto2yang/protobuf_to_yang_test.py b/experiments/netconf/tests/proto2yang/protobuf_to_yang_test.py
similarity index 99%
rename from tests/utests/netconf/proto2yang/protobuf_to_yang_test.py
rename to experiments/netconf/tests/proto2yang/protobuf_to_yang_test.py
index dacaaf5..7336524 100644
--- a/tests/utests/netconf/proto2yang/protobuf_to_yang_test.py
+++ b/experiments/netconf/tests/proto2yang/protobuf_to_yang_test.py
@@ -23,7 +23,7 @@
proto_to_yang_cmd='python -m grpc.tools.protoc -I{} ' \
'--plugin=protoc-gen-custom=/voltha/experiments' \
- '/proto2yang/proto2yang.py --custom_out={} {}'
+ '/netconf/proto2yang/proto2yang.py --custom_out={} {}'
yang_validate_cmd="pyang -f tree --ietf {}"
diff --git a/tests/utests/netconf/yang/basic-rpc.yang b/experiments/netconf/tests/yang2proto/basic-rpc.yang
similarity index 100%
rename from tests/utests/netconf/yang/basic-rpc.yang
rename to experiments/netconf/tests/yang2proto/basic-rpc.yang
diff --git a/tests/utests/netconf/yang/basic.yang b/experiments/netconf/tests/yang2proto/basic.yang
similarity index 100%
rename from tests/utests/netconf/yang/basic.yang
rename to experiments/netconf/tests/yang2proto/basic.yang
diff --git a/tests/utests/netconf/yang/container.yang b/experiments/netconf/tests/yang2proto/container.yang
similarity index 100%
rename from tests/utests/netconf/yang/container.yang
rename to experiments/netconf/tests/yang2proto/container.yang
diff --git a/tests/utests/netconf/yang/cord-tenant.yang b/experiments/netconf/tests/yang2proto/cord-tenant.yang
similarity index 100%
rename from tests/utests/netconf/yang/cord-tenant.yang
rename to experiments/netconf/tests/yang2proto/cord-tenant.yang
diff --git a/tests/utests/netconf/yang/cord-volt-service.yang b/experiments/netconf/tests/yang2proto/cord-volt-service.yang
similarity index 100%
rename from tests/utests/netconf/yang/cord-volt-service.yang
rename to experiments/netconf/tests/yang2proto/cord-volt-service.yang
diff --git a/tests/utests/netconf/yang/corenova-node.yang b/experiments/netconf/tests/yang2proto/corenova-node.yang
similarity index 100%
rename from tests/utests/netconf/yang/corenova-node.yang
rename to experiments/netconf/tests/yang2proto/corenova-node.yang
diff --git a/tests/utests/netconf/yang/mix_simple_types.yang b/experiments/netconf/tests/yang2proto/mix_simple_types.yang
similarity index 100%
rename from tests/utests/netconf/yang/mix_simple_types.yang
rename to experiments/netconf/tests/yang2proto/mix_simple_types.yang
diff --git a/tests/utests/netconf/yang/openconfig-extensions.yang b/experiments/netconf/tests/yang2proto/openconfig-extensions.yang
similarity index 100%
rename from tests/utests/netconf/yang/openconfig-extensions.yang
rename to experiments/netconf/tests/yang2proto/openconfig-extensions.yang
diff --git a/tests/utests/netconf/yang/openconfig-interfaces.yang b/experiments/netconf/tests/yang2proto/openconfig-interfaces.yang
similarity index 100%
rename from tests/utests/netconf/yang/openconfig-interfaces.yang
rename to experiments/netconf/tests/yang2proto/openconfig-interfaces.yang
diff --git a/tests/utests/netconf/yang/openconfig-local-routing.yang b/experiments/netconf/tests/yang2proto/openconfig-local-routing.yang
similarity index 100%
rename from tests/utests/netconf/yang/openconfig-local-routing.yang
rename to experiments/netconf/tests/yang2proto/openconfig-local-routing.yang
diff --git a/tests/utests/netconf/yang/openconfig-policy-types.yang b/experiments/netconf/tests/yang2proto/openconfig-policy-types.yang
similarity index 100%
rename from tests/utests/netconf/yang/openconfig-policy-types.yang
rename to experiments/netconf/tests/yang2proto/openconfig-policy-types.yang
diff --git a/tests/utests/netconf/yang/xos-accessibility.yang b/experiments/netconf/tests/yang2proto/xos-accessibility.yang
similarity index 100%
rename from tests/utests/netconf/yang/xos-accessibility.yang
rename to experiments/netconf/tests/yang2proto/xos-accessibility.yang
diff --git a/tests/utests/netconf/yang/xos-controller.yang b/experiments/netconf/tests/yang2proto/xos-controller.yang
similarity index 100%
rename from tests/utests/netconf/yang/xos-controller.yang
rename to experiments/netconf/tests/yang2proto/xos-controller.yang
diff --git a/tests/utests/netconf/yang/xos-core-service.yang b/experiments/netconf/tests/yang2proto/xos-core-service.yang
similarity index 100%
rename from tests/utests/netconf/yang/xos-core-service.yang
rename to experiments/netconf/tests/yang2proto/xos-core-service.yang
diff --git a/tests/utests/netconf/yang/xos-openstack.yang b/experiments/netconf/tests/yang2proto/xos-openstack.yang
similarity index 100%
rename from tests/utests/netconf/yang/xos-openstack.yang
rename to experiments/netconf/tests/yang2proto/xos-openstack.yang
diff --git a/tests/utests/netconf/yang/xos-package.yang b/experiments/netconf/tests/yang2proto/xos-package.yang
similarity index 100%
rename from tests/utests/netconf/yang/xos-package.yang
rename to experiments/netconf/tests/yang2proto/xos-package.yang
diff --git a/tests/utests/netconf/yang/xos-slice.yang b/experiments/netconf/tests/yang2proto/xos-slice.yang
similarity index 100%
rename from tests/utests/netconf/yang/xos-slice.yang
rename to experiments/netconf/tests/yang2proto/xos-slice.yang
diff --git a/tests/utests/netconf/yang/xos-topology.yang b/experiments/netconf/tests/yang2proto/xos-topology.yang
similarity index 100%
rename from tests/utests/netconf/yang/xos-topology.yang
rename to experiments/netconf/tests/yang2proto/xos-topology.yang
diff --git a/tests/utests/netconf/yang/xos-types.yang b/experiments/netconf/tests/yang2proto/xos-types.yang
similarity index 100%
rename from tests/utests/netconf/yang/xos-types.yang
rename to experiments/netconf/tests/yang2proto/xos-types.yang
diff --git a/tests/utests/netconf/yang/xos-unreconciled-models.yang b/experiments/netconf/tests/yang2proto/xos-unreconciled-models.yang
similarity index 100%
rename from tests/utests/netconf/yang/xos-unreconciled-models.yang
rename to experiments/netconf/tests/yang2proto/xos-unreconciled-models.yang
diff --git a/tests/utests/netconf/yang/yang_to_protobuf_test.py b/experiments/netconf/tests/yang2proto/yang_to_protobuf_test.py
similarity index 96%
rename from tests/utests/netconf/yang/yang_to_protobuf_test.py
rename to experiments/netconf/tests/yang2proto/yang_to_protobuf_test.py
index f69e89a..16b12b7 100644
--- a/tests/utests/netconf/yang/yang_to_protobuf_test.py
+++ b/experiments/netconf/tests/yang2proto/yang_to_protobuf_test.py
@@ -21,9 +21,10 @@
from tests.utests.chameleon.protoc_plugins.test_utils import load_file
-pyang_cmd = "pyang --plugindir /voltha/experiments/plugin -f protobuf " \
- "-p /voltha/tests/utests/netconf/yang " \
- "/voltha/tests/utests/netconf/yang/{}"
+pyang_cmd = "pyang --plugindir /voltha/experiments/netconf/yang2proto -f " \
+ "proto " \
+ "-p /voltha/experiments/netconf/tests/yang2proto " \
+ "/voltha/experiments/netconf/tests/yang2proto/{}"
class YangToProtoBufTests(TestCase):
diff --git a/experiments/plugin/__init__.py b/experiments/netconf/yang2proto/__init__.py
similarity index 100%
rename from experiments/plugin/__init__.py
rename to experiments/netconf/yang2proto/__init__.py
diff --git a/experiments/plugin/protobuf.py b/experiments/netconf/yang2proto/yang2proto.py
similarity index 96%
rename from experiments/plugin/protobuf.py
rename to experiments/netconf/yang2proto/yang2proto.py
index 36ebc3c..3808804 100644
--- a/experiments/plugin/protobuf.py
+++ b/experiments/netconf/yang2proto/yang2proto.py
@@ -22,11 +22,11 @@
- this plugin requires pyang to be present and is run using pyang as
follows:
- $ pyang --plugindir /voltha/experiments/plugin -f protobuf -o
- <protofile> -p /voltha/tests/utests/netconf/yang
- /voltha/tests/utests/netconf/yang/<yang file>
+ $ pyang --plugindir /voltha/experiments/netconf/yang2proto -f yang2proto -o
+ <protofile> -p /voltha/experiments/netconf/tests/yang2proto
+ /voltha/experiments/netconf/tests/yang2proto/<yang file>
- - pyang validates the yanhg definition first and then invoke this plugin
+ - pyang validates the yang definition first and then invoke this plugin
to convert the yang model into protobuf.
"""
@@ -213,7 +213,7 @@
class ProtobufPlugin(plugin.PyangPlugin):
def add_output_format(self, fmts):
self.multiple_modules = True
- fmts['protobuf'] = self
+ fmts['proto'] = self
def setup_fmt(self, ctx):
ctx.implicit_errors = False
diff --git a/tests/utests/netconf/proto2yang/__init__.py b/tests/utests/netconf/proto2yang/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tests/utests/netconf/proto2yang/__init__.py
+++ /dev/null