From 35c9ea8c9a3caa11d62cc889d3b38ba84f1298df Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Wed, 15 Mar 2017 11:54:12 -0700 Subject: [PATCH] Remove buck files for disconnected components - 'buck test' will pick them up Change-Id: If94b115b66d8eafb1cdc8859dd9cfcb82899119d --- apps/tenbi/BUCK | 23 ----------------------- apps/tenbi/topology/BUCK | 17 ----------------- apps/tenbi/tunnel/BUCK | 19 ------------------- apps/tenbi/utils/BUCK | 16 ---------------- apps/tenbi/yangmodel/BUCK | 21 --------------------- modules.defs | 4 ++-- protocols/restconf/client/api/BUCK | 10 ---------- protocols/restconf/client/ctl/BUCK | 22 ---------------------- providers/ietfte/BUCK | 26 -------------------------- providers/ietfte/topology/BUCK | 23 ----------------------- providers/ietfte/tunnel/BUCK | 24 ------------------------ providers/ietfte/utils/BUCK | 16 ---------------- 12 files changed, 2 insertions(+), 219 deletions(-) delete mode 100644 apps/tenbi/BUCK delete mode 100644 apps/tenbi/topology/BUCK delete mode 100644 apps/tenbi/tunnel/BUCK delete mode 100644 apps/tenbi/utils/BUCK delete mode 100644 apps/tenbi/yangmodel/BUCK delete mode 100644 protocols/restconf/client/api/BUCK delete mode 100644 protocols/restconf/client/ctl/BUCK delete mode 100644 providers/ietfte/BUCK delete mode 100644 providers/ietfte/topology/BUCK delete mode 100644 providers/ietfte/tunnel/BUCK delete mode 100644 providers/ietfte/utils/BUCK diff --git a/apps/tenbi/BUCK b/apps/tenbi/BUCK deleted file mode 100644 index 5a63e3b384..0000000000 --- a/apps/tenbi/BUCK +++ /dev/null @@ -1,23 +0,0 @@ -BUNDLES = [ - '//incubator/api:onos-incubator-api', - '//apps/yms/api:onos-apps-yms-api', - '//apps/tetopology/api:onos-apps-tetopology-api', - '//apps/tetunnel/api:onos-apps-tetunnel-api', - '//apps/tenbi/utils:onos-apps-tenbi-utils', - '//apps/tenbi/tunnel:onos-apps-tenbi-tunnel', - '//apps/tenbi/topology:onos-apps-tenbi-topology', -] - -onos_app ( - app_name = 'org.onosproject.tenbi', - title = 'TE NBI', - category = 'ACTN APP', - url = 'http://onosproject.org', - included_bundles = BUNDLES, - description = 'The northbound interface of TE topology and TE tunnel.', - required_features = [ 'onos-apps-tenbi-yangmodel' ], - required_apps = [ 'org.onosproject.tetopology', - 'org.onosproject.tetunnel', - 'org.onosproject.yms' ], -) - diff --git a/apps/tenbi/topology/BUCK b/apps/tenbi/topology/BUCK deleted file mode 100644 index 40e2be621b..0000000000 --- a/apps/tenbi/topology/BUCK +++ /dev/null @@ -1,17 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel', - '//apps/tenbi/utils:onos-apps-tenbi-utils', - '//apps/tetopology/api:onos-apps-tetopology-api', - '//apps/yms/api:onos-apps-yms-api', -] - -TEST_DEPS = [ - '//lib:TEST_ADAPTERS', - '//utils/osgi:onlab-osgi-tests', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, - test_deps = TEST_DEPS, -) diff --git a/apps/tenbi/tunnel/BUCK b/apps/tenbi/tunnel/BUCK deleted file mode 100644 index 57756acf33..0000000000 --- a/apps/tenbi/tunnel/BUCK +++ /dev/null @@ -1,19 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel', - '//apps/tenbi/utils:onos-apps-tenbi-utils', - '//apps/tetopology/api:onos-apps-tetopology-api', - '//apps/tetunnel/api:onos-apps-tetunnel-api', - '//apps/yms/api:onos-apps-yms-api', - '//incubator/api:onos-incubator-api', -] - -TEST_DEPS = [ - '//lib:TEST_ADAPTERS', - '//utils/osgi:onlab-osgi-tests', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, - test_deps = TEST_DEPS, -) diff --git a/apps/tenbi/utils/BUCK b/apps/tenbi/utils/BUCK deleted file mode 100644 index aaf248d806..0000000000 --- a/apps/tenbi/utils/BUCK +++ /dev/null @@ -1,16 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel', - '//apps/tetopology/api:onos-apps-tetopology-api', - '//apps/tetunnel/api:onos-apps-tetunnel-api', -] - -TEST_DEPS = [ - '//lib:TEST_ADAPTERS', - '//utils/osgi:onlab-osgi-tests', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, - test_deps = TEST_DEPS, -) diff --git a/apps/tenbi/yangmodel/BUCK b/apps/tenbi/yangmodel/BUCK deleted file mode 100644 index 78b4cf482e..0000000000 --- a/apps/tenbi/yangmodel/BUCK +++ /dev/null @@ -1,21 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', -] - -yang_osgi_jar( - deps = COMPILE_DEPS, - name = 'onos-apps-tenbi-yangmodel', - srcs = glob(['src/main/**/*.yang']), - visibility = [ 'PUBLIC' ], -) - -osgi_feature ( - name='onos-apps-tenbi-yangmodel', - title='ONOS TE YANG model', - included_bundles = [ - '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel', - ], - generate_file = True, - visibility = [ 'PUBLIC' ], - stage_repo = False, -) diff --git a/modules.defs b/modules.defs index 0422dbc21d..b748938a50 100644 --- a/modules.defs +++ b/modules.defs @@ -54,8 +54,8 @@ CORE = UTILS + API + [ '//protocols/lisp/msg:onos-protocols-lisp-msg', '//protocols/tl1/api:onos-protocols-tl1-api', '//protocols/tl1/ctl:onos-protocols-tl1-ctl', - '//protocols/restconf/client/api:onos-protocols-restconf-client-api', - '//protocols/restconf/client/ctl:onos-protocols-restconf-client-ctl', +# '//protocols/restconf/client/api:onos-protocols-restconf-client-api', +# '//protocols/restconf/client/ctl:onos-protocols-restconf-client-ctl', '//drivers/utilities:onos-drivers-utilities', diff --git a/protocols/restconf/client/api/BUCK b/protocols/restconf/client/api/BUCK deleted file mode 100644 index c1f3e2c1af..0000000000 --- a/protocols/restconf/client/api/BUCK +++ /dev/null @@ -1,10 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//incubator/api:onos-incubator-api', - '//utils/rest:onlab-rest', - '//protocols/rest/api:onos-protocols-rest-api', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, -) diff --git a/protocols/restconf/client/ctl/BUCK b/protocols/restconf/client/ctl/BUCK deleted file mode 100644 index 445e4b8b41..0000000000 --- a/protocols/restconf/client/ctl/BUCK +++ /dev/null @@ -1,22 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//lib:jersey-client', - '//lib:jersey-common', - '//lib:httpclient-osgi', - '//lib:httpcore-osgi', - '//lib:javax.ws.rs-api', - '//lib:hk2-api', - '//lib:jersey-guava', - '//lib:aopalliance-repackaged', - '//lib:javax.inject', - '//protocols/restconf/client/api:onos-protocols-restconf-client-api', - '//protocols/rest/api:onos-protocols-rest-api', - '//apps/yms/api:onos-apps-yms-api', - '//protocols/restconf/server/utils:onos-protocols-restconf-server-utils', - '//providers/ietfte/utils:onos-providers-ietfte-utils', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, -) - diff --git a/providers/ietfte/BUCK b/providers/ietfte/BUCK deleted file mode 100644 index df37518e1b..0000000000 --- a/providers/ietfte/BUCK +++ /dev/null @@ -1,26 +0,0 @@ -BUNDLES = [ - '//protocols/restconf/server/utils:onos-protocols-restconf-server-utils', - '//apps/yms/api:onos-apps-yms-api', - '//apps/tenbi/utils:onos-apps-tenbi-utils', - '//lib:httpclient-osgi', - '//lib:httpcore-osgi', - '//protocols/rest/api:onos-protocols-rest-api', - '//protocols/restconf/client/api:onos-protocols-restconf-client-api', - '//protocols/restconf/client/ctl:onos-protocols-restconf-client-ctl', - '//providers/ietfte/utils:onos-providers-ietfte-utils', - '//providers/ietfte/topology:onos-providers-ietfte-topology', - '//providers/ietfte/tunnel:onos-providers-ietfte-tunnel', -] - -onos_app ( - app_name = 'org.onosproject.teprovider', - title = 'IETF TE Provider', - category = 'Provider', - url = 'http://onosproject.org', - included_bundles = BUNDLES, - description = 'IETF TE southbound providers.', - required_features = [ 'onos-apps-tenbi-yangmodel' ], - required_apps = [ 'org.onosproject.tetunnel', - 'org.onosproject.tetopology', - 'org.onosproject.yms'], -) diff --git a/providers/ietfte/topology/BUCK b/providers/ietfte/topology/BUCK deleted file mode 100644 index 32b17296e3..0000000000 --- a/providers/ietfte/topology/BUCK +++ /dev/null @@ -1,23 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//protocols/restconf/client/api:onos-protocols-restconf-client-api', - '//protocols/restconf/client/ctl:onos-protocols-restconf-client-ctl', - '//protocols/restconf/server/utils:onos-protocols-restconf-server-utils', - '//protocols/rest/api:onos-protocols-rest-api', - '//apps/tetopology/api:onos-apps-tetopology-api', - '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel', - '//apps/tenbi/utils:onos-apps-tenbi-utils', - '//apps/yms/api:onos-apps-yms-api', - '//providers/ietfte/utils:onos-providers-ietfte-utils', - '//incubator/api:onos-incubator-api', -] - -TEST_DEPS = [ - '//lib:TEST_ADAPTERS', - '//utils/osgi:onlab-osgi-tests', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, - test_deps = TEST_DEPS, -) diff --git a/providers/ietfte/tunnel/BUCK b/providers/ietfte/tunnel/BUCK deleted file mode 100644 index 6a18e667e3..0000000000 --- a/providers/ietfte/tunnel/BUCK +++ /dev/null @@ -1,24 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//protocols/restconf/client/api:onos-protocols-restconf-client-api', - '//protocols/restconf/client/ctl:onos-protocols-restconf-client-ctl', - '//protocols/rest/api:onos-protocols-rest-api', - '//apps/yms/api:onos-apps-yms-api', - '//apps/tetunnel/api:onos-apps-tetunnel-api', - '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel', - '//apps/tenbi/utils:onos-apps-tenbi-utils', - '//apps/tetopology/api:onos-apps-tetopology-api', - '//incubator/api:onos-incubator-api', - '//providers/ietfte/utils:onos-providers-ietfte-utils', - '//lib:javax.ws.rs-api', -] - -TEST_DEPS = [ - '//lib:TEST_ADAPTERS', - '//utils/osgi:onlab-osgi-tests', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, - test_deps = TEST_DEPS, -) diff --git a/providers/ietfte/utils/BUCK b/providers/ietfte/utils/BUCK deleted file mode 100644 index 096403965a..0000000000 --- a/providers/ietfte/utils/BUCK +++ /dev/null @@ -1,16 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//apps/yms/api:onos-apps-yms-api', - '//protocols/restconf/server/utils:onos-protocols-restconf-server-utils', - '//protocols/restconf/client/api:onos-protocols-restconf-client-api', -] - -TEST_DEPS = [ - '//lib:TEST_ADAPTERS', - '//utils/osgi:onlab-osgi-tests', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, - test_deps = TEST_DEPS, -)