diff options
Diffstat (limited to 'infra/impl/src')
19 files changed, 105 insertions, 202 deletions
diff --git a/infra/impl/src/main/config/context-datatree-config.xml b/infra/impl/src/main/config/context-datatree-config.xml index 313f0ebe6..4d43a40cf 100644 --- a/infra/impl/src/main/config/context-datatree-config.xml +++ b/infra/impl/src/main/config/context-datatree-config.xml @@ -19,9 +19,9 @@ <snapshot> <required-capabilities> - <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&revision=2014-12-10</capability> + <capability>urn:opendaylight:params:xml:ns:yang:honeycomb:impl?module=honeycomb-impl&revision=2014-12-10</capability> <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&revision=2016-04-06</capability> - <capability>urn:honeycomb:params:xml:ns:yang:vpp:data:init?module=vpp-cfg-init&revision=2016-04-07</capability> + <capability>urn:honeycomb:params:xml:ns:yang:data:init?module=cfg-init&revision=2016-04-07</capability> <capability>urn:honeycomb:params:xml:ns:yang:data:api?module=data-api&revision=2016-04-11</capability> <capability>urn:honeycomb:params:xml:ns:yang:data:impl?module=data-impl&revision=2016-04-11</capability> <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28</capability> @@ -60,7 +60,7 @@ <!-- DOM Data Broker for context data --> <module> - <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:honeycomb-context-dom-data-broker</type> + <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:honeycomb-context-dom-data-broker</type> <name>honeycomb-context-data-broker</name> <!-- With persistence --> <context-data-tree> diff --git a/infra/impl/src/main/config/default-config.xml b/infra/impl/src/main/config/default-config.xml index c817a5db3..9e63917cd 100644 --- a/infra/impl/src/main/config/default-config.xml +++ b/infra/impl/src/main/config/default-config.xml @@ -16,7 +16,7 @@ --> <snapshot> <required-capabilities> - <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&revision=2014-12-10</capability> + <capability>urn:opendaylight:params:xml:ns:yang:honeycomb:impl?module=honeycomb-impl&revision=2014-12-10</capability> <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&revision=2016-04-06</capability> <capability>urn:honeycomb:params:xml:ns:yang:data:api?module=data-api&revision=2016-04-11</capability> <capability>urn:honeycomb:params:xml:ns:yang:data:impl?module=data-impl&revision=2016-04-11</capability> @@ -116,7 +116,7 @@ <!-- DOM data broker which provides transaction functionality for HC using BI format--> <module> - <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:honeycomb-dom-data-broker</type> + <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:honeycomb-dom-data-broker</type> <name>honeycomb-dom-data-broker</name> <config-data-tree> <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-modifiable-data-tree</type> @@ -150,8 +150,8 @@ </module> <module> - <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:v3po</type> - <name>v3po-default</name> + <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:honeycomb</type> + <name>honeycomb-default</name> <dom-broker> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-broker-osgi-registry</type> <name>dom-broker</name> @@ -242,8 +242,8 @@ dom:dom-broker-osgi-registry </type> <instance> - <name>vpp-dom-broker</name> - <provider>/modules/module[type='v3po'][name='v3po-default']</provider> + <name>honeycomb-dom-broker</name> + <provider>/modules/module[type='honeycomb'][name='honeycomb-default']</provider> </instance> </service> diff --git a/infra/impl/src/main/config/initializer-config.xml b/infra/impl/src/main/config/initializer-config.xml index f46069340..0b87e42dc 100644 --- a/infra/impl/src/main/config/initializer-config.xml +++ b/infra/impl/src/main/config/initializer-config.xml @@ -19,9 +19,9 @@ <snapshot> <required-capabilities> - <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&revision=2014-12-10</capability> + <capability>urn:opendaylight:params:xml:ns:yang:honeycomb:impl?module=honeycomb-impl&revision=2014-12-10</capability> <capability>urn:honeycomb:params:xml:ns:yang:translate:utils?module=translate-utils&revision=2016-04-06</capability> - <capability>urn:honeycomb:params:xml:ns:yang:vpp:data:init?module=vpp-cfg-init&revision=2016-04-07</capability> + <capability>urn:honeycomb:params:xml:ns:yang:data:init?module=cfg-init&revision=2016-04-07</capability> <capability>urn:honeycomb:params:xml:ns:yang:data:api?module=data-api&revision=2016-04-11</capability> <capability>urn:honeycomb:params:xml:ns:yang:data:impl?module=data-impl&revision=2016-04-11</capability> <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28</capability> @@ -60,7 +60,7 @@ </module> <!-- DOM data broker for config initialization --> <module> - <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:honeycomb-dom-data-broker</type> + <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:honeycomb-dom-data-broker</type> <name>cfg-init-dom-data-broker</name> <config-data-tree> <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:api">prefix:honeycomb-modifiable-data-tree</type> @@ -92,7 +92,7 @@ </module> <module> - <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:persisted-file-initializer</type> + <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:persisted-file-initializer</type> <name>persisted-context-initializer</name> <dom-data-broker> <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-async-data-broker</type> @@ -107,7 +107,7 @@ <datastore-type>oper</datastore-type> </module> <module> - <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:persisted-file-initializer</type> + <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:persisted-file-initializer</type> <name>persisted-config-initializer</name> <dom-data-broker> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">prefix:dom-async-data-broker</type> @@ -123,14 +123,14 @@ </module> <module> - <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer-registry</type> + <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer-registry</type> <name>initializer-registry</name> <persisted-context-initializer> - <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type> + <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type> <name>persisted-context-initializer</name> </persisted-context-initializer> <persisted-config-initializer> - <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type> + <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type> <name>persisted-config-initializer</name> </persisted-config-initializer> </module> @@ -170,7 +170,7 @@ </service> <service> - <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:vpp:data:init">prefix:cfg-initializer</type> + <type xmlns:prefix="urn:honeycomb:params:xml:ns:yang:data:init">prefix:cfg-initializer</type> <instance> <name>persisted-context-initializer</name> <provider>/modules/module[type='persisted-file-initializer'][name='persisted-context-initializer'] diff --git a/infra/impl/src/main/config/netconf-north-config.xml b/infra/impl/src/main/config/netconf-north-config.xml index 35bd5ff04..8e6f17019 100644 --- a/infra/impl/src/main/config/netconf-north-config.xml +++ b/infra/impl/src/main/config/netconf-north-config.xml @@ -83,7 +83,7 @@ </module> <module> <!--binding-broker-osgi-registry--> - <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:binding-broker-netconf</type> + <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:binding-broker-netconf</type> <name>binding-broker-netconf</name> <netconf-binding-broker> <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type> @@ -96,7 +96,7 @@ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper"> prefix:netconf-mdsal-mapper </type> - <name>netconf-vpp-mapper</name> + <name>netconf-honeycomb-mapper</name> <root-schema-service> <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service </type> @@ -112,13 +112,13 @@ <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom"> dom:dom-broker-osgi-registry </type> - <name>vpp-dom-broker</name> + <name>honeycomb-dom-broker</name> </dom-broker> <mapper-aggregator xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper"> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper"> prefix:netconf-mapper-registry </type> - <name>vpp-mapper-aggregator-registry</name> + <name>honeycomb-mapper-aggregator-registry</name> </mapper-aggregator> </module> @@ -126,19 +126,19 @@ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl"> prefix:netconf-server-dispatcher-impl </type> - <name>netconf-vpp-server-dispatcher</name> + <name>netconf-honeycomb-server-dispatcher</name> <mappers xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl"> <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper"> dom:netconf-northbound-mapper </type> - <name>vpp-mapper-aggregator</name> + <name>honeycomb-mapper-aggregator</name> </mappers> <server-monitor xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl"> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound"> prefix:netconf-server-monitoring </type> - <name>vpp-server-monitor</name> + <name>honeycomb-server-monitor</name> </server-monitor> <boss-thread-group xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl"> @@ -165,12 +165,12 @@ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring"> prefix:netconf-mdsal-monitoring-mapper </type> - <name>netconf-vpp-monitoring-mapper</name> + <name>netconf-honeycomb-monitoring-mapper</name> <server-monitoring xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring"> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound"> prefix:netconf-server-monitoring </type> - <name>vpp-server-monitor</name> + <name>honeycomb-server-monitor</name> </server-monitoring> <binding-aware-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:monitoring"> @@ -183,7 +183,7 @@ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper"> prefix:netconf-mapper-registry </type> - <name>vpp-mapper-aggregator-registry</name> + <name>honeycomb-mapper-aggregator-registry</name> </aggregator> </module> @@ -191,19 +191,19 @@ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl"> prefix:netconf-mapper-aggregator </type> - <name>vpp-mapper-aggregator</name> + <name>honeycomb-mapper-aggregator</name> </module> <module> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl"> prefix:netconf-server-monitoring-impl </type> - <name>vpp-server-monitor</name> + <name>honeycomb-server-monitor</name> <aggregator xmlns="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound:impl"> <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper"> dom:netconf-northbound-mapper </type> - <name>vpp-mapper-aggregator</name> + <name>honeycomb-mapper-aggregator</name> </aggregator> </module> @@ -218,7 +218,7 @@ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh"> prefix:netconf-northbound-ssh </type> - <name>netconf-vpp-ssh-server</name> + <name>netconf-honeycomb-ssh-server</name> <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh">2830</port> <event-executor xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh"> @@ -243,7 +243,7 @@ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound"> prefix:netconf-server-dispatcher </type> - <name>netconf-vpp-server-dispatcher</name> + <name>netconf-honeycomb-server-dispatcher</name> </dispatcher> <auth-provider xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:ssh"> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:auth"> @@ -257,14 +257,14 @@ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification:impl"> prefix:netconf-notification-manager </type> - <name>vpp-netconf-notification-manager</name> + <name>honeycomb-netconf-notification-manager</name> </module> <module> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification"> prefix:netconf-mdsal-notification-mapper </type> - <name>netconf-vpp-notification-mapper</name> + <name>netconf-honeycomb-notification-mapper</name> <!--This is used to listen to netconf-state/capabilities changes to send out notifications--> <data-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification"> <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding"> @@ -284,20 +284,20 @@ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:north:mapper"> prefix:netconf-mapper-registry </type> - <name>vpp-mapper-aggregator-registry</name> + <name>honeycomb-mapper-aggregator-registry</name> </aggregator> <notification-registry xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:notification"> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification"> prefix:netconf-notification-registry </type> - <name>vpp-netconf-notification-manager</name> + <name>honeycomb-netconf-notification-manager</name> </notification-registry> <notification-collector> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:notification"> prefix:netconf-notification-collector </type> - <name>vpp-netconf-notification-manager</name> + <name>honeycomb-netconf-notification-manager</name> </notification-collector> </module> @@ -307,12 +307,12 @@ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp"> prefix:netconf-northbound-tcp </type> - <name>netconf-vpp-tcp-server</name> + <name>netconf-honeycomb-tcp-server</name> <dispatcher xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp"> <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:netconf:northbound"> prefix:netconf-server-dispatcher </type> - <name>netconf-vpp-server-dispatcher</name> + <name>netconf-honeycomb-server-dispatcher</name> </dispatcher> <port xmlns="urn:opendaylight:params:xml:ns:yang:controller:netconf:northbound:tcp">7777</port> </module> @@ -321,7 +321,7 @@ However netconf is wired to our reader registry, so we need to delegate the reads of netconf-monitoring through our readers to the dedicated DS--> <module> - <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:v3po:impl">prefix:netconf-monitoring-reader</type> + <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:honeycomb:impl">prefix:netconf-monitoring-reader</type> <name>netconf-monitoring-reader</name> <netconf-monitoring-binding-broker> <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type> @@ -394,8 +394,8 @@ prefix:netconf-server-monitoring </type> <instance> - <name>vpp-server-monitor</name> - <provider>/modules/module[type='netconf-server-monitoring-impl'][name='vpp-server-monitor'] + <name>honeycomb-server-monitor</name> + <provider>/modules/module[type='netconf-server-monitoring-impl'][name='honeycomb-server-monitor'] </provider> </instance> </service> @@ -404,8 +404,8 @@ prefix:netconf-northbound-mapper </type> <instance> - <name>netconf-vpp-mapper</name> - <provider>/modules/module[type='netconf-mdsal-mapper'][name='netconf-vpp-mapper']</provider> + <name>netconf-honeycomb-mapper</name> + <provider>/modules/module[type='netconf-mdsal-mapper'][name='netconf-honeycomb-mapper']</provider> </instance> </service> <service> @@ -413,8 +413,8 @@ prefix:netconf-northbound-mapper </type> <instance> - <name>vpp-mapper-aggregator</name> - <provider>/modules/module[type='netconf-mapper-aggregator'][name='vpp-mapper-aggregator']</provider> + <name>honeycomb-mapper-aggregator</name> + <provider>/modules/module[type='netconf-mapper-aggregator'][name='honeycomb-mapper-aggregator']</provider> </instance> </service> <service> @@ -422,8 +422,8 @@ prefix:netconf-mapper-registry </type> <instance> - <name>vpp-mapper-aggregator-registry</name> - <provider>/modules/module[type='netconf-mapper-aggregator'][name='vpp-mapper-aggregator']</provider> + <name>honeycomb-mapper-aggregator-registry</name> + <provider>/modules/module[type='netconf-mapper-aggregator'][name='honeycomb-mapper-aggregator']</provider> </instance> </service> <service> @@ -431,9 +431,9 @@ prefix:netconf-server-dispatcher </type> <instance> - <name>netconf-vpp-server-dispatcher</name> + <name>netconf-honeycomb-server-dispatcher</name> <provider> - /modules/module[type='netconf-server-dispatcher-impl'][name='netconf-vpp-server-dispatcher'] + /modules/module[type='netconf-server-dispatcher-impl'][name='netconf-honeycomb-server-dispatcher'] </provider> </instance> </service> @@ -442,9 +442,9 @@ prefix:netconf-northbound-mapper </type> <instance> - <name>netconf-vpp-notification-mapper</name> + <name>netconf-honeycomb-notification-mapper</name> <provider> - /modules/module[type='netconf-mdsal-notification-mapper'][name='netconf-vpp-notification-mapper'] + /modules/module[type='netconf-mdsal-notification-mapper'][name='netconf-honeycomb-notification-mapper'] </provider> </instance> </service> @@ -453,9 +453,9 @@ prefix:netconf-notification-collector </type> <instance> - <name>vpp-netconf-notification-manager</name> + <name>honeycomb-netconf-notification-manager</name> <provider> - /modules/module[type='netconf-notification-manager'][name='vpp-netconf-notification-manager'] + /modules/module[type='netconf-notification-manager'][name='honeycomb-netconf-notification-manager'] </provider> </instance> </service> @@ -464,9 +464,9 @@ prefix:netconf-notification-registry </type> <instance> - <name>vpp-netconf-notification-manager</name> + <name>honeycomb-netconf-notification-manager</name> <provider> - /modules/module[type='netconf-notification-manager'][name='vpp-netconf-notification-manager'] + /modules/module[type='netconf-notification-manager'][name='honeycomb-netconf-notification-manager'] </provider> </instance> </service> @@ -475,7 +475,7 @@ </data> </configuration> <required-capabilities> - <capability>urn:opendaylight:params:xml:ns:yang:v3po:impl?module=v3po-impl&revision=2014-12-10</capability> + <capability>urn:opendaylight:params:xml:ns:yang:honeycomb:impl?module=honeycomb-impl&revision=2014-12-10</capability> <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28</capability> <capability>urn:opendaylight:params:xml:ns:yang:controller:netconf:mdsal:mapper?module=netconf-mdsal-mapper&revision=2015-01-14</capability> <capability> diff --git a/infra/impl/src/main/config/restconf-north-config.xml b/infra/impl/src/main/config/restconf-north-config.xml index ff2cdac18..00599b62c 100644 --- a/infra/impl/src/main/config/restconf-north-config.xml +++ b/infra/impl/src/main/config/restconf-north-config.xml @@ -24,7 +24,7 @@ <!-- Reconfiguring the default restconf northbound instance, to wire it just to honeycomb broker facade --> <dom-broker> <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type> - <name>vpp-dom-broker</name> + <name>honeycomb-dom-broker</name> </dom-broker> </module> </modules> diff --git a/infra/impl/src/main/java/io/fd/honeycomb/v3po/impl/NorthboundFacadeHoneycombDOMBroker.java b/infra/impl/src/main/java/io/fd/honeycomb/impl/NorthboundFacadeHoneycombDOMBroker.java index c2d70c38c..7e5dfd873 100644 --- a/infra/impl/src/main/java/io/fd/honeycomb/v3po/impl/NorthboundFacadeHoneycombDOMBroker.java +++ b/infra/impl/src/main/java/io/fd/honeycomb/impl/NorthboundFacadeHoneycombDOMBroker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.fd.honeycomb.v3po.impl; +package io.fd.honeycomb.impl; import com.google.common.base.Optional; import com.google.common.collect.Maps; diff --git a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/ContextDataBrokerModule.java b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/ContextDataBrokerModule.java index 1d1fa5323..c2f7d688a 100644 --- a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/ContextDataBrokerModule.java +++ b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/ContextDataBrokerModule.java @@ -1,15 +1,15 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210; -import io.fd.honeycomb.v3po.data.impl.DataBroker; -import io.fd.honeycomb.v3po.data.impl.ModifiableDataTreeManager; +import io.fd.honeycomb.data.impl.DataBroker; +import io.fd.honeycomb.data.impl.ModifiableDataTreeManager; -public class ContextDataBrokerModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractContextDataBrokerModule { +public class ContextDataBrokerModule extends AbstractContextDataBrokerModule { public ContextDataBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public ContextDataBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.ContextDataBrokerModule oldModule, java.lang.AutoCloseable oldInstance) { + public ContextDataBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, ContextDataBrokerModule oldModule, java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } diff --git a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/ContextDataBrokerModuleFactory.java b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/ContextDataBrokerModuleFactory.java index 360f5f472..e07214b2e 100644 --- a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/ContextDataBrokerModuleFactory.java +++ b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/ContextDataBrokerModuleFactory.java @@ -7,7 +7,7 @@ * * Do not modify this file unless it is present under src/main directory */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; -public class ContextDataBrokerModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractContextDataBrokerModuleFactory { +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210; +public class ContextDataBrokerModuleFactory extends AbstractContextDataBrokerModuleFactory { } diff --git a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/DataBrokerModule.java b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/DataBrokerModule.java index 8aa3d64d9..d97573e12 100644 --- a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/DataBrokerModule.java +++ b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/DataBrokerModule.java @@ -1,11 +1,11 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210; -import io.fd.honeycomb.v3po.data.impl.DataBroker; +import io.fd.honeycomb.data.impl.DataBroker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class DataBrokerModule extends - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractDataBrokerModule { + AbstractDataBrokerModule { private static final Logger LOG = LoggerFactory.getLogger(DataBrokerModule.class); @@ -16,7 +16,7 @@ public class DataBrokerModule extends public DataBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.DataBrokerModule oldModule, + DataBrokerModule oldModule, java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } diff --git a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/DataBrokerModuleFactory.java b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/DataBrokerModuleFactory.java index cc30beacf..388f26c67 100644 --- a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/DataBrokerModuleFactory.java +++ b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/DataBrokerModuleFactory.java @@ -7,7 +7,7 @@ * * Do not modify this file unless it is present under src/main directory */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; -public class DataBrokerModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractDataBrokerModuleFactory { +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210; +public class DataBrokerModuleFactory extends AbstractDataBrokerModuleFactory { } diff --git a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModule.java b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/HoneycombModule.java index caa792da4..333219518 100644 --- a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModule.java +++ b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/HoneycombModule.java @@ -14,25 +14,24 @@ * limitations under the License. */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210; -import io.fd.honeycomb.v3po.impl.NorthboundFacadeHoneycombDOMBroker; +import io.fd.honeycomb.impl.NorthboundFacadeHoneycombDOMBroker; import org.opendaylight.controller.sal.core.api.AbstractProvider; import org.opendaylight.controller.sal.core.api.Broker; import org.opendaylight.controller.sal.core.api.model.SchemaService; -public class V3poModule extends - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractV3poModule { +public class HoneycombModule extends AbstractHoneycombModule { - public V3poModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { + public HoneycombModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, + org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public V3poModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.V3poModule oldModule, - java.lang.AutoCloseable oldInstance) { + public HoneycombModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, + org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, + HoneycombModule oldModule, + java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } diff --git a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleFactory.java b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/HoneycombModuleFactory.java index 5c942861d..2e7b0956f 100644 --- a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleFactory.java +++ b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/HoneycombModuleFactory.java @@ -22,7 +22,7 @@ * * Do not modify this file unless it is present under src/main directory */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; -public class V3poModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractV3poModuleFactory { +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210; +public class HoneycombModuleFactory extends AbstractHoneycombModuleFactory { } diff --git a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfBindingBrokerModule.java b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/NetconfBindingBrokerModule.java index 48d227d01..12fdcfe35 100644 --- a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfBindingBrokerModule.java +++ b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/NetconfBindingBrokerModule.java @@ -1,4 +1,4 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener; @@ -12,12 +12,12 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.RpcService; import org.osgi.framework.BundleContext; -public class NetconfBindingBrokerModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractNetconfBindingBrokerModule { +public class NetconfBindingBrokerModule extends AbstractNetconfBindingBrokerModule { public NetconfBindingBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public NetconfBindingBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.NetconfBindingBrokerModule oldModule, java.lang.AutoCloseable oldInstance) { + public NetconfBindingBrokerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, NetconfBindingBrokerModule oldModule, java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } diff --git a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfBindingBrokerModuleFactory.java b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/NetconfBindingBrokerModuleFactory.java index b64b0b1e1..fe9bdcf48 100644 --- a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfBindingBrokerModuleFactory.java +++ b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/NetconfBindingBrokerModuleFactory.java @@ -7,7 +7,7 @@ * * Do not modify this file unless it is present under src/main directory */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; -public class NetconfBindingBrokerModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractNetconfBindingBrokerModuleFactory { +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210; +public class NetconfBindingBrokerModuleFactory extends AbstractNetconfBindingBrokerModuleFactory { } diff --git a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModule.java b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/NetconfMonitoringReaderModule.java index 8502fcbd2..5b9a8b819 100644 --- a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModule.java +++ b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/NetconfMonitoringReaderModule.java @@ -1,19 +1,19 @@ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210; -import io.fd.honeycomb.v3po.translate.read.registry.ModifiableReaderRegistryBuilder; -import io.fd.honeycomb.v3po.translate.util.read.BindingBrokerReader; +import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; +import io.fd.honeycomb.translate.util.read.BindingBrokerReader; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfStateBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public class NetconfMonitoringReaderModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractNetconfMonitoringReaderModule { +public class NetconfMonitoringReaderModule extends AbstractNetconfMonitoringReaderModule { public NetconfMonitoringReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public NetconfMonitoringReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.NetconfMonitoringReaderModule oldModule, java.lang.AutoCloseable oldInstance) { + public NetconfMonitoringReaderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, NetconfMonitoringReaderModule oldModule, java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } @@ -28,7 +28,7 @@ public class NetconfMonitoringReaderModule extends org.opendaylight.yang.gen.v1. } - private static final class ReaderFactory implements AutoCloseable, io.fd.honeycomb.v3po.translate.read.ReaderFactory { + private static final class ReaderFactory implements AutoCloseable, io.fd.honeycomb.translate.read.ReaderFactory { private final DataBroker netconfMonitoringBindingBrokerDependency; diff --git a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModuleFactory.java b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/NetconfMonitoringReaderModuleFactory.java index b8b7bec63..d5130fd53 100644 --- a/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/NetconfMonitoringReaderModuleFactory.java +++ b/infra/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/honeycomb/impl/rev141210/NetconfMonitoringReaderModuleFactory.java @@ -7,7 +7,7 @@ * * Do not modify this file unless it is present under src/main directory */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; -public class NetconfMonitoringReaderModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210.AbstractNetconfMonitoringReaderModuleFactory { +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.honeycomb.impl.rev141210; +public class NetconfMonitoringReaderModuleFactory extends AbstractNetconfMonitoringReaderModuleFactory { } diff --git a/infra/impl/src/main/yang/v3po-impl.yang b/infra/impl/src/main/yang/honeycomb-impl.yang index fa9670678..46f1af862 100644 --- a/infra/impl/src/main/yang/v3po-impl.yang +++ b/infra/impl/src/main/yang/honeycomb-impl.yang @@ -1,7 +1,7 @@ -module v3po-impl { +module honeycomb-impl { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:v3po:impl"; - prefix "v3po-impl"; + namespace "urn:opendaylight:params:xml:ns:yang:honeycomb:impl"; + prefix "hc-impl"; import config { prefix config; revision-date 2013-04-05; } import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} @@ -11,22 +11,22 @@ module v3po-impl { import notification-api { prefix hc-notif-a; revision-date 2016-06-01; } description - "Service definition for v3po project"; + "Service definition for honeycomb project"; revision "2014-12-10" { description "Initial revision"; } - identity v3po { + identity honeycomb { base config:module-type; config:provided-service dom:dom-broker-osgi-registry; - config:java-name-prefix V3po; + config:java-name-prefix Honeycomb; } augment "/config:modules/config:module/config:configuration" { - case v3po { - when "/config:modules/config:module/config:type = 'v3po'"; + case honeycomb { + when "/config:modules/config:module/config:type = 'honeycomb'"; container dom-broker { uses config:service-ref { refine type { diff --git a/infra/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleFactoryTest.java b/infra/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleFactoryTest.java deleted file mode 100644 index 5b9a67458..000000000 --- a/infra/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleFactoryTest.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2015 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. - */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; - -import org.junit.Test; - -public class V3poModuleFactoryTest { - @Test - public void testFactoryConstructor() { - // ensure no exceptions on construction - new V3poModuleFactory(); - } -} diff --git a/infra/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleTest.java b/infra/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleTest.java deleted file mode 100644 index 3d8e79641..000000000 --- a/infra/impl/src/test/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModuleTest.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2015 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. - */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import javax.management.ObjectName; -import org.junit.Test; -import org.opendaylight.controller.config.api.DependencyResolver; -import org.opendaylight.controller.config.api.JmxAttribute; -import org.opendaylight.controller.config.api.ModuleIdentifier; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.core.api.Broker; -import org.opendaylight.controller.sal.core.api.Provider; -import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; - -public class V3poModuleTest { - @Test - public void testCustomValidation() { - V3poModule module = new V3poModule(mock(ModuleIdentifier.class), mock(DependencyResolver.class)); - - // ensure no exceptions on validation - // currently this method is empty - module.customValidation(); - } - - @Test - public void testCreateInstance() throws Exception { - // configure mocks - DependencyResolver dependencyResolver = mock(DependencyResolver.class); - BindingAwareBroker broker = mock(BindingAwareBroker.class); - when(dependencyResolver.resolveInstance(eq(BindingAwareBroker.class), any(ObjectName.class), any(JmxAttribute.class))) - .thenReturn(broker); - final org.opendaylight.controller.sal.core.api.Broker domBroker = mock(org.opendaylight.controller.sal.core.api.Broker.class); - when(dependencyResolver.resolveInstance(eq(org.opendaylight.controller.sal.core.api.Broker.class), any(ObjectName.class), any(JmxAttribute.class))) - .thenReturn(domBroker); - doReturn(mock(Broker.ProviderSession.class)).when(domBroker).registerProvider(any(Provider.class)); - when(dependencyResolver.resolveInstance(eq(BindingNormalizedNodeSerializer.class), any(ObjectName.class), any(JmxAttribute.class))) - .thenReturn(mock(BindingNormalizedNodeSerializer.class)); - when(dependencyResolver.resolveInstance(eq(DOMDataBroker.class), any(ObjectName.class), any(JmxAttribute.class))) - .thenReturn(mock(DOMDataBroker.class)); - - // create instance of module with injected mocks - V3poModule module = new V3poModule(mock(ModuleIdentifier.class), dependencyResolver); - - // getInstance calls resolveInstance to get the broker dependency and then calls createInstance - AutoCloseable closeable = module.getInstance(); - - // ensure no exceptions on close - closeable.close(); - } -} |