diff --git a/modules.defs b/modules.defs index a9eb97d9b1..8910bbf16b 100644 --- a/modules.defs +++ b/modules.defs @@ -133,7 +133,7 @@ ONOS_PROVIDERS = [ '//providers/lisp:onos-providers-lisp-oar', '//providers/tl1:onos-providers-tl1-oar', '//providers/general:onos-providers-general-oar', - '//providers/p4runtime/packet:onos-providers-p4runtime-packet-oar', + '//providers/p4runtime:onos-providers-p4runtime-oar', # '//providers/ietfte:onos-providers-ietfte-oar', ] diff --git a/providers/p4runtime/BUCK b/providers/p4runtime/BUCK new file mode 100644 index 0000000000..7df28a4c5c --- /dev/null +++ b/providers/p4runtime/BUCK @@ -0,0 +1,17 @@ +BUNDLES = [ + '//providers/p4runtime/packet:onos-providers-p4runtime-packet', +] + +onos_app ( + app_name = 'org.onosproject.p4runtime', + title = 'P4Runtime Provider', + category = 'Provider', + url = 'http://onosproject.org', + included_bundles = BUNDLES, + description = 'P4Runtime southbound providers.', + required_apps = [ + 'org.onosproject.protocols.p4runtime', + ] +) + + diff --git a/providers/p4runtime/packet/BUCK b/providers/p4runtime/packet/BUCK index 29eace124b..995095fd38 100644 --- a/providers/p4runtime/packet/BUCK +++ b/providers/p4runtime/packet/BUCK @@ -3,19 +3,6 @@ COMPILE_DEPS = [ '//protocols/p4runtime/api:onos-protocols-p4runtime-api', ] -BUNDLES = [ - ':onos-providers-p4runtime-packet', -] - osgi_jar ( deps = COMPILE_DEPS, -) - -onos_app ( - app_name = 'org.onosproject.provider.p4runtime.packet', - title = 'P4Runtime Packet Provider', - category = 'Provider', - url = 'http://onosproject.org', - description = 'ONOS P4Runtime packet provider.', - included_bundles = BUNDLES, ) \ No newline at end of file