+++ /dev/null
-etc/
-data/
-target/
-target-ide/
-*.class
-.settings
-.project
-.classpath
-.checkstyle
-.fbExcludeFilterFile
-.tox
-*.iml
-.idea
-.fbExcludeFilterFile
-.vscode/
-.factorypath
-/.apt_generated_tests/
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<!--
- Copyright (c) 2014, 2015 Cisco Systems, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
- <mirrors>
- <mirror>
- <id>ODL</id>
- <name>OpenDaylight's Nexus</name>
- <url>https://nexus.opendaylight.org/content/groups/public/</url>
-
- <!-- https://github.com/vorburger/opendaylight-simple/issues/37 -->
- <mirrorOf>central,apache.snapshots,apache-snapshot,apache-snapshots,sonatype-snapshots,sonatype-nexus-snapshots,jetty-snapshots,codehaus-snapshots,codehaus.org,ow2-snapshot,ops4j.sonatype.snapshots.deploy,fusesource.nexus.snapshot,release.maven.java.net,jvnet-nexus-snapshots,spring-external,glassfish-repo-archive,glassfish-repository,terracotta-release,terracotta-releases,terracotta-snapshots</mirrorOf>
- </mirror>
- </mirrors>
-
- <profiles>
- <profile>
- <id>opendaylight-release</id>
- <repositories>
- <repository>
- <id>opendaylight-mirror</id>
- <name>opendaylight-mirror</name>
- <url>https://nexus.opendaylight.org/content/repositories/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>opendaylight-mirror</id>
- <name>opendaylight-mirror</name>
- <url>https://nexus.opendaylight.org/content/repositories/public/</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
-
- <profile>
- <id>opendaylight-snapshots</id>
- <repositories>
- <repository>
- <id>opendaylight-snapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>opendaylight-snapshot</id>
- <name>opendaylight-snapshot</name>
- <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-
- <activeProfiles>
- <activeProfile>opendaylight-release</activeProfile>
- <activeProfile>opendaylight-snapshots</activeProfile>
- </activeProfiles>
-</settings>
+++ /dev/null
-language: java
-
-sudo: false
-
-cache:
- directories:
- - "$HOME/.m2"
-
-jdk:
- - openjdk8
-
-install: true
-
-script:
- - mvn -U -s .travis-maven-settings.xml clean package -B -V
-
-deploy:
- provider: releases
- skip_cleanup: true
- overwrite: true
- api_key:
- secure: GhGeuJXyUZeRV6BwVznI8+/Hy4G9MAQHZ2hPveOkuj1IHbVAqQqLChIwzllc3FhzU+dr5Fn+TnqKA4Pw4pwgq5C5OKMFSFG1qld9r6J30NPqiCmiwYBjauhuDIwoAXjkzMJYALUo050lu7kZ2chcDubB13t9lokJTBvuOIA0fUV1FD35r3/1JlaGo4QYc9RkSrf/GJeouJNXZ2jI/pm8Npa6MWSsOIpmnwKePYrj6DvE1bWR2S0/5jzL/anc32LBLZpBXM82MPUW8iUvCXX9+Z+a6NiIWLl7BEsLVKt3H5awhCLEt1y1eviJMPvVRqDGh+D4yWat/G0BqjUQCSg2CW6Rk+wnpk7cOm+6FUzfCLnol7JigDH9aB4B2AgFEHju8isOWswi6J2uxPOGQD3CdAspCZIvgbqZhpkalCNdPo4BmpZUrPvK8UQ1bMAfT4mMoRbsw6RA54Z0TwUtrlDvXnX+FL6D2lOpauQfxQcifRG5lpJ2xabcTS3RO0tlIQvPz/Z7kxGiuj6Pdcepv+p+NqMisaN2oGX7+QuB5Wtr9xLiayoV6wJX/iV8sWTX+CXSkpEz/5zU5BJ1c7PVMUnb8cr6Qa8CQabP0SUNecoljPtgL6NDmW0+6aONfcMNqJR5POs41N0MGj7bWQvCpiWDhNQs7oYkBNop/lIngQAj1d0=
- file: target/poc-1.0.0-SNAPSHOT-simple.tar
- on:
- repo: vorburger/opendaylight-simple
+++ /dev/null
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation
- distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
- i) changes to the Program, and
- ii) additions to the Program;
-
- where such changes and/or additions to the Program originate from and are
- distributed by that particular Contributor. A Contribution 'originates'
- from a Contributor if it was added to the Program by such Contributor
- itself or anyone acting on such Contributor's behalf. Contributions do not
- include additions to the Program which: (i) are separate modules of
- software distributed in conjunction with the Program under their own
- license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are
-necessarily infringed by the use or sale of its Contribution alone or when
-combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this
-Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
-
-2. GRANT OF RIGHTS
- a) Subject to the terms of this Agreement, each Contributor hereby grants
- Recipient a non-exclusive, worldwide, royalty-free copyright license to
- reproduce, prepare derivative works of, publicly display, publicly
- perform, distribute and sublicense the Contribution of such Contributor,
- if any, and such derivative works, in source code and object code form.
- b) Subject to the terms of this Agreement, each Contributor hereby grants
- Recipient a non-exclusive, worldwide, royalty-free patent license under
- Licensed Patents to make, use, sell, offer to sell, import and otherwise
- transfer the Contribution of such Contributor, if any, in source code and
- object code form. This patent license shall apply to the combination of
- the Contribution and the Program if, at the time the Contribution is
- added by the Contributor, such addition of the Contribution causes such
- combination to be covered by the Licensed Patents. The patent license
- shall not apply to any other combinations which include the Contribution.
- No hardware per se is licensed hereunder.
- c) Recipient understands that although each Contributor grants the licenses
- to its Contributions set forth herein, no assurances are provided by any
- Contributor that the Program does not infringe the patent or other
- intellectual property rights of any other entity. Each Contributor
- disclaims any liability to Recipient for claims brought by any other
- entity based on infringement of intellectual property rights or
- otherwise. As a condition to exercising the rights and licenses granted
- hereunder, each Recipient hereby assumes sole responsibility to secure
- any other intellectual property rights needed, if any. For example, if a
- third party patent license is required to allow Recipient to distribute
- the Program, it is Recipient's responsibility to acquire that license
- before distributing the Program.
- d) Each Contributor represents that to its knowledge it has sufficient
- copyright rights in its Contribution, if any, to grant the copyright
- license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under
-its own license agreement, provided that:
-
- a) it complies with the terms and conditions of this Agreement; and
- b) its license agreement:
- i) effectively disclaims on behalf of all Contributors all warranties
- and conditions, express and implied, including warranties or
- conditions of title and non-infringement, and implied warranties or
- conditions of merchantability and fitness for a particular purpose;
- ii) effectively excludes on behalf of all Contributors all liability for
- damages, including direct, indirect, special, incidental and
- consequential damages, such as lost profits;
- iii) states that any provisions which differ from this Agreement are
- offered by that Contributor alone and not by any other party; and
- iv) states that source code for the Program is available from such
- Contributor, and informs licensees how to obtain it in a reasonable
- manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
- a) it must be made available under this Agreement; and
- b) a copy of this Agreement must be included with each copy of the Program.
- Contributors may not remove or alter any copyright notices contained
- within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution,
-if
-any, in a manner that reasonably allows subsequent Recipients to identify the
-originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with
-respect to end users, business partners and the like. While this license is
-intended to facilitate the commercial use of the Program, the Contributor who
-includes the Program in a commercial product offering should do so in a manner
-which does not create potential liability for other Contributors. Therefore,
-if a Contributor includes the Program in a commercial product offering, such
-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
-every other Contributor ("Indemnified Contributor") against any losses,
-damages and costs (collectively "Losses") arising from claims, lawsuits and
-other legal actions brought by a third party against the Indemnified
-Contributor to the extent caused by the acts or omissions of such Commercial
-Contributor in connection with its distribution of the Program in a commercial
-product offering. The obligations in this section do not apply to any claims
-or Losses relating to any actual or alleged intellectual property
-infringement. In order to qualify, an Indemnified Contributor must:
-a) promptly notify the Commercial Contributor in writing of such claim, and
-b) allow the Commercial Contributor to control, and cooperate with the
-Commercial Contributor in, the defense and any related settlement
-negotiations. The Indemnified Contributor may participate in any such claim at
-its own expense.
-
-For example, a Contributor might include the Program in a commercial product
-offering, Product X. That Contributor is then a Commercial Contributor. If
-that Commercial Contributor then makes performance claims, or offers
-warranties related to Product X, those performance claims and warranties are
-such Commercial Contributor's responsibility alone. Under this section, the
-Commercial Contributor would have to defend claims against the other
-Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
-Recipient is solely responsible for determining the appropriateness of using
-and distributing the Program and assumes all risks associated with its
-exercise of rights under this Agreement , including but not limited to the
-risks and costs of program errors, compliance with applicable laws, damage to
-or loss of data, programs or equipment, and unavailability or interruption of
-operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION
-LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under
-applicable law, it shall not affect the validity or enforceability of the
-remainder of the terms of this Agreement, and without further action by the
-parties hereto, such provision shall be reformed to the minimum extent
-necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-(excluding combinations of the Program with other software or hardware)
-infringes such Recipient's patent(s), then such Recipient's rights granted
-under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to
-comply with any of the material terms or conditions of this Agreement and does
-not cure such failure in a reasonable period of time after becoming aware of
-such noncompliance. If all Recipient's rights under this Agreement terminate,
-Recipient agrees to cease use and distribution of the Program as soon as
-reasonably practicable. However, Recipient's obligations under this Agreement
-and any licenses granted by Recipient relating to the Program shall continue
-and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in
-order to avoid inconsistency the Agreement is copyrighted and may only be
-modified in the following manner. The Agreement Steward reserves the right to
-publish new versions (including revisions) of this Agreement from time to
-time. No one other than the Agreement Steward has the right to modify this
-Agreement. The Eclipse Foundation is the initial Agreement Steward. The
-Eclipse Foundation may assign the responsibility to serve as the Agreement
-Steward to a suitable separate entity. Each new version of the Agreement will
-be given a distinguishing version number. The Program (including
-Contributions) may always be distributed subject to the version of the
-Agreement under which it was received. In addition, after a new version of the
-Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly
-stated in Sections 2(a) and 2(b) above, Recipient receives no rights or
-licenses to the intellectual property of any Contributor under this Agreement,
-whether expressly, by implication, estoppel or otherwise. All rights in the
-Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the
-intellectual property laws of the United States of America. No party to this
-Agreement will bring a legal action under this Agreement more than one year
-after the cause of action arose. Each party waives its rights to a jury trial in
-any resulting litigation.
+++ /dev/null
-# opendaylight-simple [](https://travis-ci.org/vorburger/opendaylight-simple)
-
-Run a typical OpenDaylight SDN application such as CoE or netvirt without requiring the Apache Karaf OSGi runtime container.
-
-See this [presentation given in 2018.09 at the ODL DDF during ONS Europe in Amsterdam](https://docs.google.com/presentation/d/14TM9oCn0nLo7RJAhAHglXM4P6oTxsVjJBfFE1wl1qJc) for some background.
-
-Current status: Work in progress feasibility study to better evaluate required effort and gaps.
-
-Related "tech debt" clean up changes that are a result of this investigation
-[are slowly trickling into ODL](https://git.opendaylight.org/gerrit/#/q/topic:simple-dist) (and [web](https://git.opendaylight.org/gerrit/#/q/topic:simple-dist_web)).
-
-The goal of this project is to eventually upstream all work done here into EXISTING OpenDaylight projects, and eventually have 0 code left in this repo.
-We do not anticipate this to become a new ODL (or external) project.
-
-We currently use [Guice](https://github.com/google/guice) as dependency injection (DI) framework, instead the OSGi Blueprint (BP) implementation Apache Aries which is used in Karaf. This choice was made just because Guide was already used for "Component Tests" in ODL, and [infrautils has some useful related helpers](https://wiki.opendaylight.org/view/BestPractices/Component_Tests). ODL projects' code is not made to depend on Guice. We simply re-use declarative DI by `javax.inject` standard `@Singleton` & `@Inject` annotations, which [work for both Blueprint (with the blueprint-maven-plugin)](https://wiki.opendaylight.org/view/BestPractices/DI_Guidelines) as well as Guice. ODL projects are encouraged to migrate their use of `<bean>`, `<reference>` and `<service>` elements in BP XML to annotations to ease this integration. When we exceptionally need to "stitch together" objects in a non-trivial fashion (e.g. custom object factories & external configuration), we migrate BP XML logic into simple `*Wiring` classes. _Wiring_ classes are not Guice specific, but pure plain old simple Java. We then write small `*Module` classes, which are Guice specific, to tie everything together.
-
-This includes support for custom Karaf CLI Commands, based on the [ch.vorburger.karaf.simple](https://github.com/vorburger/ch.vorburger.karaf.simple) POC.
-
-## How to use in Dev
-
- One of the main advantages of developing with opendaylight-simple is that you DO NOT NEED TO build a package on the CLI to start it, like we are used to in ODL with Karaf. It's just simple standalone Java, so you just Run e.g. `GeniusMain` or `OpenFlowPluginWiringTest` & Co. directly in your favourite IDE!
-
- The build (`maven-assembly-plugin`) is surprisingly slow, and you would typically only use it to package and run in production on a remote server. Locally, in development, you do not have to leave your IDE anymore. The running code is, of course, identical - there is no OSGi/Karaf runtime "container" anymore now.
-
-## How to use in Prod
-
- mvn -s .travis-maven-settings.xml clean package
- cd target/poc-1.0.0-SNAPSHOT-simple/poc-1.0.0-SNAPSHOT
- java -cp "etc/initial/*:lib/*" org.opendaylight.genius.simple.GeniusMain
-
-You'll also find a `poc-*-simple.tar` in `target/` which contains `lib/*`.
-
-Configuration files, like e.g. the `serviceutils-upgrade-config.xml`, can be changed in the `etc/initial` directory (which is on the beginning of the classpath), where they are copied to on the first run.
-
-The use of the custom `.travis-maven-settings.xml` is required due to [issue TBD](https://github.com/vorburger/opendaylight-simple/issues/37).
-
-## FAQ
-
-* _Q: Is this goal of this project to get rid of the use of Apache Karaf in ODL?_ A: Yes, this project explores how to run ODL without Karaf. It illustrates this simply by building another distribution in parallel, see above. It's not necessarily a goal of this project to completely remove Karaf of all of OpenDaylight - that decision can be taken separately and in parallel by those needing distributions - perhaps some will still see any benefit in Karaf, while others won't anymore.
+++ /dev/null
-
-- [X] add genius.ItmWiring
-
-- [X] quid CLI commands? tep:show-state and tep:show pointers, see https://github.com/vorburger/ch.vorburger.karaf.simple
-
-- [X] fix broken ShellTestWiring so that it really finds commands that would not really work
-
-- [X] real logging, see https://logging.apache.org/log4j/2.x/manual/configuration.html and try -Dlog4j2.debug=true
-
-- [X] quit/shutdown shell
-
-- [X] working deployment
-
-- [X] working /diagstatus and showSvcStatus (#39) [waiting for infrautils merges]
-
-- [X] RestConfWiring with Web API
-
-- [ ] make RestConfConfig readable from YAML using http://immutables.github.io/json.html and update @ConfigImmutableStyle for it, then upstream to infrautils
-
-- [ ] ditch AAA and use Filter from Jetty for BASIC auth instead
-
-- [X] NeutronModule with Web API (req. by netvirt, but not genius)
-
-- [ ] ovsdb https://github.com/vorburger/opendaylight-simple/issues/47
-
-- [ ] CDS instead of in-memory DS: [CONTROLLER-1831](https://jira.opendaylight.org/browse/CONTROLLER-1831)
-
-- [X] OpenFlowPlugin wiring ConfigurationServiceFactoryImpl (OPNFLWPLUG-1037)
-- [X] OpenFlowPluginWiring PacketProcessingService <odl:action-provider>
-- [X] OpenFlowPlugin wiring
-
-- [ ] add a Dockerfile to build a demo container
-- [ ] create a Hello World toaster example
-- [ ] kubectl apply YAML to get started
-
-- [X] skitt's https://github.com/vorburger/opendaylight-simple/issues/38
-- [ ] DiagStatusWiring auto-discover ServiceStatusProvider
-- [ ] CLI commands, such as ItmWiring's TepShowState and DiagStatusCommand in DiagStatusWiring, which `implements Action`, should be auto-discovered
-
-- [X] packaging
-- [ ] https://github.com/vorburger/opendaylight-simple/issues/37 including:
-- [ ] why does maven-assembly-plugin dependencySet attempt to download from so many other Maven repos than only nexus.opendaylight.org
-- [ ] why does maven-assembly-plugin dependencySet attempt to download so many additional unsed dependencies, like Maven plugins's
-- [ ] why does maven-assembly-plugin dependencySet attempt to constantly re-download all SNAPSHOT unless we use -nsu -o
-- [ ] MINOR: why does "java -jar lib/ch.vorburger.opendaylight.simple.poc-1.5.0-SNAPSHOT.jar" not work? (MANIFEST.MF has all lib/*)
-
-- [X] [re-implement ClassPathScanner](https://github.com/vorburger/opendaylight-simple/pull/18#issuecomment-426859615) using [ClassGraph](https://github.com/classgraph/classgraph) used in [INFRAUTILS-52](https://jira.opendaylight.org/browse/INFRAUTILS-52) (and rename it to something more appropriate)
-
-- [X] read YANG XML configuration files using [DataStoreAppConfigDefaultXMLReader](https://git.opendaylight.org/gerrit/#/c/76416/3/opendaylight/blueprint/src/test/java/org/opendaylight/controller/blueprint/tests/DataStoreAppConfigDefaultXMLReaderTest.java)
-
-- [ ] run genius CSIT
-
-- [ ] do the same as this already did for genius for all of netvirt
-
-- [ ] run netvirt CSIT
-
-- [ ] clean up all problems found by duplicate-finder-maven-plugin upon "mvn verify" with <duplicate-finder.skip>false
-
-- [ ] dependency convergence with Maven Enforcer plugin
-
-- [ ] add all *Wiring+++ upstream, and make the project disappear
-
-- [ ] headless distribution without shell
-
-- [ ] Non Karaf shell? E.g. https://github.com/Mojang/brigadier, https://www.crashub.org (why deprecated in Spring?), ...
-
-- [ ] introduce new Maven profiles suitable for the simple new world in odlparent: `-Ps` to skip running `karaf-maven-plugin`, `SingleFeatureTest`, `karaf-plugin`, `depends-maven-plugin`, ...
-
-- [ ] upstream everything that is in this project, and have a netvirt/distribution/simple (next to netvirt/distribution/karaf)
-
-- [ ] Archive this project
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>parent</artifactId>
- <version>1.5.0</version>
- <relativePath />
- </parent>
-
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <properties>
- <!-- TODO remove this (to inherit the skip>false from infrautils' parent),
- as soon as all of https://git.opendaylight.org/gerrit/#/q/topic:simple-dist are in,
- notably e.g. https://git.opendaylight.org/gerrit/#/c/67179/ et al. (and we bumped odlparent) -->
- <duplicate-finder.skip>true</duplicate-finder.skip>
- </properties>
-
- <dependencyManagement>
- <!-- Order not alphabetically but by dependency tree hierarchy -->
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>infrautils-artifacts</artifactId>
- <version>1.5.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>yangtools-artifacts</artifactId>
- <version>2.1.8</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-artifacts</artifactId>
- <version>0.9.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>1.9.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-artifacts</artifactId>
- <version>3.0.6</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-artifacts</artifactId>
- <version>1.6.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>restconf-artifacts</artifactId>
- <version>1.9.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
-<!--
- <dependency>
- <groupId>org.opendaylight.neutron</groupId>
- <artifactId>neutron-artifacts</artifactId>
- <version>0.10.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.daexim</groupId>
- <artifactId>daexim-artifacts</artifactId>
- <version>1.3.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- -->
- <dependency>
- <groupId>org.opendaylight.netvirt</groupId>
- <artifactId>netvirt-artifacts</artifactId>
- <version>0.8.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
- <artifactId>jersey-guava</artifactId>
- <!-- TODO Figure out and clean up why we need this.. without it, you hit:
- java.lang.NoSuchMethodError: jersey.repackaged.com.google.common.collect.Iterables.concat(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/lang/Iterable; -->
- <version>2.8</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>compile</scope>
- </dependency>
- <!-- Logging related -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <!-- Must override odlparent's <scope>provided so that it gets bundled -->
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <!--controller-->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.10.0</version>
- <scope>compile</scope>
- </dependency>
-
- <!--mdsal-->
- <dependency>
- <!-- TODO remove this temporary v0.1 hack; see org.opendaylight.controller.simple.ControllerModule -->
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-broker-impl</artifactId>
- <type>test-jar</type>
- <scope>compile</scope>
-<!-- TODO
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- </exclusions>
- -->
- </dependency>
-
- </dependencies>
- <modules>
- <module>simple-core</module>
- <module>simple-netconf</module>
- <module>simple-openflowplugin</module>
- <module>simple-ovsdb</module>
- <!--module>simple-genius</module>
- <module>simple-netvirt</module>
- <module>simple-neutron</module>
- <module>simple-ovsdb</module-->
- </modules>
-
-</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <dependencies>
-
- <dependency>
- <groupId>org.immutables</groupId>
- <artifactId>value</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>blueprint-maven-plugin-annotation</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- TODO Remove pax-web-api dependency eventually -->
- <dependency>
- <groupId>org.ops4j.pax.web</groupId>
- <artifactId>pax-web-api</artifactId>
- </dependency>
-
- <!--mdsal-->
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-common</artifactId>
- <version>4.1.31.Final</version>
- </dependency>
-
- <!--infrautils-->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>diagstatus-api</artifactId>
- </dependency>
-
- <!--infrautils-->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>diagstatus-impl</artifactId>
- </dependency>
-
- <!--infrautils-->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>diagstatus-web</artifactId>
- </dependency>
-
-
- <!--infrautils-->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>metrics-impl</artifactId>
- </dependency>
-
- <!--infrautils-->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>jobcoordinator-api</artifactId>
- </dependency>
-
- <!--infrautils-->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>jobcoordinator-impl</artifactId>
- </dependency>
-
- <!--controller-->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>netty-event-executor-config</artifactId>
- <version>0.10.0</version>
- </dependency>
-
- <!--controller-->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>netty-threadgroup-config</artifactId>
- <version>0.10.0</version>
- </dependency>
-
- <!--controller-->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>netty-timer-config</artifactId>
- <version>0.10.0</version>
- </dependency>
-
- <!--controller-->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>threadpool-config-impl</artifactId>
- <version>0.10.0</version>
- </dependency>
-
- <!--mdsal-->
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-eos-dom-simple</artifactId>
- </dependency>
-
- <!--mdsal-->
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-eos-binding-api</artifactId>
- </dependency>
-
- <!--mdsal-->
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-singleton-common-api</artifactId>
- </dependency>
-
- <!--mdsal-->
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-singleton-dom-impl</artifactId>
- </dependency>
-
- <!--mdsal-->
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-eos-binding-adapter</artifactId>
- </dependency>
-
- <!--mdsal-->
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>mdsal-binding-dom-adapter</artifactId>
- </dependency>
-
- <!--mdsal-->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>sal-binding-broker-impl</artifactId>
- </dependency>
-
- <!--restconf-->
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>restconf-nb-rfc8040</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>restconf-nb-bierman02</artifactId>
- </dependency>
-
- <!--aaa-->
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-cert</artifactId>
- <version>0.9.0</version>
- <scope>compile</scope>
- </dependency>
-
- <!--aaa-->
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-encrypt-service-impl</artifactId>
- <version>0.9.0</version>
- </dependency>
-
- <!--aaa-->
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-shiro</artifactId>
- <version>0.9.0</version>
- </dependency>
-
- <!--aaa -->
- <!--dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-shiro-api</artifactId>
- <version>0.9.0</version>
- </dependency-->
-
- <!--aaa-->
- <!--dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-shiro-act</artifactId>
- <version>0.9.0</version>
- </dependency-->
-
- <!--aaa-->
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-authn-api</artifactId>
- <version>0.9.0</version>
- </dependency>
-
- <!--aaa-->
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>aaa-authn-odl-plugin</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.aaa.web</groupId>
- <artifactId>web-jetty-impl</artifactId>
- <version>0.9.0</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.aaa.web</groupId>
- <artifactId>servlet-jersey2</artifactId>
- <version>0.9.0</version>
- </dependency>
-
- <!--serviceutils-->
- <dependency>
- <groupId>org.opendaylight.serviceutils</groupId>
- <artifactId>srm-api</artifactId>
- <version>0.3.0</version>
- </dependency>
-
- <!--serviceutils-->
- <dependency>
- <groupId>org.opendaylight.serviceutils</groupId>
- <artifactId>srm-impl</artifactId>
- <version>0.3.0</version>
- </dependency>
-
- <!--serviceutils-->
- <dependency>
- <groupId>org.opendaylight.serviceutils</groupId>
- <artifactId>upgrade</artifactId>
- <version>0.3.0</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- TODO Align dropwizard.metrics in odlparent, controller and infrautils and ditch this -->
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <!-- This version must be kept in line with the one used in metrics-impl -->
- <version>4.0.3</version>
- </dependency>
- <dependency>
- <groupId>io.dropwizard.metrics</groupId>
- <artifactId>metrics-jvm</artifactId>
- <!-- This version must be kept in line with the one used in metrics-impl -->
- <version>4.0.3</version>
- </dependency>
-
- <!-- Implementation specials, these are not transitively inherited via the Karaf feature dependency -->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>caches-standard-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.yangtools</groupId>
- <artifactId>util</artifactId>
- </dependency>
-
- <!-- Logging related -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <!-- Must override odlparent's <scope>provided so that it gets bundled -->
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </dependency>
-
- <!--infrautils-->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>inject.guice</artifactId>
- </dependency>
-
- <!--infrautils-->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>inject.guice.testutils</artifactId>
- </dependency>
-
- <!--infrautils-->
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- <!-- TODO remove when we bumped to Guice 4.2.0,
- because there this is already included according to https://github.com/google/guice/wiki/Guice42;
- and if we never bump, then move this dependency into the (TBD) infrautils:inject.guice instead -->
- <version>4.1.0</version>
- </dependency>
-
- <!-- Now <scope>test... -->
- <dependency>
- <groupId>org.opendaylight.aaa.web</groupId>
- <artifactId>testutils</artifactId>
- <version>0.9.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>infrautils-testutils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>inject.guice.testutils</artifactId>
- <scope>compile</scope>
- <!-- TODO <scope>test</scope> instead of compile here once I'll create
- a new infrautils:inject.guice.testutils (non-testutils) for the run-time part.. -->
- </dependency>
- <!-- TODO remove, this is just a temporary hack, see above -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
- <!-- TODO remove when https://git.opendaylight.org/gerrit/#/c/67763/ is merged and odlparent bumped -->
- <dependency>
- <groupId>com.mycila.guice.extensions</groupId>
- <artifactId>mycila-guice-jsr250</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <!--controller-->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.10.0</version>
- <scope>compile</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <!-- TODO upstream version into odlparent pluginManagement -->
- <version>3.1.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- <!-- <classpathLayoutType>repository</classpathLayoutType> -->
- <classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
- <customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
- <formats>
- <format>dir</format>
- <format>tar</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
- <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-<!--
- <repositories>
- <repository>
- <outputDirectory>system</outputDirectory>
- </repository>
- </repositories>
--->
-</assembly>
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.aaa.simple;
-
-import javax.annotation.Nullable;
-import javax.inject.Singleton;
-
-import org.opendaylight.aaa.api.AuthenticationException;
-import org.opendaylight.aaa.api.Claim;
-import org.opendaylight.aaa.api.CredentialAuth;
-import org.opendaylight.aaa.api.PasswordCredentials;
-import org.opendaylight.aaa.shiro.tokenauthrealm.auth.ClaimBuilder;
-import org.opendaylight.aaa.shiro.tokenauthrealm.auth.PasswordCredentialBuilder;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-
-public class AAAModule extends AbstractModule {
-
- @Override
- protected void configure() {
- install(new CertModule());
- install(new ShiroModule());
- }
-
- @Provides
- @Singleton
- CredentialAuth<PasswordCredentials> getPasswordCredentialAuth() {
- PasswordCredentials passwordCredentials = new PasswordCredentialBuilder().setUserName("admin").setPassword("admin").setDomain("").build();
- return new CredentialAuth<PasswordCredentials>() {
-
- @Nullable
- @Override
- public Claim authenticate(PasswordCredentials cred) throws AuthenticationException {
- if (cred.equals(passwordCredentials)) {
- return new ClaimBuilder()
- .setUser("admin")
- .build();
- }
- return null;
- }
- };
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.aaa.simple;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import java.io.IOException;
-import java.security.Security;
-import javax.inject.Singleton;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.opendaylight.aaa.cert.api.ICertificateManager;
-import org.opendaylight.aaa.cert.impl.AaaCertRpcServiceImpl;
-import org.opendaylight.aaa.cert.impl.CertificateManagerService;
-import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.controller.simple.ConfigReader;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.AaaCertRpcService;
-
-/**
- * Guice wiring equivalent of AAA Cert BP XML in
- * aaa/aaa-cert/impl/src/main/resources/org/opendaylight/blueprint/aaaCert.xml.
- *
- * @author Michael Vorburger.ch
- */
-public class CertModule extends AbstractModule {
-
- static {
- Security.addProvider(new BouncyCastleProvider());
- }
-
- @Override
- protected void configure() {
- install(new EncryptModule());
- }
-
- @Provides
- @Singleton ICertificateManager certificateManagerService(AaaCertServiceConfig config, DataBroker db,
- AAAEncryptionService crypto) {
- return new CertificateManagerService(config, db, crypto);
- }
-
- @Provides
- @Singleton AaaCertServiceConfig getAaaCertServiceConfig(ConfigReader configReader) throws IOException {
- // TODO Urgh, CertificateManagerService is hard-coded to expect aaa-cert-config.xml to be in
- // etc/opendaylight/datastore/initial/config/aaa-cert-config.xml instead of in initial/aaa-cert-config.xml
- // and -more importantly- it *WRITES INTO IT* - OMG, what is that?!
- //
- // This _HACK_ prevents the WARN, but it should be changed in AAA:
-// File file = new File("etc/opendaylight/datastore/initial/config/aaa-cert-config.xml");
-// file.getParentFile().mkdirs();
-// Resources.asByteSource(Resources.getResource("initial/aaa-cert-config.xml")).copyTo(Files.asByteSink(file));
-
- return configReader.read("/initial/aaa-cert-config", AaaCertServiceConfig.class);
- }
-
- @Provides
- @Singleton
- AaaCertRpcService aaaCertRpcService(AaaCertServiceConfig config, DataBroker db, AAAEncryptionService crypt) {
- return new AaaCertRpcServiceImpl(config, db, crypt);
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.aaa.simple;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import javax.inject.Singleton;
-import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.aaa.encrypt.impl.AAAEncryptionServiceImpl;
-import org.opendaylight.controller.simple.ConfigReader;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.yang.gen.v1.config.aaa.authn.encrypt.service.config.rev160915.AaaEncryptServiceConfig;
-
-public class EncryptModule extends AbstractModule {
-
- @Provides
- @Singleton AaaEncryptServiceConfig getEncryptServiceConfig(ConfigReader configReader) {
- return configReader.read("/initial/aaa-encrypt-service-config", AaaEncryptServiceConfig.class);
- }
-
- @Provides
- @Singleton
- public AAAEncryptionService aaaEncryptionService(AaaEncryptServiceConfig config, DataBroker db) {
- return new AAAEncryptionServiceImpl(config, db);
- }
-
- @Override
- protected void configure() {
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.aaa.simple;
-
-import com.google.inject.AbstractModule;
-
-/**
- * Guice wiring equivalent of AAA Shiro BP XML in
- * aaa/aaa-shiro/impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml.
- *
- * @author Michael Vorburger.ch
- */
-public class ShiroModule extends AbstractModule {
-
- // TODO private AAAShiroProvider aaaShiroProvider;
-
- @Override
- protected void configure() {
- }
-
-/*
- Following the introduction of the new Web API (in upstream AAA in Fluorine),
- this would need to be reworked... similarly to how it's done for Neutron.
-
- @Override
- protected void configure() {
- IdmLightProxy idmLightProxy = new IdmLightProxy();
- bind(IdMService.class).toInstance(idmLightProxy);
- bind(new TypeLiteral<CredentialAuth<PasswordCredentials>>() { }).toInstance(idmLightProxy);
-
- bind(DatastoreConfig.class).toInstance(new DatastoreConfigBuilder().setStore(Store.H2DataStore)
- .setTimeToLive(BigInteger.valueOf(36000)).setTimeToWait(BigInteger.valueOf(36000)).build());
-
- // TODO read this from aaa-app-config.xml
- // TODO read this from XML with that helper I once wrote somewhere for tests instead of duplicating here..
- bind(ShiroConfiguration.class).toInstance(new ShiroConfigurationBuilder().build());
- }
-
- @Provides
- @Singleton
- AAAShiroProvider aaaShiroProvider(DataBroker dataBroker, ICertificateManager certificateManager,
- CredentialAuth<PasswordCredentials> credentialAuth, ShiroConfiguration shiroConfiguration,
- HttpService httpService,
- DatastoreConfig datastoreConfig) {
- AAAShiroProvider aaaShiroProvider = AAAShiroProvider.newInstance(dataBroker, certificateManager, credentialAuth,
- shiroConfiguration, httpService, "/moon", "/oauth2", datastoreConfig, "foo", "bar");
- aaaShiroProvider.init();
- return aaaShiroProvider;
- }
-
- // TODO AAAShiroProvider destroy-method="close"
-*/
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.simple;
-
-import com.google.common.io.Files;
-import com.google.common.io.Resources;
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.Optional;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamException;
-import org.opendaylight.controller.blueprint.ext.BindingContext;
-import org.opendaylight.controller.blueprint.ext.ConfigXMLReaderException;
-import org.opendaylight.controller.blueprint.ext.DataStoreAppConfigDefaultXMLReader;
-import org.opendaylight.controller.blueprint.ext.DataStoreAppConfigDefaultXMLReader.ConfigURLProvider;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
-
-/**
- * Reads YAML configuration files.
- *
- * @author Michael Vorburger.ch
- */
-@Singleton
-public class ConfigReader {
-
- // TODO this is currently only tested by the ServiceUtilsModuleTest; create a dedicated test when upstreamed
-
- private static final Logger LOG = LoggerFactory.getLogger(ConfigReader.class);
-
- // The idea is that this directory is *also* on the classpath, and *before* the main JARs (so that it can override)
- private final File configurationFilesBaseDirectory = new File("etc/");
-
- private final DOMSchemaService schemaService;
- private final BindingNormalizedNodeSerializer bindingSerializer;
-
- @Inject
- public ConfigReader(DOMSchemaService schemaService, BindingNormalizedNodeSerializer bindingSerializer) {
- this.schemaService = schemaService;
- this.bindingSerializer = bindingSerializer;
- }
-
- public <T extends DataObject> T read(String resourcePathWithoutExtension, Class<T> yangType) {
- return read(resourcePathWithoutExtension, yangType, null);
- }
-
- public <T extends DataObject> T read(String resourcePathWithoutExtension, Class<T> yangType, String listKeyValue) {
- String xmlResourcePath = resourcePathWithoutExtension + ".xml";
- URL xmlResourceURL = Resources.getResource(ConfigReader.class, xmlResourcePath);
-
- if (!xmlResourceURL.toExternalForm().contains("etc/")) {
- File newConfigurationFile = new File(configurationFilesBaseDirectory, xmlResourcePath);
- try {
- File newConfigurationFileDirectory = newConfigurationFile.getParentFile();
- if (newConfigurationFileDirectory.mkdirs()) {
- LOG.info("Created new directory for configuration files: {}", newConfigurationFileDirectory);
- }
- String configurationAsText = Resources.toString(xmlResourceURL, StandardCharsets.UTF_8);
- Files.write(configurationAsText, newConfigurationFile, StandardCharsets.UTF_8);
- LOG.warn("Copied configuration file to directory where it can be overriden on next start "
- + "(but this run isn't reading this, yet): {}", newConfigurationFile);
- } catch (IOException e) {
- LOG.error("Failed to copy configuration file {} to directory {}", xmlResourcePath,
- configurationFilesBaseDirectory, e);
- }
- }
-
- try {
- ConfigURLProvider configURLProvider = appConfigFileName -> Optional.of(xmlResourceURL);
- T configuration = new DataStoreAppConfigDefaultXMLReader<T>(xmlResourcePath, xmlResourcePath, schemaService,
- bindingSerializer, BindingContext.create(yangType.getName(), yangType, listKeyValue),
- configURLProvider).createDefaultInstance();
- LOG.info("Read configuration from {} : {}", xmlResourceURL, configuration);
- return configuration;
- } catch (ConfigXMLReaderException | ParserConfigurationException | XMLStreamException | IOException
- | SAXException | URISyntaxException e) {
- throw new IllegalArgumentException(
- "Resource not found on the classpath, or it's invalid: " + xmlResourcePath, e);
- }
- }
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.controller.simple;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import io.netty.channel.EventLoopGroup;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * PingPong {@link EventLoopGroup} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}GlobalBossGroup EventLoopGroup eventLoopGroup) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface GlobalBossGroup {
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.controller.simple;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import io.netty.util.concurrent.EventExecutor;
-
-/**
- * PingPong {@link EventExecutor} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}GlobalEventExecutor {@link EventExecutor} eventExecutor) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface GlobalEventExecutor {
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.controller.simple;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import io.netty.util.Timer;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * PingPong {@link Timer} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}GlobalTimer Timer timer) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface GlobalTimer {
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.controller.simple;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import io.netty.channel.EventLoopGroup;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * PingPong {@link EventLoopGroup} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}GlobalWorkerGroup EventLoopGroup eventLoopGroup) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface GlobalWorkerGroup {
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.simple;
-
-import javax.inject.Singleton;
-
-import org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor;
-import org.opendaylight.controller.config.yang.netty.threadgroup.NioEventLoopGroupCloseable;
-import org.opendaylight.controller.config.yang.netty.timer.HashedWheelTimerCloseable;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.compat.HeliumRpcProviderRegistry;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcProviderServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
-import org.opendaylight.controller.md.sal.binding.test.DataBrokerTestModule;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService;
-import org.opendaylight.controller.md.sal.dom.broker.impl.DOMNotificationRouter;
-import org.opendaylight.controller.md.sal.dom.broker.impl.PingPongDataBroker;
-import org.opendaylight.controller.md.sal.dom.broker.impl.mount.DOMMountPointServiceImpl;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.infrautils.inject.guice.AbstractCloseableModule;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
-import org.opendaylight.mdsal.dom.api.DOMRpcService;
-import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.mdsal.dom.broker.DOMRpcRouter;
-import org.opendaylight.mdsal.simple.MdsalModule;
-import org.opendaylight.mdsal.simple.PingPong;
-
-import com.google.inject.Provides;
-
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import io.netty.channel.EventLoopGroup;
-import io.netty.util.Timer;
-import io.netty.util.concurrent.EventExecutor;
-
-@SuppressFBWarnings("UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR")
-public class InMemoryControllerModule extends AbstractCloseableModule {
-
- // TODO re-use org.opendaylight.controller.md.sal.binding.impl.BindingBrokerWiring
-
- // TODO propose @Inject and @PreDestroy close() annotations at source to simplify this, a lot...
-
- private BindingToNormalizedNodeCodec bindingToNormalizedNodeCodec;
- private BindingDOMNotificationPublishServiceAdapter bindingDOMNotificationPublishServiceAdapter;
- private DOMNotificationRouter domNotificationPublishService;
-
- @Override
- protected void configureCloseables() {
- install(new MdsalModule());
-
- // TODO this is just for early stage POC! switch to real CDS wiring here, eventually..
- DataBrokerTestModule dataBrokerTestModule = new DataBrokerTestModule(true);
- DataBroker dataBroker = dataBrokerTestModule.getDataBroker();
- DOMSchemaService domSchemaService = dataBrokerTestModule.getSchemaService();
-
- bind(DOMSchemaService.class).toInstance(domSchemaService);
- DOMDataBroker domDefaultDataBroker = dataBrokerTestModule.getDOMDataBroker();
- bind(DOMDataBroker.class).toInstance(domDefaultDataBroker);
- bind(DataBroker.class).toInstance(dataBroker);
-
- bindingToNormalizedNodeCodec = dataBrokerTestModule.getBindingToNormalizedNodeCodec();
- bind(BindingToNormalizedNodeCodec.class).toInstance(bindingToNormalizedNodeCodec);
-
- PingPongDataBroker domPingPongDataBroker = new PingPongDataBroker(domDefaultDataBroker);
- bind(DOMDataBroker.class).annotatedWith(PingPong.class).toInstance(domPingPongDataBroker);
- bind(DataBroker.class).annotatedWith(PingPong.class)
- .toInstance(new BindingDOMDataBrokerAdapter(domPingPongDataBroker, bindingToNormalizedNodeCodec));
-
- domNotificationPublishService = dataBrokerTestModule.getDOMNotificationRouter();
- bind(DOMNotificationService.class).toInstance(domNotificationPublishService);
- bind(NotificationService.class).toInstance(
- new BindingDOMNotificationServiceAdapter(bindingToNormalizedNodeCodec, domNotificationPublishService));
-
- bindingDOMNotificationPublishServiceAdapter = new BindingDOMNotificationPublishServiceAdapter(
- bindingToNormalizedNodeCodec, domNotificationPublishService);
- bind(NotificationPublishService.class).toInstance(bindingDOMNotificationPublishServiceAdapter);
- bind(BindingNormalizedNodeSerializer.class).toInstance(bindingToNormalizedNodeCodec);
-
- bind(DOMMountPointService.class).to(DOMMountPointServiceImpl.class);
-
- DOMRpcRouter domRpcRouter = DOMRpcRouter.newInstance(domSchemaService);
- bind(DOMRpcRouter.class).toInstance(domRpcRouter);
-
- DOMRpcService rpcService = domRpcRouter.getRpcService();
- bind(DOMRpcService.class).toInstance(rpcService);
-
- org.opendaylight.controller.md.sal.dom.broker.impl.DOMRpcRouter controllerDOMRpcService
- = new org.opendaylight.controller.md.sal.dom.broker.impl.DOMRpcRouter(
- rpcService, domRpcRouter.getRpcProviderService());
- bind(org.opendaylight.controller.md.sal.dom.api.DOMRpcService.class).toInstance(controllerDOMRpcService);
- bind(org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService.class)
- .toInstance(controllerDOMRpcService);
-
- DOMRpcProviderService domRpcProviderService = domRpcRouter.getRpcProviderService();
- org.opendaylight.controller.md.sal.dom.api.DOMRpcService controllerDomRpcService
- = new org.opendaylight.controller.md.sal.dom.broker.impl.DOMRpcRouter(rpcService, domRpcProviderService);
- BindingDOMRpcServiceAdapter bindingDOMRpcServiceAdapter
- = new BindingDOMRpcServiceAdapter(controllerDomRpcService, bindingToNormalizedNodeCodec);
- BindingDOMRpcProviderServiceAdapter bindingDOMRpcProviderServiceAdapter
- = new BindingDOMRpcProviderServiceAdapter(controllerDOMRpcService, bindingToNormalizedNodeCodec);
- bind(RpcProviderRegistry.class).toInstance(
- new HeliumRpcProviderRegistry(bindingDOMRpcServiceAdapter, bindingDOMRpcProviderServiceAdapter));
- }
-
- // NETCONF
- // FIXME Add configuration for thread-count
- @Provides
- @Singleton
- @GlobalBossGroup
- EventLoopGroup getGlobalBossGroup() {
- return NioEventLoopGroupCloseable.newInstance(0);
- }
-
- // NETCONF
- // FIXME Add configuration for thread-count
- @Provides
- @Singleton
- @GlobalWorkerGroup
- EventLoopGroup getGlobalWorkerGroup() {
- return NioEventLoopGroupCloseable.newInstance(0);
- }
-
- // NETCONF
- // FIXME Add configuration for thread-count
- @Provides
- @Singleton
- @GlobalTimer
- Timer getGlobalTimer() {
- return HashedWheelTimerCloseable.newInstance(0L, 0);
- }
-
- // NETCONF
- @Provides
- @Singleton
- @GlobalEventExecutor
- EventExecutor getGlobalEventExecutor() {
- return AutoCloseableEventExecutor.globalEventExecutor();
- }
-
- @Override
- public void close() throws Exception {
- bindingToNormalizedNodeCodec.close();
- bindingDOMNotificationPublishServiceAdapter.close();
- domNotificationPublishService.close();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.diagstatus.web;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.ServletException;
-import org.opendaylight.aaa.web.ServletDetails;
-import org.opendaylight.aaa.web.WebContext;
-import org.opendaylight.aaa.web.WebContextBuilder;
-import org.opendaylight.aaa.web.WebContextRegistration;
-import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.infrautils.diagstatus.DiagStatusService;
-
-/**
- * Initializes and registers the {@link DiagStatusServlet}.
- *
- * @author Michael Vorburger.ch
- */
-@Singleton
-public class WebInitializer implements AutoCloseable {
-
- // TODO unify this with the OsgiWebInitializer in infrautils after moving aaa.web (back) to infrautils
-
- // TODO share this with the identical private field in OsgiWebInitializer in infrautils
- public static final String DIAGSTATUS_URL = "/diagstatus";
-
- private final WebContextRegistration webContextRegistration;
-
- @Inject
- public WebInitializer(WebServer webServer, DiagStatusService diagStatusService) throws ServletException {
- WebContextBuilder webContextBuilder = WebContext.builder().contextPath(DIAGSTATUS_URL);
- webContextBuilder.addServlet(
- ServletDetails.builder().addUrlPattern("/*").servlet(new DiagStatusServlet(diagStatusService)).build());
- webContextRegistration = webServer.registerWebContext(webContextBuilder.build());
- }
-
- @Override
- public void close() throws Exception {
- webContextRegistration.close();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.inject.guice;
-
-import com.google.inject.AbstractModule;
-import javax.annotation.PreDestroy;
-
-/**
- * Guice wiring module which can do stuff on close of Injector.
- * This is typically used in an injector which explicitly creates legacy types
- * which have close methods which need to be explicitly called. It is easier
- * and better to just annotate such types with PreDestroy, but if you cannot,
- * this is useful.
- *
- * <p>This works in conjunction with org.opendaylight.infrautils.simple.Main
- * or org.opendaylight.infrautils.inject.guice.testutils.GuiceRule, both of
- * which explicitly use com.mycila.guice.ext.closeable.CloseableInjector.
- *
- * @author Michael Vorburger.ch
- */
-public abstract class AbstractCloseableModule extends AbstractModule {
-
- private static class Closer {
- private final AbstractCloseableModule closeableModule;
-
- Closer(AbstractCloseableModule closeableModule) {
- this.closeableModule = closeableModule;
- }
-
- @PreDestroy
- void close() throws Exception {
- closeableModule.close();
- }
- }
-
- @Override protected final void configure() {
- configureCloseables();
- bind(Closer.class).toInstance(new Closer(this));
- }
-
- protected abstract void configureCloseables();
-
- @PreDestroy
- public abstract void close() throws Exception;
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.karaf.shell;
-
-import java.util.List;
-import java.util.concurrent.Callable;
-import org.apache.karaf.shell.api.console.Command;
-import org.apache.karaf.shell.api.console.Registry;
-
-public class DelegatingRegistry implements Registry {
-
- private final Registry delegate;
-
- public DelegatingRegistry(Registry delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public List<Command> getCommands() {
- return delegate.getCommands();
- }
-
- @Override
- public Command getCommand(String scope, String name) {
- return delegate.getCommand(scope, name);
- }
-
- @Override
- public <T> void register(Callable<T> factory, Class<T> clazz) {
- delegate.register(factory, clazz);
- }
-
- @Override
- public void register(Object service) {
- delegate.register(service);
- }
-
- @Override
- public void unregister(Object service) {
- delegate.unregister(service);
- }
-
- @Override
- public <T> T getService(Class<T> clazz) {
- return delegate.getService(clazz);
- }
-
- @Override
- public <T> List<T> getServices(Class<T> clazz) {
- return delegate.getServices(clazz);
- }
-
- @Override
- public boolean hasService(Class<?> clazz) {
- return delegate.hasService(clazz);
- }
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.karaf.shell;
-
-import com.google.errorprone.annotations.Var;
-import com.google.inject.Injector;
-import org.apache.karaf.shell.api.console.Registry;
-import org.apache.karaf.shell.impl.action.command.ManagerImpl;
-
-/**
- * Karaf shell command manager implementation which instantiates through Guice,
- * therefore supporting {@literal @}Inject.
- *
- * @author Michael Vorburger.ch
- */
-public class GuiceManagerImpl extends ManagerImpl {
-
- private final Injector guiceInjector;
-
- public GuiceManagerImpl(Injector guiceInjector, Registry dependencies, Registry registrations,
- boolean allowCustomServices) {
- super(dependencies, registrations, allowCustomServices);
- this.guiceInjector = guiceInjector;
- }
-
- @Override
- public <T> T instantiate(Class<? extends T> clazz, Registry registry) throws Exception {
- return super.instantiate(clazz, new GuiceDelegatingRegistry(registry));
- }
-
- private class GuiceDelegatingRegistry extends DelegatingRegistry {
-
- GuiceDelegatingRegistry(Registry delegate) {
- super(delegate);
- }
-
- @Override
- public <T> T getService(Class<T> clazz) {
- @Var T service = super.getService(clazz);
- if (service == null) {
- service = guiceInjector.getInstance(clazz);
- }
- return service;
- }
-
- // TODO @Override public <T> List<T> getServices(Class<T> clazz) {
-
- @Override
- public boolean hasService(Class<?> clazz) {
- boolean has = super.hasService(clazz);
- if (!has) {
- return guiceInjector.getInstance(clazz) != null;
- }
- return has;
- }
- }
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.karaf.shell;
-
-import static java.util.Objects.requireNonNull;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Injector;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Set;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.console.Session;
-import org.apache.karaf.shell.api.console.SessionFactory;
-
-/**
- * Karaf standalone shell, with programmatic instead of file-based command registration.
- *
- * @author Michael Vorburger.ch
- */
-public class KarafStandaloneShell {
-
- private final InnerMain karafMain = new InnerMain();
- private final Set<Action> actions;
- private final Injector injector;
-
- public KarafStandaloneShell(Injector injector, Set<Action> actions) {
- this.injector = requireNonNull(injector, "injector");
- this.actions = requireNonNull(actions, "actions");
- }
-
- public void run() throws Exception {
- karafMain.run(new String[0]);
- }
-
- @VisibleForTesting
- // TODO This should ideally only be in src/test, not src/main ...
- public void testAllRegisteredCommands() throws Exception {
- karafMain.testAllRegisteredCommands();
- }
-
- private class InnerMain extends org.apache.karaf.shell.impl.console.standalone.Main {
- private GuiceManagerImpl manager;
-
- @Override
- protected void discoverCommands(Session session, ClassLoader cl, String resource) {
- manager = new GuiceManagerImpl(injector, session.getRegistry(), session.getFactory().getRegistry(),
- false); // allowCustomServices = false so that there is an IllegalStateException if no service found
- for (Action action : actions) {
- manager.register(action.getClass());
- }
- }
-
- @SuppressWarnings("checkstyle:RegexpSingleLineJava")
- // TODO This should ideally only be in src/test, not src/main ...
- private void testAllRegisteredCommands() throws Exception {
- SessionFactory sessionFactory = createSessionFactory(null);
- Session session = createSession(sessionFactory, new EmptyInputStream(), System.out, System.err, null);
- discoverCommands(session, getClass().getClassLoader(), null);
- for (Action action : actions) {
- manager.instantiate(action.getClass());
- }
- }
- }
-
- // TODO when we're on Java 11, replace this with InputStream.nullInputStream()
- private static class EmptyInputStream extends InputStream {
- @Override
- public int read() throws IOException {
- return -1;
- }
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple;
-
-import com.google.inject.AbstractModule;
-import org.opendaylight.infrautils.caches.CacheProvider;
-import org.opendaylight.infrautils.caches.baseimpl.CacheManagersRegistry;
-import org.opendaylight.infrautils.caches.baseimpl.internal.CacheManagersRegistryImpl;
-import org.opendaylight.infrautils.caches.standard.StandardCacheProvider;
-
-public class CachesModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(CacheManagersRegistry.class).to(CacheManagersRegistryImpl.class);
- bind(CacheProvider.class).to(StandardCacheProvider.class);
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple;
-
-import static org.immutables.value.Value.Style.ImplementationVisibility.PRIVATE;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.immutables.value.Value;
-
-/**
- * <a href="http://immutables.org">Immutables.org</a> style meta annotation.
- *
- * @author Michael Vorburger.ch
- */
-@Target({ElementType.PACKAGE, ElementType.TYPE})
-@Retention(RetentionPolicy.CLASS) // Make it class retention for incremental compilation
-@Value.Style(
- // generate *Builder as public top level type and the *Immutable impl. as private inner class
- visibility = PRIVATE,
- strictBuilder = true)
-public @interface ConfigImmutableStyle { }
-// Beware: Changes made here are not active without a restart in Eclipse (would need separate project)
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.TypeLiteral;
-import java.util.Collections;
-import java.util.List;
-import org.opendaylight.infrautils.diagstatus.ClusterMemberInfo;
-import org.opendaylight.infrautils.diagstatus.DiagStatusService;
-import org.opendaylight.infrautils.diagstatus.DiagStatusServiceMBean;
-import org.opendaylight.infrautils.diagstatus.ServiceStatusProvider;
-import org.opendaylight.infrautils.diagstatus.internal.DiagStatusServiceImpl;
-import org.opendaylight.infrautils.diagstatus.internal.DiagStatusServiceMBeanImpl;
-import org.opendaylight.infrautils.diagstatus.spi.NoClusterMemberInfo;
-import org.opendaylight.infrautils.diagstatus.web.WebInitializer;
-
-public class DiagStatusModule extends AbstractModule {
-
- // TODO get DiagStatusModuleTest to pass without the 2nd bind() below...
- // maybe using https://github.com/google/guice/wiki/Multibindings ..
- // but how to make it AUTOMATICALLY pickup all beans which ServiceStatusProvider?
- // probably possible via https://github.com/google/guice/wiki/CustomInjections ?
-
- @Override
- protected void configure() {
- bind(DiagStatusService.class).to(DiagStatusServiceImpl.class);
- bind(new TypeLiteral<List<ServiceStatusProvider>>() {}).toInstance(Collections.emptyList());
- bind(WebInitializer.class);
- // TODO when using CDS: bind(ClusterMemberInfo.class).to(ClusterMemberInfoImpl.class);
- bind(ClusterMemberInfo.class).to(NoClusterMemberInfo.class);
- bind(DiagStatusServiceMBean.class).to(DiagStatusServiceMBeanImpl.class);
- // TODO figure out how to use Guice multibindings to inject all real ServiceStatusProvider impls
- bind(new TypeLiteral<List<ServiceStatusProvider>>() {}).toInstance(Collections.emptyList());
-
- // Commands
- // Multibinder<Action> actionsBinder = Multibinder.newSetBinder(binder(), Action.class);
- // TODO DiagStatusCommand must be made to (again) implement
- // org.apache.karaf.shell.api.action.Action, ideally via org.opendaylight.infrautils.shell.LoggingAction
- // instead of the deprecated legacy Karaf API org.apache.karaf.shell.commands.Action, which
- // we do not want to (can't) anymore depend in opendaylight-simple.
- // This was changed in https://github.com/opendaylight/infrautils/commit/c88543dd8823585bbfd1d3cc72c56b922896df9c
- // actionsBinder.addBinding().to(DiagStatusCommand.class);
- }
-}
+++ /dev/null
-/*
- * Copyright © 2018 Red Hat, Inc. and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple;
-
-import com.google.inject.AbstractModule;
-import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.web.WebModule;
-
-public class InfraUtilsModule extends AbstractModule {
- @Override
- protected void configure() {
- install(new WebModule());
- install(new ReadyModule());
- install(new DiagStatusModule());
- install(new MetricsModule());
- install(new CachesModule());
- install(new JobCoordinatorModule());
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple;
-
-import com.google.inject.AbstractModule;
-import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
-import org.opendaylight.infrautils.jobcoordinator.internal.JobCoordinatorImpl;
-
-public class JobCoordinatorModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(JobCoordinator.class).to(JobCoordinatorImpl.class);
- }
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-import com.google.inject.Stage;
-import com.mycila.guice.ext.closeable.CloseableInjector;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.io.IOException;
-import org.opendaylight.infrautils.inject.PostFullSystemInjectionListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Simple Main.
- *
- * @author Michael Vorburger.ch
- */
-public class Main {
-
- private static final Logger LOG = LoggerFactory.getLogger(Main.class);
-
- protected final Injector injector;
-
- @SuppressWarnings("checkstyle:IllegalCatch")
- public Main(Module mainModule) {
- try {
- LOG.info("Starting up {}...", mainModule);
- // TODO share why PRODUCTION Javadoc, or more, w. infrautils.inject.guice.testutils.GuiceRule
- this.injector = Guice.createInjector(Stage.PRODUCTION, mainModule);
- LOG.info("Start up of dependency injection completed; Guice injector is now ready.");
- injector.getInstance(PostFullSystemInjectionListener.class).onFullSystemInjected();
- LOG.info("Completed invoking PostFullSystemInjectionListener.onFullSystemInjected");
- } catch (Throwable t) {
- // If Guice stuff failed, there may be non-daemon threads which leave us hanging; force exit.
- LOG.error("Failed to start up, going to close up and exit", t);
- close();
- throw t;
- }
- }
-
- @SuppressFBWarnings("DM_EXIT")
- public final void close() {
- closeInjector();
- LOG.info("Now System.exit(0) so that any hanging non-daemon threads don't prevent JVM stop.");
- System.exit(0);
- }
-
- @SuppressWarnings("checkstyle:IllegalCatch")
- public final void closeInjector() {
- LOG.info("Initiating orderly shutdown by closing Guice injector...");
- try {
- if (injector != null) {
- injector.getInstance(CloseableInjector.class).close();
- }
- } catch (Throwable t) {
- LOG.warn("Trouble while closing CloseableInjector, but ignoring and continuing anyway", t);
- }
- LOG.info("Shutdown complete; Guice injector closed.");
- }
-
- public void awaitShutdown() {
- try {
- LOG.info("Awaiting shutdown signal, via CR/LF on STDIN...");
- System.in.read();
- } catch (IOException e) {
- LOG.error("System.in.read() failed?!", e);
- } finally {
- this.close();
- }
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple;
-
-import com.google.inject.AbstractModule;
-import org.opendaylight.infrautils.metrics.MetricProvider;
-import org.opendaylight.infrautils.metrics.internal.MetricProviderImpl;
-
-public class MetricsModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(MetricProvider.class).to(MetricProviderImpl.class);
- }
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple;
-
-import com.google.inject.Module;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import java.util.Set;
-import javax.inject.Inject;
-import org.apache.karaf.shell.api.action.Action;
-import org.opendaylight.infrautils.karaf.shell.KarafStandaloneShell;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Simple Main, with shell.
- *
- * @author Michael Vorburger.ch
- */
-public class ShellMain extends Main {
-
- private static final Logger LOG = LoggerFactory.getLogger(ShellMain.class);
-
- private final KarafStandaloneShell karafStandaloneShell;
-
- private Set<Action> actions;
-
- @SuppressFBWarnings("UR_UNINIT_READ") // injectMembers() DI magic is beyond FB
- public ShellMain(Module mainModule) {
- super(mainModule);
- injector.injectMembers(this);
- karafStandaloneShell = new KarafStandaloneShell(injector, actions);
- }
-
- @Inject // invoked by injector.injectMembers(this) above
- public void setActions(Set<Action> actions) {
- this.actions = actions;
- }
-
- @Override
- @SuppressWarnings("checkstyle:IllegalCatch")
- public void awaitShutdown() {
- try {
- karafStandaloneShell.run();
- } catch (Exception e) {
- LOG.error("Karaf standalone shell run failed", e);
- }
-
- this.close();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Injector;
-import com.google.inject.Provides;
-import com.google.inject.Singleton;
-import java.util.Set;
-import org.apache.karaf.shell.api.action.Action;
-import org.opendaylight.infrautils.karaf.shell.KarafStandaloneShell;
-
-/**
- * Guice wiring which tests shell commands wiring.
- *
- * <p>This makes tests using this wiring in their GuiceRule fail if an
- * org.apache.karaf.shell.api.action.Action is e.g. not annotated with
- * org.apache.karaf.shell.api.action.lifecycle.Service or if one of its
- * org.apache.karaf.shell.api.action.lifecycle.Reference annotated fields cannot
- * be found in the Guice injector.
- *
- * @author Michael Vorburger.ch
- */
-public class ShellTestModule extends AbstractModule {
-
- @Override
- protected void configure() {
- }
-
- @Provides
- @Singleton
- KarafStandaloneShell karafStandaloneShell(Injector injector, Set<Action> actions) throws Exception {
- KarafStandaloneShell shell = new KarafStandaloneShell(injector, actions);
- shell.testAllRegisteredCommands();
- return shell;
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.web;
-
-import com.google.inject.AbstractModule;
-import org.opendaylight.aaa.web.WebContextSecurer;
-import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.aaa.web.jetty.JettyWebServer;
-import org.opendaylight.aaa.web.servlet.ServletSupport;
-import org.opendaylight.aaa.web.servlet.jersey2.JerseyServletSupport;
-
-/**
- * Wiring for a web server.
- *
- * @author Michael Vorburger.ch
- */
-public class WebModule extends AbstractModule {
-
- // TODO note (new) org.opendaylight.aaa.web.testutils.WebTestModule .. integrate?
-
- @Override
- protected void configure() {
- // TODO read port from a -D parameter or configuration file instead of hard-coding
- bind(WebServer.class).toInstance(new JettyWebServer(8181));
-
- // JAX-RS
- bind(ServletSupport.class).to(JerseyServletSupport.class);
-
- // TODO replace this NOOP WebContextSecurer with one with a fixed uid/pwd for HTTP BASIC (and ditch AAA)
- bind(WebContextSecurer.class).toInstance((webContextBuilder, urlPatterns) -> { });
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.mdsal.simple;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import javax.inject.Singleton;
-import org.opendaylight.controller.sal.core.compat.DOMDataBrokerAdapter;
-import org.opendaylight.controller.sal.core.compat.DOMNotificationServiceAdapter;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
-import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMDataBrokerAdapter;
-import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMRpcProviderServiceAdapter;
-import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMRpcServiceAdapter;
-import org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-import org.opendaylight.mdsal.dom.api.DOMMountPointService;
-import org.opendaylight.mdsal.dom.api.DOMNotificationService;
-import org.opendaylight.mdsal.dom.api.DOMRpcProviderService;
-import org.opendaylight.mdsal.dom.api.DOMRpcService;
-import org.opendaylight.mdsal.dom.broker.DOMMountPointServiceImpl;
-import org.opendaylight.mdsal.dom.broker.DOMRpcRouter;
-import org.opendaylight.mdsal.dom.broker.pingpong.PingPongDataBroker;
-import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
-import org.opendaylight.mdsal.eos.binding.dom.adapter.BindingDOMEntityOwnershipServiceAdapter;
-import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
-import org.opendaylight.mdsal.eos.dom.simple.SimpleDOMEntityOwnershipService;
-import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
-import org.opendaylight.mdsal.singleton.dom.impl.DOMClusterSingletonServiceProviderImpl;
-
-@SuppressWarnings("deprecation") // sure, but that's the point of this class...
-public class MdsalModule extends AbstractModule {
-
- // see org.opendaylight.controller.sal.restconf.impl.test.incubate.InMemoryMdsalModule ...
- // from https://git.opendaylight.org/gerrit/#/c/79388/
-
- // TODO [LOW] like InMemoryControllerModule extends AbstractCloseableModule and close up..
- // or rather, better, instead just annotate respective classes with @PreDestroy!
-
- @Override
- protected void configure() {
- // TODO This is WRONG; later need to use the DistributedEntityOwnershipService instead here!
- bind(DOMEntityOwnershipService.class).to(SimpleDOMEntityOwnershipService.class);
- }
-
- @Provides
- @Singleton DataBroker getDataBroker(DOMDataBroker domDataBroker, BindingToNormalizedNodeCodec codec) {
- return new BindingDOMDataBrokerAdapter(domDataBroker, codec);
- }
-
- @Provides
- @Singleton DOMDataBroker getDOMDataBroker(org.opendaylight.controller.md.sal.dom.api.DOMDataBroker controllerDDB) {
- return new DOMDataBrokerAdapter(controllerDDB);
- }
-
- @Provides
- @Singleton
- @PingPong DOMDataBroker getDOMPingPongDataBroker(DOMDataBroker domDataBroker) {
- return new PingPongDataBroker(domDataBroker);
- }
-
- @Provides
- @Singleton
- @PingPong
- DataBroker getPingPongDOMDataBroker(@PingPong DOMDataBroker domDataBroker, BindingToNormalizedNodeCodec codec) {
- return new BindingDOMDataBrokerAdapter(domDataBroker, codec);
- }
-
- @Provides
- @Singleton
- BindingToNormalizedNodeCodec getBindingToNormalizedNodeCodec(
- org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec controllerCodec) {
- return controllerCodec;
- }
-
- @Provides
- @Singleton DOMNotificationService getDOMNotificationService(
- org.opendaylight.controller.md.sal.dom.api.DOMNotificationService controllerDNS) {
- return new DOMNotificationServiceAdapter(controllerDNS);
- }
-
- @Provides
- @Singleton DOMMountPointService getDOMMountPoint(
- /* org.opendaylight.controller.md.sal.dom.api.DOMMountPointService controllerDMP */) {
- // TODO doesn't the mdsal DOMMountPointServiceImpl need the controller DOMMountPointService ?!
- return new DOMMountPointServiceImpl();
- }
-
- @Provides
- @Singleton EntityOwnershipService getDOMEntityOwnershipService(
- DOMEntityOwnershipService domService, BindingNormalizedNodeSerializer conversionCodec) {
- return new BindingDOMEntityOwnershipServiceAdapter(domService, conversionCodec);
- }
-
- @Provides
- @Singleton ClusterSingletonServiceProvider getClusterSingletonServiceProvider(DOMEntityOwnershipService eos) {
- return new DOMClusterSingletonServiceProviderImpl(eos);
- }
-
-// @Provides
-// @Singleton DOMRpcService getDOMService(org.opendaylight.controller.md.sal.dom.api.DOMRpcService controllerDRSA) {
-// return new DOMRpcServiceAdapter(controllerDRSA);
-// }
-
- @Provides
- @Singleton
- RpcConsumerRegistry getRpcConsumerRegistry(DOMRpcService domService, BindingToNormalizedNodeCodec codec) {
- return new BindingDOMRpcServiceAdapter(domService, codec);
- }
-
- @Provides
- @Singleton
- RpcProviderService getRpcProviderService(DOMRpcProviderService domRpcRegistry, BindingToNormalizedNodeCodec codec) {
- return new BindingDOMRpcProviderServiceAdapter(domRpcRegistry, codec);
- }
-
- @Provides
- @Singleton DOMRpcProviderService getDOMRpcProviderService(DOMRpcRouter domRpcRouter) {
- return domRpcRouter.getRpcProviderService();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.mdsal.simple;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import javax.inject.Qualifier;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-
-/**
- * PingPong {@link DataBroker} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}PingPong DataBroker dataBroker) {
- * ...
- * }
- * }</pre>
- *
- * @author Michael Vorburger.ch
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface PingPong {
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.restconf.simple;
-
-import java.net.InetAddress;
-import org.immutables.value.Value;
-import org.opendaylight.infrautils.simple.ConfigImmutableStyle;
-
-/**
- * Configuration for the RESTCONF server.
- *
- * @author Michael Vorburger.ch
- */
-@Value.Immutable
-@ConfigImmutableStyle
-public interface RestConfConfig {
-
- static RestConfConfigBuilder builder() {
- return new RestConfConfigBuilder();
- }
-
- /**
- * IP interface which the WebSocket server will listen on.
- */
- // TODO make this Optional<InetAddress> and by default run on the same IF as the WebServer (TBD)
- InetAddress webSocketAddress();
-
- /**
- * TCP port which the WebSocket server will listen on.
- */
- int webSocketPort();
-
- /**
- * Web URL prefix. Defaults to "/restconf".
- */
- default String contextPath() {
- return "/restconf";
- }
-
- default Version version() {
- return Version.DRAFT_02;
- }
-
- enum Version {
- // TODO Confirm what are appropriate names for these versions?
- DRAFT_18, // RFC_8040 ?
- DRAFT_02
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.restconf.simple;
-
-import com.google.inject.AbstractModule;
-import java.net.InetAddress;
-
-/**
- * Guice module for RestConf, based on {@link RestConfWiring}.
- *
- * @author Michael Vorburger.ch
- */
-public class RestConfModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(RestConfWiring.class);
- bind(RestConfConfig.class).toInstance(RestConfConfig.builder()
- // TODO webSocketAddress should be required, and read from WebServer (configurable in WebWiring)
- .webSocketAddress(InetAddress.getLoopbackAddress())
- // TODO webSocketPort should be read from some configuration file
- .webSocketPort(9090).build());
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.restconf.simple;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.ws.rs.core.Application;
-import org.opendaylight.aaa.web.ServletDetails;
-import org.opendaylight.aaa.web.WebContext;
-import org.opendaylight.aaa.web.WebContextRegistration;
-import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.aaa.web.servlet.ServletSupport;
-import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-import org.opendaylight.mdsal.dom.api.DOMMountPointService;
-import org.opendaylight.mdsal.dom.api.DOMNotificationService;
-import org.opendaylight.mdsal.dom.api.DOMRpcService;
-import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.netconf.sal.restconf.impl.BrokerFacade;
-import org.opendaylight.netconf.sal.restconf.impl.ControllerContext;
-import org.opendaylight.netconf.sal.restconf.impl.RestconfImpl;
-import org.opendaylight.netconf.sal.restconf.impl.RestconfProviderImpl;
-import org.opendaylight.netconf.sal.restconf.impl.StatisticsRestconfServiceWrapper;
-import org.opendaylight.restconf.nb.rfc8040.handlers.DOMDataBrokerHandler;
-import org.opendaylight.restconf.nb.rfc8040.handlers.DOMMountPointServiceHandler;
-import org.opendaylight.restconf.nb.rfc8040.handlers.NotificationServiceHandler;
-import org.opendaylight.restconf.nb.rfc8040.handlers.RpcServiceHandler;
-import org.opendaylight.restconf.nb.rfc8040.handlers.SchemaContextHandler;
-import org.opendaylight.restconf.nb.rfc8040.handlers.TransactionChainHandler;
-import org.opendaylight.restconf.nb.rfc8040.services.wrapper.ServicesWrapper;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Standalone wiring for RESTCONF.
- *
- * <p>ACK: Some lines here were originally inspired by the CommunityRestConf class
- * from lighty.io. The differences include (1) that this class is "pure Java",
- * because the intention here is only to incubate and then propose it upstream
- * right into the netconf ODL project; (2) that we use infrautils.web (currently
- * in aaa),
- *
- * @author Michael Vorburger.ch, partially based on code in lighty.io
- */
-@Singleton
-public class RestConfWiring {
-
- private static final Logger LOG = LoggerFactory.getLogger(RestConfWiring.class);
-
- // TODO upstream this into ODL netconf/restconf and replace its Blueprint XML with this
-
- private final WebServer webServer;
- private final WebContext webContext;
- private final RestconfProviderImpl webSockerServer;
- private WebContextRegistration webContextRegistration;
-
- @Inject
- public RestConfWiring(RestConfConfig config, WebServer webServer, ServletSupport jaxRS,
- DOMSchemaService domSchemaService, DOMMountPointService domMountPointService, DOMRpcService domRpcService,
- DOMDataBroker domDataBroker, DOMNotificationService domNotificationService) {
- this.webServer = webServer;
- LOG.info("config = {}", config);
-
- // WebSocket
- ControllerContext controllerContext = ControllerContext.newInstance(domSchemaService, domMountPointService,
- domSchemaService);
- BrokerFacade broker = BrokerFacade.newInstance(domRpcService, domDataBroker, domNotificationService,
- controllerContext);
- RestconfImpl restconf = RestconfImpl.newInstance(broker, controllerContext);
- StatisticsRestconfServiceWrapper stats = StatisticsRestconfServiceWrapper.newInstance(restconf);
- IpAddress wsIpAddress = IpAddressBuilder.getDefaultInstance(config.webSocketAddress().getHostAddress());
- this.webSockerServer = new RestconfProviderImpl(stats, wsIpAddress, new PortNumber(config.webSocketPort()));
-
- // Servlet
- TransactionChainHandler transactionChainHandler = new TransactionChainHandler(domDataBroker);
- SchemaContextHandler schemaCtxHandler = SchemaContextHandler.newInstance(transactionChainHandler,
- domSchemaService);
- schemaCtxHandler.init();
- DOMMountPointServiceHandler domMountPointServiceHandler = DOMMountPointServiceHandler
- .newInstance(domMountPointService);
- DOMDataBrokerHandler domDataBrokerHandler = new DOMDataBrokerHandler(domDataBroker);
- RpcServiceHandler rpcServiceHandler = new RpcServiceHandler(domRpcService);
- NotificationServiceHandler notificationServiceHandler = new NotificationServiceHandler(domNotificationService);
- ServicesWrapper servicesWrapper = ServicesWrapper.newInstance(schemaCtxHandler, domMountPointServiceHandler,
- transactionChainHandler, domDataBrokerHandler, rpcServiceHandler, notificationServiceHandler,
- domSchemaService);
-
- // This is currently hard-coded to DRAFT_18; if we ever actually need to support the
- // older DRAFT_02 for anything, then (only) add it to the RestConfConfig and switch here
- Application application;
- switch (config.version()) {
- case DRAFT_02:
- application = new org.opendaylight.netconf.sal.rest.impl.RestconfApplication(
- controllerContext, stats);
- break;
-
- case DRAFT_18:
- application = new org.opendaylight.restconf.nb.rfc8040.RestconfApplication(
- schemaCtxHandler, domMountPointServiceHandler, servicesWrapper);
- break;
-
- default:
- throw new UnsupportedOperationException(config.version().name());
- }
-
- HttpServlet servlet = jaxRS.createHttpServletBuilder(application).build();
- this.webContext = WebContext.builder().contextPath(config.contextPath())
- .addServlet(ServletDetails.builder().addUrlPattern("/*").servlet(servlet).build())
- .build();
-
- // TODO secure it, using web API
- }
-
- @PostConstruct
- public void start() throws ServletException {
- this.webContextRegistration = this.webServer.registerWebContext(webContext);
- this.webSockerServer.start();
- }
-
- @PreDestroy
- public void stop() {
- this.webSockerServer.close();
- if (webContextRegistration != null) {
- this.webContextRegistration.close();
- }
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.serviceutils.simple;
-
-import com.google.inject.AbstractModule;
-import org.opendaylight.serviceutils.srm.ServiceRecoveryRegistry;
-import org.opendaylight.serviceutils.srm.impl.ServiceRecoveryRegistryImpl;
-
-public class ServiceRecoveryModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(ServiceRecoveryRegistry.class).to(ServiceRecoveryRegistryImpl.class);
- }
-
-}
+++ /dev/null
-/*
- * Copyright © 2018 Red Hat, Inc. and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.serviceutils.simple;
-
-import com.google.inject.AbstractModule;
-
-public class ServiceUtilsModule extends AbstractModule {
- @Override
- protected void configure() {
- install(new ServiceRecoveryModule());
- install(new UpgradeModule());
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.serviceutils.simple;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.simple.ConfigReader;
-import org.opendaylight.serviceutils.upgrade.UpgradeState;
-import org.opendaylight.serviceutils.upgrade.impl.UpgradeStateListener;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.upgrade.rev180702.UpgradeConfig;
-
-/**
- * Guice Module for the Upgrades API.
- *
- * @author Michael Vorburger.ch
- */
-public class UpgradeModule extends AbstractModule {
-
- @Override
- protected void configure() {
- }
-
- @Provides
- @Singleton UpgradeConfig getUpgradeConfig(ConfigReader configReader) {
- return configReader.read("/initial/serviceutils-upgrade-config", UpgradeConfig.class);
- }
-
- @Provides
- @Singleton UpgradeState getUpgradeStateService(DataBroker dataBroker, UpgradeConfig upgradeConfig) {
- return new UpgradeStateListener(dataBroker, upgradeConfig);
- }
-}
+++ /dev/null
-# This file has the same format as etc/org.ops4j.pax.logging.cfg
-# but ${karaf.data} has been replaced by "data/", all Karaf/OSGi appenders etc. have been removed,
-# the file name changed from karaf.log to opendaylight.log, and the "log4j2." prefix needed to be removed.
-
-rootLogger.level = DEBUG
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#rootLogger.type = asyncRoot
-#rootLogger.includeLocation = false
-rootLogger.appenderRef.RollingFile.ref = RollingFile
-rootLogger.appenderRef.Console.ref = Console
-rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-rootLogger.appenderRef.Console.filter.threshold.level = WARN
-
-appender.console.type = Console
-appender.console.name = Console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-
-appender.rolling.type = RollingRandomAccessFile
-appender.rolling.name = RollingFile
-appender.rolling.fileName = data/log/opendaylight.log
-appender.rolling.filePattern = data/log/opendaylight.log.%i
-# uncomment to not force a disk flush
-#appender.rolling.immediateFlush = false
-appender.rolling.append = true
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size = 16MB
-
-logger.netconfsal.name = org.opendaylight.controller.sal.connect.netconf
-logger.netconfsal.level = TRACE
-logger.netconf.name = org.opendaylight.netconf
-logger.netconf.level = TRACE
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.aaa.simple.test;
-
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.opendaylight.aaa.simple.AAAModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-
-@Ignore // TODO fix NullPointerException at org.opendaylight.aaa.cert.impl.DefaultMdsalSslData.createKeyStores :155
-public class AAAModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(new AAAModule(), new InMemoryControllerModule(),
- // TODO new WebWiring(true), new ReferencesWiring(),
- new AnnotationsModule());
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.aaa.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.opendaylight.aaa.cert.api.ICertificateManager;
-import org.opendaylight.aaa.simple.CertModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-
-public class CertModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(
- new CertModule(), new InMemoryControllerModule(), new AnnotationsModule());
-
- @Inject ICertificateManager certificateManager;
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.aaa.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.aaa.simple.EncryptModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-
-public class EncryptModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(
- new EncryptModule(), new InMemoryControllerModule(), new AnnotationsModule());
-
- @Inject AAAEncryptionService encryptionService;
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.simple.test;
-
-import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.mdsal.simple.PingPong;
-
-public class InMemoryControllerModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(InMemoryControllerModule.class, AnnotationsModule.class);
-
- @Inject DataBroker dataBroker;
- @Inject @PingPong DataBroker pingPongDataBroker;
- @Inject NotificationService notificationService;
-
- @Test public void testDataBroker() throws InterruptedException, ExecutionException {
- dataBroker.newReadWriteTransaction().commit().get();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.inject.guice.tests;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.junit.Test;
-import org.junit.runners.model.Statement;
-import org.opendaylight.infrautils.inject.guice.AbstractCloseableModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-
-/**
- * Test PreDestroy in Module.
- *
- * @author Michael Vorburger.ch
- */
-public class AbstractCloseableModuleTest {
-
- public static class TestModule extends AbstractCloseableModule {
- boolean isClosed = false;
-
- @Override
- public void close() {
- isClosed = true;
- }
-
- @Override protected void configureCloseables() {
- // IRL: bind(...)
- }
- }
-
- @SuppressWarnings("checkstyle:IllegalThrows")
- @Test public void testModuleWithPreDestroy() throws Throwable {
- @SuppressWarnings("resource")
- TestModule testModule = new TestModule();
- new GuiceRule(testModule, new AnnotationsModule()).apply(EMPTY_STATEMENT, null, new Object()).evaluate();
- assertThat(testModule.isClosed).isTrue();
- }
-
- private static final Statement EMPTY_STATEMENT = new Statement() {
- @Override
- public void evaluate() throws Throwable {
- }
- };
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.inject.guice.testutils.tests;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-
-/**
- * Test illustrating how to use the GuiceRule with an inline lamda binding.
- *
- * @author Michael Vorburger.ch
- */
-public class GuiceRuleLambdaTest {
-
- @SuppressWarnings("BindingToUnqualifiedCommonType")
- public @Rule GuiceRule guice = new GuiceRule(
- binder -> binder.bind(String.class).toInstance("hello, world"),
- new AnnotationsModule());
-
- @Inject String string;
-
- @Test public void testLambdaBinding() {
- assertThat(string).isEqualTo("hello, world");
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.infrautils.diagstatus.DiagStatusService;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
-import org.opendaylight.infrautils.web.WebModule;
-
-/**
- * Unit test for {@link DiagStatusModule}.
- *
- * @author Michael Vorburger.ch
- */
-public class DiagStatusModuleTest {
-
- public @Rule GuiceRule guice = new GuiceRule(WebModule.class, DiagStatusModule.class, ReadyModule.class,
- AnnotationsModule.class);
-
- @Inject DiagStatusService diagStatusService;
-
- @Test public void testDiagStatusService() { }
-
- // TODO separate DiagStatusWiring0Test VS DiagStatusWiring1Test where *1* registers a
- // Module that actually does bind a ServiceStatusProvider ...
- // not here, but in infrautils.diagstatus
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple.test;
-
-import org.junit.Test;
-import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;
-import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.Main;
-
-/**
- * Unit test for Main.
- *
- * @author Michael Vorburger.ch
- */
-public class MainTest {
-
- @Test
- public void testMain() {
- new Main(new TestModule()).closeInjector();
- }
-
- public static class TestModule extends AbstractGuiceJsr250Module {
- @Override
- protected void configureBindings() {
- install(new ReadyModule());
-
- // bind(SomeInterfaceWithPostConstruct.class).to(SomeClassWithPostConstruct.class);
- }
- }
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple.testutils;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.mycila.guice.ext.closeable.CloseableInjector;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.infrautils.testutils.LogRule;
-
-/**
- * Abstract base class for simple distribution component tests.
- *
- * @author Michael Vorburger.ch
- */
-public abstract class AbstractSimpleDistributionTest {
-
- // TODO public static @ClassRule ClasspathHellDuplicatesCheckRule jHades = new ClasspathHellDuplicatesCheckRule();
-
- public @Rule LogRule logRule = new LogRule();
- // TODO NOK together with Log4j on CP, re-enable when split into separate modules:
- // public @Rule LogCaptureRule logCaptureRule = new LogCaptureRule();
-
- // The point of this is really just to make sure that subclasses have a @Rule GuiceRule
- private @Inject CloseableInjector closeableInjector;
-
- @Test public void testDistribution() {
- assertThat(closeableInjector).isNotNull();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.mdsal.simple.test;
-
-import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
-import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.mdsal.simple.PingPong;
-
-public class InMemoryMdsalModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(InMemoryControllerModule.class, AnnotationsModule.class);
-
- @Inject @PingPong DataBroker pingPongDataBroker;
- @Inject DataBroker dataBroker;
-
- @Inject RpcProviderService rpcProviderService;
- @Inject RpcConsumerRegistry rpcConsumerRegistry;
-
- @Test public void testDataBroker() throws InterruptedException, ExecutionException {
- dataBroker.newReadWriteTransaction().commit().get();
- }
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.restconf.simple.test;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.opendaylight.infrautils.testutils.web.TestWebClient.Method.GET;
-
-import java.io.IOException;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.aaa.web.testutils.TestWebClient;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.infrautils.web.WebModule;
-import org.opendaylight.restconf.simple.RestConfModule;
-
-/**
- * Tests if the {@link RestConfModule} works.
- *
- * @author Michael Vorburger.ch
- */
-public class RestConfModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(
- RestConfModule.class, InMemoryControllerModule.class, WebModule.class, AnnotationsModule.class);
-
- @Inject WebServer webServer;
- @Inject TestWebClient http;
-
- @Test public void testRestConf() throws IOException {
- assertThat(http.request(GET, "/restconf/modules/").getStatus()).isEqualTo(200);
-
- // TODO test security; add auth support to TestHttpClient, check that w.o. auth it's 401
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.serviceutils.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
-import org.opendaylight.serviceutils.upgrade.UpgradeState;
-
-/**
- * Test the serviceutils wiring.
- *
- * @author Michael Vorburger.ch
- */
-public class ServiceUtilsModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(ServiceUtilsModule.class, InMemoryControllerModule.class,
- AnnotationsModule.class);
-
- @Inject UpgradeState upgradeState;
-
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-genius</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <dependencies>
-
- <dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-openflowplugin</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <!-- TODO upstream version into odlparent pluginManagement -->
- <version>3.1.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- <!-- <classpathLayoutType>repository</classpathLayoutType> -->
- <classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
- <customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- <mainClass>org.opendaylight.genius.simple.GeniusMain</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
- <formats>
- <format>dir</format>
- <format>tar</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
- <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-<!--
- <repositories>
- <repository>
- <outputDirectory>system</outputDirectory>
- </repository>
- </repositories>
--->
-</assembly>
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.genius.simple;
-
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.simple.ShellMain;
-
-public final class GeniusMain {
-
- private GeniusMain() { }
-
- public static void main(String[] args) {
- GuiceClassPathBinder classPathBinder = new GuiceClassPathBinder("org.opendaylight");
- new ShellMain(new GeniusModule(classPathBinder)).awaitShutdown();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.genius.simple;
-
-import com.google.inject.Provides;
-import javax.inject.Singleton;
-import org.opendaylight.controller.simple.ConfigReader;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.daexim.DataImportBootReady;
-import org.opendaylight.genius.arputil.internal.ArpUtilImpl;
-import org.opendaylight.genius.ipv6util.nd.Ipv6NdUtilServiceImpl;
-import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.simple.InfraUtilsModule;
-import org.opendaylight.openflowplugin.simple.OpenFlowPluginModule;
-import org.opendaylight.restconf.simple.RestConfModule;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.arputil.rev160406.OdlArputilService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.ipv6.nd.util.rev170210.Ipv6NdUtilService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.networkutils.config.rev181129.NetworkConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsalutil.rev170830.Config;
-
-public class GeniusModule extends AutoWiringModule {
-
- public GeniusModule(GuiceClassPathBinder classPathBinder) {
- super(classPathBinder, "org.opendaylight.genius");
- }
-
- @Provides
- @Singleton NetworkConfig getUpgradeConfig(ConfigReader configReader) {
- return configReader.read("/initial/genius-network-config", NetworkConfig.class);
- }
-
- @Provides
- @Singleton Config mdsalUtilConfig(ConfigReader configReader) {
- return configReader.read("/initial/genius-mdsalutil-config", Config.class);
- }
-
- @Override
- protected void configureMore() {
- // Guice
- install(new AnnotationsModule());
-
- // Infrautils
- install(new InfraUtilsModule());
-
- // MD SAL
- install(new InMemoryControllerModule());
-
- // ServiceUtils
- install(new ServiceUtilsModule());
-
- // RESTCONF
- install(new RestConfModule());
-
- // Daexim
- // TODO write real DaeximWiring, and replace this line with an install(new DaeximWiring());
- bind(DataImportBootReady.class).toInstance(new DataImportBootReady() {});
-
- // OpenFlowPlugin
- install(new OpenFlowPluginModule(classPathBinder));
-
- // TODO remove these, by ... using ConfigReader as above
- install(new InterfaceManagerModule());
- install(new ItmModule());
-
- // ARP Util
- bind(OdlArputilService.class).to(ArpUtilImpl.class);
-
- // IPv6
- bind(Ipv6NdUtilService.class).to(Ipv6NdUtilServiceImpl.class);
- }
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2016, 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.genius.simple;
-
-import com.google.inject.AbstractModule;
-import javax.annotation.Nullable;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.config.rev160406.IfmConfig;
-import org.opendaylight.yangtools.yang.binding.Augmentation;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
-
-// TODO unify with org.opendaylight.genius.interfacemanager.test.InterfaceManagerTestModule
-public class InterfaceManagerModule extends AbstractModule {
-
- @Override
- protected void configure() {
- // TODO read from real XML YANG configuration, initial XML and datastore; like BP does
- bind(IfmConfig.class).toInstance(new IfmConfig() {
-
- @Override
- @Nullable
- public <E extends Augmentation<IfmConfig>> E augmentation(Class<E> augmentationType) {
- return null;
- }
-
- @Override
- @Nullable
- public Class<? extends DataContainer> getImplementedInterface() {
- return null;
- }
-
- // as in default genius-ifm-config.xml
-
- @Override
- public Boolean isItmDirectTunnels() {
- return false;
- }
-
- @Override
- public Boolean isIfmStatsPollEnabled() {
- return false;
- }
-
- @Override
- public Integer getIfmStatsDefPollInterval() {
- return 15;
- }
- });
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.genius.simple;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.multibindings.Multibinder;
-import org.apache.karaf.shell.api.action.Action;
-import org.opendaylight.genius.itm.cli.TepShowState;
-import org.opendaylight.genius.itm.globals.ITMConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406.ItmConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.config.rev160406.ItmConfigBuilder;
-
-public class ItmModule extends AbstractModule {
-
- // TODO share code here with ItmTestModule instead of copy/pasting it from there!
-
- @Override
- protected void configure() {
- ItmConfig itmConfigObj = new ItmConfigBuilder()
- .setDefTzEnabled(true)
- .setDefTzTunnelType(ITMConstants.TUNNEL_TYPE_VXLAN)
- .setGpeExtensionEnabled(false)
- .build();
- bind(ItmConfig.class).toInstance(itmConfigObj);
-
- // Commands
- Multibinder<Action> actionsBinder = Multibinder.newSetBinder(binder(), Action.class);
- actionsBinder.addBinding().to(TepShowState.class);
- }
-
-}
+++ /dev/null
-<forwarding-rules-manager-config xmlns="urn:opendaylight:params:xml:ns:yang:openflowplugin:app:forwardingrules-manager:config">
-</forwarding-rules-manager-config>
+++ /dev/null
-<openflow-provider-config xmlns="urn:opendaylight:params:xml:ns:yang:openflow:provider:config">
-</openflow-provider-config>
+++ /dev/null
-# This file has the same format as etc/org.ops4j.pax.logging.cfg
-# but ${karaf.data} has been replaced by "data/", all Karaf/OSGi appenders etc. have been removed,
-# the file name changed from karaf.log to opendaylight.log, and the "log4j2." prefix needed to be removed.
-
-rootLogger.level = DEBUG
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#rootLogger.type = asyncRoot
-#rootLogger.includeLocation = false
-rootLogger.appenderRef.RollingFile.ref = RollingFile
-rootLogger.appenderRef.Console.ref = Console
-rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-rootLogger.appenderRef.Console.filter.threshold.level = WARN
-
-appender.console.type = Console
-appender.console.name = Console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-
-appender.rolling.type = RollingRandomAccessFile
-appender.rolling.name = RollingFile
-appender.rolling.fileName = data/log/opendaylight.log
-appender.rolling.filePattern = data/log/opendaylight.log.%i
-# uncomment to not force a disk flush
-#appender.rolling.immediateFlush = false
-appender.rolling.append = true
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size = 16MB
-
-logger.netconfsal.name = org.opendaylight.controller.sal.connect.netconf
-logger.netconfsal.level = TRACE
-logger.netconf.name = org.opendaylight.netconf
-logger.netconf.level = TRACE
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.aaa.simple.test;
-
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.opendaylight.aaa.simple.AAAModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-
-@Ignore // TODO fix NullPointerException at org.opendaylight.aaa.cert.impl.DefaultMdsalSslData.createKeyStores :155
-public class AAAModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(new AAAModule(), new InMemoryControllerModule(),
- // TODO new WebWiring(true), new ReferencesWiring(),
- new AnnotationsModule());
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.aaa.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.opendaylight.aaa.cert.api.ICertificateManager;
-import org.opendaylight.aaa.simple.CertModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-
-public class CertModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(
- new CertModule(), new InMemoryControllerModule(), new AnnotationsModule());
-
- @Inject ICertificateManager certificateManager;
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.aaa.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.aaa.simple.EncryptModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-
-public class EncryptModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(
- new EncryptModule(), new InMemoryControllerModule(), new AnnotationsModule());
-
- @Inject AAAEncryptionService encryptionService;
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.controller.simple.test;
-
-import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.mdsal.simple.PingPong;
-
-public class InMemoryControllerModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(InMemoryControllerModule.class, AnnotationsModule.class);
-
- @Inject DataBroker dataBroker;
- @Inject @PingPong DataBroker pingPongDataBroker;
- @Inject NotificationService notificationService;
-
- @Test public void testDataBroker() throws InterruptedException, ExecutionException {
- dataBroker.newReadWriteTransaction().commit().get();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.genius.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.opendaylight.genius.interfacemanager.interfaces.InterfaceManagerService;
-import org.opendaylight.genius.itm.api.IITMProvider;
-import org.opendaylight.genius.simple.GeniusModule;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.ShellTestModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-
-/**
- * Genius full distribution component test.
- *
- * @author Michael Vorburger.ch
- */
-public class GeniusSimpleDistributionTest extends AbstractSimpleDistributionTest {
-
- // TODO https://github.com/google/guice/wiki/Grapher ...
- // TODO https://google.github.io/guice/api-docs/latest/javadoc/com/google/inject/tools/jmx/Manager.html
-
- private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
-
- public @Rule GuiceRule guice = new GuiceRule(new GeniusModule(CLASS_PATH_BINDER), new ShellTestModule());
-
- @Inject InterfaceManagerService interfaceManagerService;
-
- @Inject IITMProvider itmProvider;
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.inject.guice.tests;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.junit.Test;
-import org.junit.runners.model.Statement;
-import org.opendaylight.infrautils.inject.guice.AbstractCloseableModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-
-/**
- * Test PreDestroy in Module.
- *
- * @author Michael Vorburger.ch
- */
-public class AbstractCloseableModuleTest {
-
- public static class TestModule extends AbstractCloseableModule {
- boolean isClosed = false;
-
- @Override
- public void close() {
- isClosed = true;
- }
-
- @Override protected void configureCloseables() {
- // IRL: bind(...)
- }
- }
-
- @SuppressWarnings("checkstyle:IllegalThrows")
- @Test public void testModuleWithPreDestroy() throws Throwable {
- @SuppressWarnings("resource")
- TestModule testModule = new TestModule();
- new GuiceRule(testModule, new AnnotationsModule()).apply(EMPTY_STATEMENT, null, new Object()).evaluate();
- assertThat(testModule.isClosed).isTrue();
- }
-
- private static final Statement EMPTY_STATEMENT = new Statement() {
- @Override
- public void evaluate() throws Throwable {
- }
- };
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.inject.guice.testutils.tests;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-
-/**
- * Test illustrating how to use the GuiceRule with an inline lamda binding.
- *
- * @author Michael Vorburger.ch
- */
-public class GuiceRuleLambdaTest {
-
- @SuppressWarnings("BindingToUnqualifiedCommonType")
- public @Rule GuiceRule guice = new GuiceRule(
- binder -> binder.bind(String.class).toInstance("hello, world"),
- new AnnotationsModule());
-
- @Inject String string;
-
- @Test public void testLambdaBinding() {
- assertThat(string).isEqualTo("hello, world");
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.infrautils.diagstatus.DiagStatusService;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
-import org.opendaylight.infrautils.web.WebModule;
-
-/**
- * Unit test for {@link DiagStatusModule}.
- *
- * @author Michael Vorburger.ch
- */
-public class DiagStatusModuleTest {
-
- public @Rule GuiceRule guice = new GuiceRule(WebModule.class, DiagStatusModule.class, ReadyModule.class,
- AnnotationsModule.class);
-
- @Inject DiagStatusService diagStatusService;
-
- @Test public void testDiagStatusService() { }
-
- // TODO separate DiagStatusWiring0Test VS DiagStatusWiring1Test where *1* registers a
- // Module that actually does bind a ServiceStatusProvider ...
- // not here, but in infrautils.diagstatus
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple.test;
-
-import org.junit.Test;
-import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Module;
-import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.Main;
-
-/**
- * Unit test for Main.
- *
- * @author Michael Vorburger.ch
- */
-public class MainTest {
-
- @Test
- public void testMain() {
- new Main(new TestModule()).closeInjector();
- }
-
- public static class TestModule extends AbstractGuiceJsr250Module {
- @Override
- protected void configureBindings() {
- install(new ReadyModule());
-
- // bind(SomeInterfaceWithPostConstruct.class).to(SomeClassWithPostConstruct.class);
- }
- }
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple.testutils;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.mycila.guice.ext.closeable.CloseableInjector;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.infrautils.testutils.LogRule;
-
-/**
- * Abstract base class for simple distribution component tests.
- *
- * @author Michael Vorburger.ch
- */
-public abstract class AbstractSimpleDistributionTest {
-
- // TODO public static @ClassRule ClasspathHellDuplicatesCheckRule jHades = new ClasspathHellDuplicatesCheckRule();
-
- public @Rule LogRule logRule = new LogRule();
- // TODO NOK together with Log4j on CP, re-enable when split into separate modules:
- // public @Rule LogCaptureRule logCaptureRule = new LogCaptureRule();
-
- // The point of this is really just to make sure that subclasses have a @Rule GuiceRule
- private @Inject CloseableInjector closeableInjector;
-
- @Test public void testDistribution() {
- assertThat(closeableInjector).isNotNull();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.mdsal.simple.test;
-
-import java.util.concurrent.ExecutionException;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
-import org.opendaylight.mdsal.binding.api.RpcProviderService;
-import org.opendaylight.mdsal.simple.PingPong;
-
-public class InMemoryMdsalModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(InMemoryControllerModule.class, AnnotationsModule.class);
-
- @Inject @PingPong DataBroker pingPongDataBroker;
- @Inject DataBroker dataBroker;
-
- @Inject RpcProviderService rpcProviderService;
- @Inject RpcConsumerRegistry rpcConsumerRegistry;
-
- @Test public void testDataBroker() throws InterruptedException, ExecutionException {
- dataBroker.newReadWriteTransaction().commit().get();
- }
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.netvirt.simple.test;
-
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.ShellTestModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.netvirt.simple.NetvirtModule;
-
-/**
- * Netvirt full distribution component test.
- *
- * @author Michael Vorburger.ch
- */
-@Ignore // TODO un-ignore netvirt, once genius works...
-public class NetvirtSimpleDistributionTest extends AbstractSimpleDistributionTest {
-
- private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
-
- public @Rule GuiceRule guice = new GuiceRule(new NetvirtModule(CLASS_PATH_BINDER), new ShellTestModule());
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.neutron.simple.test;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.opendaylight.infrautils.testutils.web.TestWebClient.Method.GET;
-
-import java.io.IOException;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.aaa.web.testutils.TestWebClient;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.infrautils.web.WebModule;
-import org.opendaylight.neutron.simple.NeutronModule;
-
-/**
- * Neutron component test.
- *
- * @author Michael Vorburger.ch
- */
-public class NeutronModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(
- NeutronModule.class, InMemoryControllerModule.class, WebModule.class, AnnotationsModule.class);
-
- @Inject WebServer webServer;
- @Inject TestWebClient http;
-
- @Test public void testNeutron() throws IOException {
- assertThat(http.request(GET, "/controller/nb/v2/neutron/networks").getStatus()).isEqualTo(200);
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.openflowplugin.simple.test;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import javax.inject.Inject;
-import junit.framework.AssertionFailedError;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.aaa.web.testutils.WebTestModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.diagstatus.DiagStatusService;
-import org.opendaylight.infrautils.diagstatus.ServiceStatusSummary;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider;
-import org.opendaylight.openflowplugin.impl.OpenFlowPluginProviderImpl;
-import org.opendaylight.openflowplugin.simple.OpenFlowPluginModule;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfig;
-
-public class OpenFlowPluginModuleTest extends AbstractSimpleDistributionTest {
-
- private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
-
- public @Rule GuiceRule guice = new GuiceRule(new OpenFlowPluginModule(CLASS_PATH_BINDER),
- new ServiceUtilsModule(), new InMemoryControllerModule(), new DiagStatusModule(), new WebTestModule(),
- new ReadyModule(), new AnnotationsModule());
-
- @Inject PacketProcessingService packetProcessingService; // OPNFLWPLUG-1059
- @Inject OpenFlowPluginProvider ofpProvider;
- @Inject OpenflowProviderConfig ofpConfig;
- @Inject ForwardingRulesManagerConfig frmConfig;
-
- @Inject OpenFlowPluginProviderImpl openFlowPluginProviderImpl;
- @Inject DiagStatusService diagStatus;
-
- @Test public void testConfig() throws InterruptedException {
- assertThat(ofpConfig.getGlobalNotificationQuota()).named("globalNotificationQuota").isEqualTo(64000L);
- assertThat(frmConfig.getReconciliationRetryCount()).named("reconciliationRetryCount").isEqualTo(5);
- }
-
- @Test public void testDiagStatus() throws InterruptedException, ExecutionException, TimeoutException {
- openFlowPluginProviderImpl.getFullyStarted().get(60, TimeUnit.SECONDS);
- ServiceStatusSummary status = diagStatus.getServiceStatusSummary();
- if (!status.isOperational()) {
- throw new AssertionFailedError(
- "diagStatus reports non operational, details: " + status);
- }
- }
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.ovsdb.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.opendaylight.aaa.simple.CertModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.infrautils.web.WebModule;
-import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundProvider;
-import org.opendaylight.ovsdb.lib.OvsdbConnection;
-import org.opendaylight.ovsdb.lib.impl.OvsdbConnectionService;
-import org.opendaylight.ovsdb.simple.OvsdbModule;
-import org.opendaylight.ovsdb.southbound.SouthboundProvider;
-
-public class OvsdbModuleTest extends AbstractSimpleDistributionTest {
-
- private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
-
- public @Rule GuiceRule guice = new GuiceRule(new OvsdbModule(CLASS_PATH_BINDER), new CertModule(),
- new InMemoryControllerModule(), new DiagStatusModule(), new WebModule(), new ReadyModule(),
- new AnnotationsModule());
-
- @Inject OvsdbConnection ovsdbConnection;
- @Inject SouthboundProvider southboundProvider;
- @Inject OvsdbConnectionService ovsdbConnectionService;
- @Inject HwvtepSouthboundProvider hwvtepSouthboundProvider;
-
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.restconf.simple.test;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.opendaylight.infrautils.testutils.web.TestWebClient.Method.GET;
-
-import java.io.IOException;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.aaa.web.testutils.TestWebClient;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.infrautils.web.WebModule;
-import org.opendaylight.restconf.simple.RestConfModule;
-
-/**
- * Tests if the {@link RestConfModule} works.
- *
- * @author Michael Vorburger.ch
- */
-public class RestConfModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(
- RestConfModule.class, InMemoryControllerModule.class, WebModule.class, AnnotationsModule.class);
-
- @Inject WebServer webServer;
- @Inject TestWebClient http;
-
- @Test public void testRestConf() throws IOException {
- assertThat(http.request(GET, "/restconf/modules/").getStatus()).isEqualTo(200);
-
- // TODO test security; add auth support to TestHttpClient, check that w.o. auth it's 401
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.serviceutils.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
-import org.opendaylight.serviceutils.upgrade.UpgradeState;
-
-/**
- * Test the serviceutils wiring.
- *
- * @author Michael Vorburger.ch
- */
-public class ServiceUtilsModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(ServiceUtilsModule.class, InMemoryControllerModule.class,
- AnnotationsModule.class);
-
- @Inject UpgradeState upgradeState;
-
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-netconf</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <dependencies>
-
- <dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-config</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-mapping-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-topology</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-topology-singleton</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>netconf-client</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>sal-netconf-connector</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>mdsal-netconf-connector</artifactId>
- </dependency>
-
- <!--controller-->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>threadpool-config-impl</artifactId>
- <version>0.10.0</version>
- </dependency>
-
- <!--infrautils-->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>inject.guice</artifactId>
- </dependency>
-
- <!--infrautils-->
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>inject.guice.testutils</artifactId>
- <scope>compile</scope>
- </dependency>
-
- <!--aaa-->
- <dependency>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-cert</artifactId>
- <version>0.9.0</version>
- <scope>compile</scope>
- </dependency>
-
- <!--controller-->
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>blueprint</artifactId>
- <version>0.10.0</version>
- <scope>compile</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <!-- TODO upstream version into odlparent pluginManagement -->
- <version>3.1.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- <!-- <classpathLayoutType>repository</classpathLayoutType> -->
- <classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
- <customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- <mainClass>org.opendaylight.netconf.simple.NetconfMain</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
- <formats>
- <format>dir</format>
- <format>tar</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
- <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-<!--
- <repositories>
- <repository>
- <outputDirectory>system</outputDirectory>
- </repository>
- </repositories>
--->
-</assembly>
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.netconf.simple;
-
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.simple.Main;
-
-public final class NetconfMain {
-
- private NetconfMain() { }
-
- public static void main(String[] args) {
- GuiceClassPathBinder classPathBinder = new GuiceClassPathBinder("org.opendaylight");
- new Main(new NetconfModule(classPathBinder)).awaitShutdown();
- }
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.netconf.simple;
-
-import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
-
-import javax.inject.Singleton;
-
-import org.opendaylight.aaa.api.CredentialAuth;
-import org.opendaylight.aaa.api.PasswordCredentials;
-import org.opendaylight.aaa.encrypt.AAAEncryptionService;
-import org.opendaylight.aaa.simple.AAAModule;
-import org.opendaylight.controller.config.threadpool.ScheduledThreadPool;
-import org.opendaylight.controller.config.threadpool.ThreadPool;
-import org.opendaylight.controller.config.threadpool.util.FlexibleThreadPoolWrapper;
-import org.opendaylight.controller.config.threadpool.util.NamingThreadPoolFactory;
-import org.opendaylight.controller.config.threadpool.util.ScheduledThreadPoolWrapper;
-import org.opendaylight.controller.simple.GlobalBossGroup;
-import org.opendaylight.controller.simple.GlobalEventExecutor;
-import org.opendaylight.controller.simple.GlobalTimer;
-import org.opendaylight.controller.simple.GlobalWorkerGroup;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.simple.InfraUtilsModule;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-import org.opendaylight.mdsal.dom.api.DOMMountPointService;
-import org.opendaylight.mdsal.dom.api.DOMRpcService;
-import org.opendaylight.mdsal.dom.api.DOMSchemaService;
-import org.opendaylight.netconf.api.NetconfServerDispatcher;
-import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
-import org.opendaylight.netconf.auth.AuthProvider;
-import org.opendaylight.netconf.authprovider.CredentialServiceAuthProvider;
-import org.opendaylight.netconf.client.NetconfClientDispatcher;
-import org.opendaylight.netconf.client.NetconfClientDispatcherImpl;
-import org.opendaylight.netconf.impl.NetconfServerDispatcherImpl;
-import org.opendaylight.netconf.impl.NetconfServerSessionNegotiatorFactory;
-import org.opendaylight.netconf.impl.ServerChannelInitializer;
-import org.opendaylight.netconf.impl.SessionIdProvider;
-import org.opendaylight.netconf.impl.osgi.AggregatedNetconfOperationServiceFactory;
-import org.opendaylight.netconf.impl.osgi.NetconfMonitoringServiceImpl;
-import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
-import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener;
-import org.opendaylight.netconf.mdsal.connector.MdsalNetconfOperationServiceFactory;
-import org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactoryMappers;
-import org.opendaylight.netconf.simple.annotations.GlobalNetconfProcessingExecutor;
-import org.opendaylight.netconf.simple.annotations.GlobalNetconfSshScheduledExecutor;
-import org.opendaylight.netconf.simple.annotations.MdsalNetconfConnector;
-import org.opendaylight.netconf.simple.annotations.NetconfAuthProvider;
-import org.opendaylight.netconf.topology.api.NetconfTopology;
-import org.opendaylight.netconf.topology.impl.NetconfTopologyImpl;
-import org.opendaylight.netconf.topology.impl.SchemaRepositoryProviderImpl;
-import org.opendaylight.restconf.simple.RestConfModule;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.inject.Provides;
-
-import io.netty.channel.EventLoopGroup;
-import io.netty.util.Timer;
-import io.netty.util.concurrent.EventExecutor;
-
-/**
- * Guice module for NetConf.
- *
- */
-public class NetconfModule extends AutoWiringModule {
-
- private static final Logger LOG = LoggerFactory.getLogger(NetconfModule.class);
-
- // FIXME Move the config parameters to its own class and cfg files
- private static final Long CONNECTION_TIMEOUT_MILLIS = 20000L;
- private static final Integer MONITORING_UPDATE_INTERVAL = 6;
- private static final String NAME_PREFIX = "remote-connector-processing-executor";
- private static final Integer MIN_THREAD_COUNT_FLEXIBLE_THREAD_POOL = 1;
- private static final Integer MAX_THREAD_COUNT_FLEXIBLE_THREAD_POOL = 4;
- private static final Long KEEP_ALIVE_MILLIS_FLEXIBLE_THREAD_POOL = 600000L;
- private static final Integer MAX_THREAD_COUNT_SCHEDULED_THREAD_POOL = 8;
- private static final Integer WRITE_TRANSACTION_IDLE_TIMEOUT_MILLIS = 20;
-
- public NetconfModule(GuiceClassPathBinder classPathBinder) {
- super(classPathBinder, "org.opendaylight.netconf");
- }
-
- @Override
- protected void configureMore() {
- LOG.info("Loading netconf");
- // Guice
- install(new AnnotationsModule());
- // Controller/MD-SAL
- install(new InMemoryControllerModule());
- install(new AAAModule());
- install(new InfraUtilsModule());
-
- // ServiceUtils
- install(new ServiceUtilsModule());
-
- // RESTCONF
- install(new RestConfModule());
- }
-
- // Converted here from netconf-config/src/main/resources/OSGI-INF/blueprint/netconf-config.xml
- // START
- @Provides
- @Singleton
- NamingThreadPoolFactory getNamingThreadPoolFactory() {
- return new NamingThreadPoolFactory(NAME_PREFIX);
- }
-
- @Provides
- @Singleton
- @GlobalNetconfProcessingExecutor
- ThreadPool getFlexibleThreadPool(NamingThreadPoolFactory namingThreadPoolFactory) {
- return new FlexibleThreadPoolWrapper(MIN_THREAD_COUNT_FLEXIBLE_THREAD_POOL,
- MAX_THREAD_COUNT_FLEXIBLE_THREAD_POOL,
- KEEP_ALIVE_MILLIS_FLEXIBLE_THREAD_POOL,
- TimeUnit.valueOf("MILLISECONDS"),
- namingThreadPoolFactory);
- }
-
- @Provides
- @Singleton
- @GlobalNetconfSshScheduledExecutor
- ScheduledThreadPool getScheduledThreadPool(NamingThreadPoolFactory namingThreadPoolFactory) {
- return new ScheduledThreadPoolWrapper(MAX_THREAD_COUNT_SCHEDULED_THREAD_POOL, namingThreadPoolFactory);
- }
-
- // Converted here from netconf-config/src/main/resources/OSGI-INF/blueprint/netconf-config.xml
- // END
-
- // Converted here from netconf-client/src/main/resources/OSGI-INF/blueprint/netconf-client.xml
- // START
- @Provides
- @Singleton
- @org.opendaylight.netconf.simple.annotations.NetconfClientDispatcher
- NetconfClientDispatcher getNetconfClientDispatcher(
- @GlobalBossGroup EventLoopGroup globalBossGroup,
- @GlobalWorkerGroup EventLoopGroup globalWorkerGroup,
- @GlobalTimer Timer globalTimer) {
- return new NetconfClientDispatcherImpl(globalBossGroup, globalWorkerGroup, globalTimer);
- }
- // Converted here from netconf-client/src/main/resources/OSGI-INF/blueprint/netconf-client.xml
- // END
-
- // Converted here from mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml
- // START
- @Provides
- @Singleton
- @org.opendaylight.netconf.simple.annotations.MapperAggregatorRegistry
- NetconfOperationServiceFactoryListener getMapperAggregatorRegistry() {
- return new AggregatedNetconfOperationServiceFactory();
- }
-
- @Provides
- @Singleton
- @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory
- NetconfOperationServiceFactory getAggregatedNetconfOperationServiceFactoryListener() {
- return new AggregatedNetconfOperationServiceFactory();
- }
-
- @Provides
- @Singleton
- @AggregatedNetconfOperationServiceFactoryMappers
- AggregatedNetconfOperationServiceFactory getAggregatedNetconfOperationServiceFactoryMappers(
- @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory NetconfOperationServiceFactory aggregatedNetconfOperationServiceFactory) {
- return new AggregatedNetconfOperationServiceFactory(Arrays.asList(aggregatedNetconfOperationServiceFactory));
- }
-
- @Provides
- @Singleton
- NetconfMonitoringService getNetconfMonitoringService(
- @org.opendaylight.netconf.simple.annotations.AggregatedNetconfOperationServiceFactory NetconfOperationServiceFactory aggregatedNetconfOperationServiceFactory,
- @GlobalNetconfSshScheduledExecutor ScheduledThreadPool scheduledThreadPool) {
- return new NetconfMonitoringServiceImpl(aggregatedNetconfOperationServiceFactory, scheduledThreadPool, MONITORING_UPDATE_INTERVAL);
- }
-
- @Provides
- @Singleton
- NetconfServerSessionNegotiatorFactory getNetconfServerSessionNegotiatorFactory(
- @GlobalTimer Timer globalTimer,
- @AggregatedNetconfOperationServiceFactoryMappers AggregatedNetconfOperationServiceFactory aggregatedNetconfOperationServiceFactoryMappers,
- SessionIdProvider sessionIdProvider,
- NetconfMonitoringService netconfMonitoringService) {
- return new NetconfServerSessionNegotiatorFactory(globalTimer,
- aggregatedNetconfOperationServiceFactoryMappers,
- sessionIdProvider,
- CONNECTION_TIMEOUT_MILLIS,
- netconfMonitoringService);
- }
-
- @Provides
- @Singleton
- ServerChannelInitializer getServerChannelInitializer(
- NetconfServerSessionNegotiatorFactory netconfServerSessionNegotiatorFactory) {
- return new ServerChannelInitializer(netconfServerSessionNegotiatorFactory);
- }
-
- @Provides
- @Singleton
- NetconfServerDispatcher getNetconfServerDispatcher(
- ServerChannelInitializer serverChannelInitializer,
- @GlobalBossGroup EventLoopGroup globalBossGroup,
- @GlobalWorkerGroup EventLoopGroup globalWorkerGroup) {
- return new NetconfServerDispatcherImpl(serverChannelInitializer, globalBossGroup, globalWorkerGroup);
- }
- // Converted here from mdsal-netconf-impl/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-impl.xml
- // END
-
- // Converted here from netconf-topology/src/main/resources/OSGI-INF/blueprint/netconf-topology.xml
- // START
- @Provides
- @Singleton
- SchemaRepositoryProviderImpl getSchemaRepositoryProviderImpl(
- ServerChannelInitializer serverChannelInitializer,
- @GlobalBossGroup EventLoopGroup globalBossGroup,
- @GlobalWorkerGroup EventLoopGroup globalWorkerGroup) {
- return new SchemaRepositoryProviderImpl("shared-schema-repository-impl");
- }
-
- @Provides
- @Singleton
- NetconfTopology getNetconfTopology(@org.opendaylight.netconf.simple.annotations.NetconfClientDispatcher NetconfClientDispatcher clientDispatcherDependency,
- @GlobalNetconfSshScheduledExecutor ScheduledThreadPool keepAliveExecutor,
- @GlobalNetconfProcessingExecutor ThreadPool processingExecutor,
- SchemaRepositoryProviderImpl schemaRepositoryProvider,
- @GlobalEventExecutor EventExecutor eventExecutor,
- DataBroker dataBroker,
- DOMMountPointService mountPointService,
- AAAEncryptionService encryptionService) {
- NetconfTopologyImpl impl= new NetconfTopologyImpl("topology-netconf",
- clientDispatcherDependency,
- eventExecutor,
- keepAliveExecutor,
- processingExecutor,
- schemaRepositoryProvider,
- dataBroker,
- mountPointService,
- encryptionService);
- impl.init();
- return impl;
- }
-//
-// @Provides
-// @Singleton
-// NetconfTopologySingletonService getNetconfTopologyManager(DataBroker dataBroker,
-// DOMRpcProviderService rpcRegistry,
-// ClusterSingletonServiceProvider clusterSingletonService,
-// @GlobalNetconfSshScheduledExecutor ScheduledThreadPool keepAliveExecutor,
-// @GlobalNetconfProcessingExecutor ThreadPool processingExecutor,
-// ActorSystemProvider actorSystemProvider,
-// @GlobalEventExecutor EventExecutor eventExecutor,
-// @org.opendaylight.netconf.simple.NetconfClientDispatcher NetconfClientDispatcher clientDispatcherDependency,
-// DOMMountPointService mountPointService,
-// AAAEncryptionService encryptionService) {
-// Config config = new ConfigBuilder().setWriteTransactionIdleTimeout(WRITE_TRANSACTION_IDLE_TIMEOUT_MILLIS)
-// .build();
-// return new NetconfTopologyManager(dataBroker,
-// rpcRegistry,
-// clusterSingletonService,
-// keepAliveExecutor,
-// processingExecutor,
-// actorSystemProvider,
-// eventExecutor,
-// clientDispatcherDependency,
-// "topology-netconf",
-// config,
-// mountPointService,
-// encryptionService);
-// }
-
- // Converted here from netconf-topology/src/main/resources/OSGI-INF/blueprint/netconf-topology.xml
- // END
-
- // Converted here from mdsal-netconf-connector/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-connector.xml
- // START
-
- @Provides
- @Singleton
- @MdsalNetconfConnector
- NetconfOperationServiceFactory getMdsalNetconfOperationServiceFactory(DOMSchemaService schemaService,
- @org.opendaylight.netconf.simple.annotations.MapperAggregatorRegistry NetconfOperationServiceFactoryListener mapperAggregatorRegistry,
- DOMDataBroker domDataBroker,
- DOMRpcService domRpcService) {
- return new MdsalNetconfOperationServiceFactory(schemaService, mapperAggregatorRegistry, domDataBroker, domRpcService);
- }
-
- // Converted here from mdsal-netconf-connector/src/main/resources/OSGI-INF/blueprint/mdsal-netconf-connector.xml
- // END
-
- // Converted here from netconf/aaa-authn-odl-plugin/src/main/resources/OSGI-INF/blueprint/aaa-authn-netconf.xml
- // START
-
- @Provides
- @Singleton
- @NetconfAuthProvider
- AuthProvider getNetconfAuthProvider(CredentialAuth<PasswordCredentials> credService) {
- return new CredentialServiceAuthProvider(credService);
- }
- // Converted here from netconf/aaa-authn-odl-plugin/src/main/resources/OSGI-INF/blueprint/aaa-authn-netconf.xml
- // END
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.netconf.simple.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
-
-/**
- * PingPong {@link NetconfOperationServiceFactory} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}AggregatedNetconfOperationServiceFactory NetconfOperationServiceFactory listener) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface AggregatedNetconfOperationServiceFactory {
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.netconf.simple.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
-
-/**
- * PingPong {@link NetconfOperationServiceFactory} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}AggregatedNetconfOperationServiceFactoryMappers NetconfOperationServiceFactory listener) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface AggregatedNetconfOperationServiceFactoryMappers {
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.netconf.simple.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import org.opendaylight.controller.config.threadpool.ScheduledThreadPool;
-
-/**
- * PingPong {@link ScheduledThreadPool} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}GlobalNetconfSshScheduledExecutor ScheduledThreadPool scheduledThreadPool) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface GlobalNetconfProcessingExecutor {
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.netconf.simple.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import org.opendaylight.controller.config.threadpool.ScheduledThreadPool;
-
-/**
- * PingPong {@link ScheduledThreadPool} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}GlobalNetconfSshScheduledExecutor ScheduledThreadPool scheduledThreadPool) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface GlobalNetconfSshScheduledExecutor {
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.netconf.simple.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener;
-
-/**
- * PingPong {@link NetconfOperationServiceFactoryListener} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}MapperAggregatorRegistry NetconfOperationServiceFactoryListener listener) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface MapperAggregatorRegistry {
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.netconf.simple.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
-
-/**
- * PingPong {@link NetconfOperationServiceFactory} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}MdsalNetconfConnector NetconfOperationServiceFactory listener) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface MdsalNetconfConnector {
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.netconf.simple.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-import org.opendaylight.netconf.auth.AuthProvider;
-
-/**
- * PingPong {@link AuthProvider} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}NetconfAuthProvider org.opendaylight.netconf.auth.AuthProvider provider) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface NetconfAuthProvider {
-
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.netconf.simple.annotations;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.inject.Qualifier;
-
-/**
- * PingPong {@link NetconfClientDispatcher} dependency injection annotation.
- *
- * <p>USAGE: <pre> {@literal @}Singleton
- * public class Thing {
- * {@literal @}Inject
- * public Thing({@literal @}NetconfClientDispatcher NetconfClientDispatcher dispatcher) {
- * ...
- * }
- * }</pre>
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@Target({ PARAMETER, METHOD, FIELD })
-public @interface NetconfClientDispatcher {
-
-}
+++ /dev/null
-# This file has the same format as etc/org.ops4j.pax.logging.cfg
-# but ${karaf.data} has been replaced by "data/", all Karaf/OSGi appenders etc. have been removed,
-# the file name changed from karaf.log to opendaylight.log, and the "log4j2." prefix needed to be removed.
-
-rootLogger.level = DEBUG
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#rootLogger.type = asyncRoot
-#rootLogger.includeLocation = false
-rootLogger.appenderRef.RollingFile.ref = RollingFile
-rootLogger.appenderRef.Console.ref = Console
-rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-rootLogger.appenderRef.Console.filter.threshold.level = WARN
-
-appender.console.type = Console
-appender.console.name = Console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-
-appender.rolling.type = RollingRandomAccessFile
-appender.rolling.name = RollingFile
-appender.rolling.fileName = data/log/opendaylight.log
-appender.rolling.filePattern = data/log/opendaylight.log.%i
-# uncomment to not force a disk flush
-#appender.rolling.immediateFlush = false
-appender.rolling.append = true
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size = 16MB
-
-logger.netconfsal.name = org.opendaylight.controller.sal.connect.netconf
-logger.netconfsal.level = TRACE
-logger.netconf.name = org.opendaylight.netconf
-logger.netconf.level = TRACE
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-netvirt</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <dependencies>
-
- <dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-genius</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.netvirt</groupId>
- <artifactId>odl-netvirt-openstack</artifactId>
- <classifier>features</classifier>
- <type>xml</type>
- <exclusions>
- <!-- TODO Figure out why M2E breaks down over (just) neutronvpn-impl's <classifier>config <type>xml ... -->
- <exclusion>
- <groupId>org.opendaylight.netvirt</groupId>
- <artifactId>neutronvpn-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.opendaylight.netvirt</groupId>
- <!-- bgpmanager needs Thrift, which for some reason is not transitively pulled (TODO find out why);
- But we, currently at least, have no interest in bgpmanager anyway, so exclude it here, for now. -->
- <artifactId>bgpmanager-impl</artifactId>
- </exclusion>
- <!-- karaf.shell.console leads to various duplicate classpath entries; we only support shell.core -->
- <exclusion>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- </exclusion>
- <!-- osgi.core overlaps (x5) with felix.configadmin, and we don't need it here anyway
- TODO EXCLUDE IT AGAIN LATER; FOR NOW, SOME CLASSES UNFORTUNATELY STILL REFERENCE IT
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- -->
- <!-- osgi.compendium (big) overlaps (x12) with (small) felix.configadmin, and with org.osgi.service.event (x9)
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- TODO but shiro.web.env.EnvironmentLoader currently requires org.osgi.service.http.NamespaceException,
- which is available in osgi.compendium, thus commented; so sort out duplicate classpath entries with exclusion of felix.configadmin instead, and remove this
- -->
- <exclusion>
- <groupId>org.opendaylight.netconf</groupId>
- <artifactId>odl-restconf-noauth</artifactId>
- </exclusion>
- <!-- TODO Remove when this is merged and we bumped to an odlparent with it: https://git.opendaylight.org/gerrit/#/c/67184/ -->
- <exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </exclusion>
- <!-- TODO Remove when this is merged and we bumped to an odlparent with it: https://git.opendaylight.org/gerrit/#/c/67185/ -->
- <exclusion>
- <groupId>org.iq80.leveldb</groupId>
- <artifactId>leveldb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.opendaylight.odlparent</groupId>
- <artifactId>odl-karaf-feat-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>odl-aaa-shiro</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-shiro-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.opendaylight.aaa</groupId>
- <artifactId>aaa-shiro-act</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <!-- TODO upstream version into odlparent pluginManagement -->
- <version>3.1.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- <!-- <classpathLayoutType>repository</classpathLayoutType> -->
- <classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
- <customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- <mainClass>org.opendaylight.netvirt.simple.NetvirtMain</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
- <formats>
- <format>dir</format>
- <format>tar</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
- <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-<!--
- <repositories>
- <repository>
- <outputDirectory>system</outputDirectory>
- </repository>
- </repositories>
--->
-</assembly>
+++ /dev/null
-/*
- * Copyright (c) 2016 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.netvirt.simple;
-
-import com.google.inject.AbstractModule;
-import org.opendaylight.netvirt.aclservice.AclServiceManagerImpl;
-import org.opendaylight.netvirt.aclservice.api.AclServiceManager;
-import org.opendaylight.netvirt.aclservice.listeners.AclEventListener;
-import org.opendaylight.netvirt.aclservice.listeners.AclInterfaceListener;
-import org.opendaylight.netvirt.aclservice.listeners.AclInterfaceStateListener;
-import org.opendaylight.netvirt.aclservice.listeners.AclNodeListener;
-
-// TODO This is copy/pasted from org.opendaylight.netvirt.aclservice.tests.AclServiceModule, but should not be..
-public class AclServiceModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(AclServiceManager.class).to(AclServiceManagerImpl.class);
- bind(AclInterfaceStateListener.class);
- bind(AclNodeListener.class);
- bind(AclInterfaceListener.class);
- bind(AclEventListener.class);
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.netvirt.simple;
-
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.simple.Main;
-
-public final class NetvirtMain {
-
- private NetvirtMain() { }
-
- public static void main(String[] args) {
- GuiceClassPathBinder classPathBinder = new GuiceClassPathBinder("org.opendaylight");
- new Main(new NetvirtModule(classPathBinder)).awaitShutdown();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.netvirt.simple;
-
-import org.opendaylight.genius.simple.GeniusModule;
-import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-
-public class NetvirtModule extends AutoWiringModule {
-
- public NetvirtModule(GuiceClassPathBinder classPathBinder) {
- super(classPathBinder, "org.opendaylight.netvirt");
- }
-
- @Override
- protected void configureMore() {
- install(new GeniusModule(classPathBinder));
-
- install(new AclServiceModule());
- }
-}
+++ /dev/null
-# This file has the same format as etc/org.ops4j.pax.logging.cfg
-# but ${karaf.data} has been replaced by "data/", all Karaf/OSGi appenders etc. have been removed,
-# the file name changed from karaf.log to opendaylight.log, and the "log4j2." prefix needed to be removed.
-
-rootLogger.level = DEBUG
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#rootLogger.type = asyncRoot
-#rootLogger.includeLocation = false
-rootLogger.appenderRef.RollingFile.ref = RollingFile
-rootLogger.appenderRef.Console.ref = Console
-rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-rootLogger.appenderRef.Console.filter.threshold.level = WARN
-
-appender.console.type = Console
-appender.console.name = Console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-
-appender.rolling.type = RollingRandomAccessFile
-appender.rolling.name = RollingFile
-appender.rolling.fileName = data/log/opendaylight.log
-appender.rolling.filePattern = data/log/opendaylight.log.%i
-# uncomment to not force a disk flush
-#appender.rolling.immediateFlush = false
-appender.rolling.append = true
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size = 16MB
-
-logger.netconfsal.name = org.opendaylight.controller.sal.connect.netconf
-logger.netconfsal.level = TRACE
-logger.netconf.name = org.opendaylight.netconf
-logger.netconf.level = TRACE
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.netvirt.simple.test;
-
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.ShellTestModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.netvirt.simple.NetvirtModule;
-
-/**
- * Netvirt full distribution component test.
- *
- * @author Michael Vorburger.ch
- */
-@Ignore // TODO un-ignore netvirt, once genius works...
-public class NetvirtSimpleDistributionTest extends AbstractSimpleDistributionTest {
-
- private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
-
- public @Rule GuiceRule guice = new GuiceRule(new NetvirtModule(CLASS_PATH_BINDER), new ShellTestModule());
-
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-neutron</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <!-- TODO upstream version into odlparent pluginManagement -->
- <version>3.1.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- <!-- <classpathLayoutType>repository</classpathLayoutType> -->
- <classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
- <customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
- <formats>
- <format>dir</format>
- <format>tar</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
- <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-<!--
- <repositories>
- <repository>
- <outputDirectory>system</outputDirectory>
- </repository>
- </repositories>
--->
-</assembly>
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.neutron.simple;
-
-import com.google.inject.AbstractModule;
-import org.opendaylight.neutron.northbound.api.WebInitializer;
-import org.opendaylight.neutron.spi.INeutronBgpvpnCRUD;
-import org.opendaylight.neutron.spi.INeutronFirewallCRUD;
-import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD;
-import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD;
-import org.opendaylight.neutron.spi.INeutronFloatingIpCRUD;
-import org.opendaylight.neutron.spi.INeutronL2gatewayCRUD;
-import org.opendaylight.neutron.spi.INeutronL2gatewayConnectionCRUD;
-import org.opendaylight.neutron.spi.INeutronLoadBalancerCRUD;
-import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
-import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD;
-import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD;
-import org.opendaylight.neutron.spi.INeutronMeteringLabelCRUD;
-import org.opendaylight.neutron.spi.INeutronMeteringLabelRuleCRUD;
-import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.spi.INeutronPortCRUD;
-import org.opendaylight.neutron.spi.INeutronQosPolicyCRUD;
-import org.opendaylight.neutron.spi.INeutronRouterCRUD;
-import org.opendaylight.neutron.spi.INeutronSFCFlowClassifierCRUD;
-import org.opendaylight.neutron.spi.INeutronSFCPortChainCRUD;
-import org.opendaylight.neutron.spi.INeutronSFCPortPairCRUD;
-import org.opendaylight.neutron.spi.INeutronSFCPortPairGroupCRUD;
-import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD;
-import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD;
-import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
-import org.opendaylight.neutron.spi.INeutronTapFlowCRUD;
-import org.opendaylight.neutron.spi.INeutronTapServiceCRUD;
-import org.opendaylight.neutron.spi.INeutronTrunkCRUD;
-import org.opendaylight.neutron.spi.INeutronVpnIkePolicyCRUD;
-import org.opendaylight.neutron.spi.INeutronVpnIpSecPolicyCRUD;
-import org.opendaylight.neutron.spi.INeutronVpnIpSecSiteConnectionsCRUD;
-import org.opendaylight.neutron.spi.INeutronVpnServiceCRUD;
-import org.opendaylight.neutron.transcriber.NeutronBgpvpnInterface;
-import org.opendaylight.neutron.transcriber.NeutronFirewallInterface;
-import org.opendaylight.neutron.transcriber.NeutronFirewallPolicyInterface;
-import org.opendaylight.neutron.transcriber.NeutronFirewallRuleInterface;
-import org.opendaylight.neutron.transcriber.NeutronFloatingIpInterface;
-import org.opendaylight.neutron.transcriber.NeutronL2gatewayConnectionInterface;
-import org.opendaylight.neutron.transcriber.NeutronL2gatewayInterface;
-import org.opendaylight.neutron.transcriber.NeutronLoadBalancerHealthMonitorInterface;
-import org.opendaylight.neutron.transcriber.NeutronLoadBalancerInterface;
-import org.opendaylight.neutron.transcriber.NeutronLoadBalancerListenerInterface;
-import org.opendaylight.neutron.transcriber.NeutronLoadBalancerPoolInterface;
-import org.opendaylight.neutron.transcriber.NeutronMeteringLabelInterface;
-import org.opendaylight.neutron.transcriber.NeutronMeteringLabelRuleInterface;
-import org.opendaylight.neutron.transcriber.NeutronNetworkInterface;
-import org.opendaylight.neutron.transcriber.NeutronPortInterface;
-import org.opendaylight.neutron.transcriber.NeutronQosPolicyInterface;
-import org.opendaylight.neutron.transcriber.NeutronRouterInterface;
-import org.opendaylight.neutron.transcriber.NeutronSFCFlowClassifierInterface;
-import org.opendaylight.neutron.transcriber.NeutronSFCPortChainInterface;
-import org.opendaylight.neutron.transcriber.NeutronSFCPortPairGroupInterface;
-import org.opendaylight.neutron.transcriber.NeutronSFCPortPairInterface;
-import org.opendaylight.neutron.transcriber.NeutronSecurityGroupInterface;
-import org.opendaylight.neutron.transcriber.NeutronSecurityRuleInterface;
-import org.opendaylight.neutron.transcriber.NeutronSubnetInterface;
-import org.opendaylight.neutron.transcriber.NeutronTapFlowInterface;
-import org.opendaylight.neutron.transcriber.NeutronTapServiceInterface;
-import org.opendaylight.neutron.transcriber.NeutronTrunkInterface;
-import org.opendaylight.neutron.transcriber.NeutronVpnIkePolicyInterface;
-import org.opendaylight.neutron.transcriber.NeutronVpnIpSecPolicyInterface;
-import org.opendaylight.neutron.transcriber.NeutronVpnIpSecSiteConnectionsInterface;
-import org.opendaylight.neutron.transcriber.NeutronVpnServiceInterface;
-
-/**
- * Guice module for Neutron.
- *
- * @author Michael Vorburger.ch
- */
-public class NeutronModule extends AbstractModule {
-
- @Override
- protected void configure() {
- bind(WebInitializer.class);
-
- // The following is currently copy/pasted from
- // org.opendaylight.neutron.e2etest.NeutronTestWiring
- // but likely will get replaced with automated classpath scanning anyway later
- // (strangely though it needs everywhere, only here)
- bind(INeutronNetworkCRUD.class).to(NeutronNetworkInterface.class);
- bind(INeutronSubnetCRUD.class).to(NeutronSubnetInterface.class);
- bind(INeutronPortCRUD.class).to(NeutronPortInterface.class);
- bind(INeutronRouterCRUD.class).to(NeutronRouterInterface.class);
- bind(INeutronFloatingIpCRUD.class).to(NeutronFloatingIpInterface.class);
- bind(INeutronSecurityGroupCRUD.class).to(NeutronSecurityGroupInterface.class);
- bind(INeutronSecurityRuleCRUD.class).to(NeutronSecurityRuleInterface.class);
- bind(INeutronFirewallCRUD.class).to(NeutronFirewallInterface.class);
- bind(INeutronFirewallPolicyCRUD.class).to(NeutronFirewallPolicyInterface.class);
- bind(INeutronFirewallRuleCRUD.class).to(NeutronFirewallRuleInterface.class);
- bind(INeutronLoadBalancerCRUD.class).to(NeutronLoadBalancerInterface.class);
- bind(INeutronLoadBalancerListenerCRUD.class).to(NeutronLoadBalancerListenerInterface.class);
- bind(INeutronLoadBalancerPoolCRUD.class).to(NeutronLoadBalancerPoolInterface.class);
- bind(INeutronBgpvpnCRUD.class).to(NeutronBgpvpnInterface.class);
- bind(INeutronL2gatewayCRUD.class).to(NeutronL2gatewayInterface.class);
- bind(INeutronL2gatewayConnectionCRUD.class).to(NeutronL2gatewayConnectionInterface.class);
- bind(INeutronLoadBalancerHealthMonitorCRUD.class).to(NeutronLoadBalancerHealthMonitorInterface.class);
- bind(INeutronMeteringLabelCRUD.class).to(NeutronMeteringLabelInterface.class);
- bind(INeutronMeteringLabelRuleCRUD.class).to(NeutronMeteringLabelRuleInterface.class);
- bind(INeutronVpnServiceCRUD.class).to(NeutronVpnServiceInterface.class);
- bind(INeutronVpnIkePolicyCRUD.class).to(NeutronVpnIkePolicyInterface.class);
- bind(INeutronVpnIpSecPolicyCRUD.class).to(NeutronVpnIpSecPolicyInterface.class);
- bind(INeutronSFCFlowClassifierCRUD.class).to(NeutronSFCFlowClassifierInterface.class);
- bind(INeutronSFCPortChainCRUD.class).to(NeutronSFCPortChainInterface.class);
- bind(INeutronSFCPortPairGroupCRUD.class).to(NeutronSFCPortPairGroupInterface.class);
- bind(INeutronSFCPortPairCRUD.class).to(NeutronSFCPortPairInterface.class);
- bind(INeutronQosPolicyCRUD.class).to(NeutronQosPolicyInterface.class);
- bind(INeutronTrunkCRUD.class).to(NeutronTrunkInterface.class);
- bind(INeutronTapServiceCRUD.class).to(NeutronTapServiceInterface.class);
- bind(INeutronTapFlowCRUD.class).to(NeutronTapFlowInterface.class);
- bind(INeutronVpnIpSecSiteConnectionsCRUD.class).to(NeutronVpnIpSecSiteConnectionsInterface.class);
- }
-}
+++ /dev/null
-# This file has the same format as etc/org.ops4j.pax.logging.cfg
-# but ${karaf.data} has been replaced by "data/", all Karaf/OSGi appenders etc. have been removed,
-# the file name changed from karaf.log to opendaylight.log, and the "log4j2." prefix needed to be removed.
-
-rootLogger.level = DEBUG
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#rootLogger.type = asyncRoot
-#rootLogger.includeLocation = false
-rootLogger.appenderRef.RollingFile.ref = RollingFile
-rootLogger.appenderRef.Console.ref = Console
-rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-rootLogger.appenderRef.Console.filter.threshold.level = WARN
-
-appender.console.type = Console
-appender.console.name = Console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-
-appender.rolling.type = RollingRandomAccessFile
-appender.rolling.name = RollingFile
-appender.rolling.fileName = data/log/opendaylight.log
-appender.rolling.filePattern = data/log/opendaylight.log.%i
-# uncomment to not force a disk flush
-#appender.rolling.immediateFlush = false
-appender.rolling.append = true
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size = 16MB
-
-logger.netconfsal.name = org.opendaylight.controller.sal.connect.netconf
-logger.netconfsal.level = TRACE
-logger.netconf.name = org.opendaylight.netconf
-logger.netconf.level = TRACE
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.neutron.simple.test;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.opendaylight.infrautils.testutils.web.TestWebClient.Method.GET;
-
-import java.io.IOException;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.aaa.web.WebServer;
-import org.opendaylight.aaa.web.testutils.TestWebClient;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.infrautils.web.WebModule;
-import org.opendaylight.neutron.simple.NeutronModule;
-
-/**
- * Neutron component test.
- *
- * @author Michael Vorburger.ch
- */
-public class NeutronModuleTest extends AbstractSimpleDistributionTest {
-
- public @Rule GuiceRule guice = new GuiceRule(
- NeutronModule.class, InMemoryControllerModule.class, WebModule.class, AnnotationsModule.class);
-
- @Inject WebServer webServer;
- @Inject TestWebClient http;
-
- @Test public void testNeutron() throws IOException {
- assertThat(http.request(GET, "/controller/nb/v2/neutron/networks").getStatus()).isEqualTo(200);
- }
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-openflowplugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>openflowplugin-artifacts</artifactId>
- <version>0.8.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
-
- <dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
- <artifactId>openflow-protocol-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
- <artifactId>openflow-protocol-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>openflowplugin-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.openflowplugin</groupId>
- <artifactId>openflowplugin-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.openflowplugin.applications</groupId>
- <artifactId>forwardingrules-manager</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.aaa.web</groupId>
- <artifactId>testutils</artifactId>
- <version>0.9.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>infrautils-testutils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>inject.guice.testutils</artifactId>
- <scope>compile</scope>
- <!-- TODO <scope>test</scope> instead of compile here once I'll create
- a new infrautils:inject.guice.testutils (non-testutils) for the run-time part.. -->
- </dependency>
- <!-- TODO remove, this is just a temporary hack, see above -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
- <!-- TODO remove when https://git.opendaylight.org/gerrit/#/c/67763/ is merged and odlparent bumped -->
- <dependency>
- <groupId>com.mycila.guice.extensions</groupId>
- <artifactId>mycila-guice-jsr250</artifactId>
- <scope>compile</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <!-- TODO upstream version into odlparent pluginManagement -->
- <version>3.1.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- <!-- <classpathLayoutType>repository</classpathLayoutType> -->
- <classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
- <customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- <mainClass>org.opendaylight.openflowplugin.simple.OpenFlowPluginMain</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
- <formats>
- <format>dir</format>
- <format>tar</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
- <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-<!--
- <repositories>
- <repository>
- <outputDirectory>system</outputDirectory>
- </repository>
- </repositories>
--->
-</assembly>
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.openflowplugin.simple;
-
-import static com.google.common.collect.Lists.newArrayList;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import org.opendaylight.controller.simple.ConfigReader;
-import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider;
-import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory;
-import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderList;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.config.rev160506.SwitchConnectionConfig;
-
-/**
- * Wiring (non-Guice specific) for openflowjava. Based on
- * openflowplugin/openflowjava/openflowjava-blueprint-config/src/main/resources/OSGI-INF/blueprint/openflowjava.xml.
- *
- * @author Michael Vorburger.ch
- */
-@Singleton
-public class OpenFlowJavaWiring {
-
- private final SwitchConnectionProviderList switchConnectionProviderList;
-
- @Inject
- public OpenFlowJavaWiring(ConfigReader configReader,
- SwitchConnectionProviderFactory switchConnectionProviderFactory) {
- SwitchConnectionConfig defaultSwitchConnConfig = configReader
- .read("/initial/default-openflow-connection-config", SwitchConnectionConfig.class,
- "openflow-switch-connection-provider-default-impl");
- SwitchConnectionProvider defaultSwitchConnProvider = switchConnectionProviderFactory
- .newInstance(defaultSwitchConnConfig);
-
- SwitchConnectionConfig legacySwitchConnConfig = configReader
- .read("/initial/legacy-openflow-connection-config",SwitchConnectionConfig.class,
- "openflow-switch-connection-provider-legacy-impl");
- SwitchConnectionProvider legacySwitchConnProvider = switchConnectionProviderFactory
- .newInstance(legacySwitchConnConfig);
-
- switchConnectionProviderList = new SwitchConnectionProviderList(
- newArrayList(defaultSwitchConnProvider, legacySwitchConnProvider));
- }
-
- public SwitchConnectionProviderList getSwitchConnectionProviderList() {
- return switchConnectionProviderList;
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.openflowplugin.simple;
-
-import com.google.inject.Provides;
-import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.simple.ConfigReader;
-import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry;
-import org.opendaylight.mdsal.simple.PingPong;
-import org.opendaylight.openflowjava.protocol.impl.core.SwitchConnectionProviderFactoryImpl;
-import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory;
-import org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderList;
-import org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationService;
-import org.opendaylight.openflowplugin.api.openflow.configuration.ConfigurationServiceFactory;
-import org.opendaylight.openflowplugin.impl.ForwardingPingPongDataBroker;
-import org.opendaylight.openflowplugin.impl.PingPongDataBroker;
-import org.opendaylight.openflowplugin.impl.configuration.ConfigurationServiceFactoryImpl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfig;
-
-public class OpenFlowPluginModule extends AutoWiringModule {
-
- public OpenFlowPluginModule(GuiceClassPathBinder classPathBinder) {
- super(classPathBinder, "org.opendaylight.openflowplugin");
- }
-
- @Override
- protected void configureMore() {
- // TODO curious that this is needed despite SwitchConnectionProviderFactoryImpl being annotated?!
- bind(SwitchConnectionProviderFactory.class).to(SwitchConnectionProviderFactoryImpl.class);
- }
-
- @Provides
- @Singleton PacketProcessingService getPacketProcessingService(RpcConsumerRegistry rpcConsumerRegistry) {
- return rpcConsumerRegistry.getRpcService(PacketProcessingService.class);
- }
-
- @Provides
- @Singleton PingPongDataBroker getPingPongDataBroker(@PingPong DataBroker pingPongDataBroker) {
- return new ForwardingPingPongDataBroker(pingPongDataBroker);
- }
-
- @Provides
- @Singleton ConfigurationService getConfigurationService(OpenflowProviderConfig providerConfig) {
- ConfigurationServiceFactory csf = new ConfigurationServiceFactoryImpl();
- return csf.newInstance(providerConfig);
- }
-
- @Provides
- @Singleton SwitchConnectionProviderList getOpenFlowJavaWiring(OpenFlowJavaWiring openFlowJavaWiring) {
- return openFlowJavaWiring.getSwitchConnectionProviderList();
- }
-
- @Provides
- @Singleton OpenflowProviderConfig getUpgradeConfig(ConfigReader configReader) {
- return configReader.read("/initial/openflow-provider-config", OpenflowProviderConfig.class);
- }
-
- @Provides
- @Singleton ForwardingRulesManagerConfig getForwardingRulesManagerConfig(ConfigReader configReader) {
- return configReader.read("/initial/openflow-frm-config", ForwardingRulesManagerConfig.class);
- }
-}
+++ /dev/null
-/*
- * (C) 2019 Lumina Networks, Inc.
- * 2077 Gateway Place, Suite 500, San Jose, CA 95110.
- * All rights reserved.
- *
- * Use of the software files and documentation is subject to license terms.
- */
-package org.opendaylight.openflowplugin.simple;
-
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.simple.ShellMain;
-
-public final class OpenflowPluginMain {
-
- private OpenflowPluginMain() { }
-
- public static void main(String[] args) {
- GuiceClassPathBinder classPathBinder = new GuiceClassPathBinder("org.opendaylight");
- new ShellMain(new OpenFlowPluginModule(classPathBinder)).awaitShutdown();
- }
-}
+++ /dev/null
-<forwarding-rules-manager-config xmlns="urn:opendaylight:params:xml:ns:yang:openflowplugin:app:forwardingrules-manager:config">
-</forwarding-rules-manager-config>
+++ /dev/null
-<openflow-provider-config xmlns="urn:opendaylight:params:xml:ns:yang:openflow:provider:config">
-</openflow-provider-config>
+++ /dev/null
-# This file has the same format as etc/org.ops4j.pax.logging.cfg
-# but ${karaf.data} has been replaced by "data/", all Karaf/OSGi appenders etc. have been removed,
-# the file name changed from karaf.log to opendaylight.log, and the "log4j2." prefix needed to be removed.
-
-rootLogger.level = DEBUG
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#rootLogger.type = asyncRoot
-#rootLogger.includeLocation = false
-rootLogger.appenderRef.RollingFile.ref = RollingFile
-rootLogger.appenderRef.Console.ref = Console
-rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-rootLogger.appenderRef.Console.filter.threshold.level = WARN
-
-appender.console.type = Console
-appender.console.name = Console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-
-appender.rolling.type = RollingRandomAccessFile
-appender.rolling.name = RollingFile
-appender.rolling.fileName = data/log/opendaylight.log
-appender.rolling.filePattern = data/log/opendaylight.log.%i
-# uncomment to not force a disk flush
-#appender.rolling.immediateFlush = false
-appender.rolling.append = true
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size = 16MB
-
-logger.netconfsal.name = org.opendaylight.controller.sal.connect.netconf
-logger.netconfsal.level = TRACE
-logger.netconf.name = org.opendaylight.netconf
-logger.netconf.level = TRACE
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple.testutils;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.mycila.guice.ext.closeable.CloseableInjector;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.infrautils.testutils.LogRule;
-
-/**
- * Abstract base class for simple distribution component tests.
- *
- * @author Michael Vorburger.ch
- */
-public abstract class AbstractSimpleDistributionTest {
-
- // TODO public static @ClassRule ClasspathHellDuplicatesCheckRule jHades = new ClasspathHellDuplicatesCheckRule();
-
- public @Rule LogRule logRule = new LogRule();
- // TODO NOK together with Log4j on CP, re-enable when split into separate modules:
- // public @Rule LogCaptureRule logCaptureRule = new LogCaptureRule();
-
- // The point of this is really just to make sure that subclasses have a @Rule GuiceRule
- private @Inject CloseableInjector closeableInjector;
-
- @Test public void testDistribution() {
- assertThat(closeableInjector).isNotNull();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.openflowplugin.simple.test;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import javax.inject.Inject;
-import junit.framework.AssertionFailedError;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.aaa.web.testutils.WebTestModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.diagstatus.DiagStatusService;
-import org.opendaylight.infrautils.diagstatus.ServiceStatusSummary;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.openflowplugin.api.openflow.OpenFlowPluginProvider;
-import org.opendaylight.openflowplugin.impl.OpenFlowPluginProviderImpl;
-import org.opendaylight.openflowplugin.simple.OpenFlowPluginModule;
-import org.opendaylight.serviceutils.simple.ServiceUtilsModule;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflowplugin.app.forwardingrules.manager.config.rev160511.ForwardingRulesManagerConfig;
-
-public class OpenFlowPluginModuleTest extends AbstractSimpleDistributionTest {
-
- private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
-
- public @Rule GuiceRule guice = new GuiceRule(new OpenFlowPluginModule(CLASS_PATH_BINDER),
- new ServiceUtilsModule(), new InMemoryControllerModule(), new DiagStatusModule(), new WebTestModule(),
- new ReadyModule(), new AnnotationsModule());
-
- @Inject PacketProcessingService packetProcessingService; // OPNFLWPLUG-1059
- @Inject OpenFlowPluginProvider ofpProvider;
- @Inject OpenflowProviderConfig ofpConfig;
- @Inject ForwardingRulesManagerConfig frmConfig;
-
- @Inject OpenFlowPluginProviderImpl openFlowPluginProviderImpl;
- @Inject DiagStatusService diagStatus;
-
- @Test public void testConfig() throws InterruptedException {
- assertThat(ofpConfig.getGlobalNotificationQuota()).named("globalNotificationQuota").isEqualTo(64000L);
- assertThat(frmConfig.getReconciliationRetryCount()).named("reconciliationRetryCount").isEqualTo(5);
- }
-
- @Test public void testDiagStatus() throws InterruptedException, ExecutionException, TimeoutException {
- openFlowPluginProviderImpl.getFullyStarted().get(60, TimeUnit.SECONDS);
- ServiceStatusSummary status = diagStatus.getServiceStatusSummary();
- if (!status.isOperational()) {
- throw new AssertionFailedError(
- "diagStatus reports non operational, details: " + status);
- }
- }
-
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-aggregator</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
-
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-ovsdb</artifactId>
- <version>1.0.0-SNAPSHOT</version>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.ovsdb</groupId>
- <artifactId>hwvtepsouthbound-artifacts</artifactId>
- <version>1.8.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.ovsdb</groupId>
- <artifactId>library-artifacts</artifactId>
- <version>1.8.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.ovsdb</groupId>
- <artifactId>southbound-artifacts</artifactId>
- <version>1.8.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-
- <dependencies>
-
- <dependency>
- <groupId>ch.vorburger.opendaylight.simple</groupId>
- <artifactId>simple-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.ovsdb</groupId>
- <artifactId>hwvtepsouthbound-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.ovsdb</groupId>
- <artifactId>library</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.ovsdb</groupId>
- <artifactId>southbound-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.aaa.web</groupId>
- <artifactId>testutils</artifactId>
- <version>0.9.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>infrautils-testutils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.infrautils</groupId>
- <artifactId>inject.guice.testutils</artifactId>
- <scope>compile</scope>
- <!-- TODO <scope>test</scope> instead of compile here once I'll create
- a new infrautils:inject.guice.testutils (non-testutils) for the run-time part.. -->
- </dependency>
- <!-- TODO remove, this is just a temporary hack, see above -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
- <!-- TODO remove when https://git.opendaylight.org/gerrit/#/c/67763/ is merged and odlparent bumped -->
- <dependency>
- <groupId>com.mycila.guice.extensions</groupId>
- <artifactId>mycila-guice-jsr250</artifactId>
- <scope>compile</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <!-- TODO upstream version into odlparent pluginManagement -->
- <version>3.1.1</version>
- <configuration>
- <descriptors>
- <descriptor>src/assembly/simple.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- <!-- <classpathLayoutType>repository</classpathLayoutType> -->
- <classpathLayoutType>custom</classpathLayoutType>
- <!-- This must match the outputFileNameMapping in the simple.xml assembly descriptor -->
- <customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
- <mainClass>org.opendaylight.ovsdb.simple.OvsdbMain</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2018 Red Hat, Inc. and others. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
- <id>simple</id>
- <formats>
- <format>dir</format>
- <format>tar</format>
- </formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <!-- This must match the customClasspathLayout of the maven-jar-plugin -->
- <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- </dependencySet>
- </dependencySets>
-<!--
- <repositories>
- <repository>
- <outputDirectory>system</outputDirectory>
- </repository>
- </repositories>
--->
-</assembly>
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.ovsdb.simple;
-
-import org.opendaylight.infrautils.inject.guice.AutoWiringModule;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-
-public class OvsdbModule extends AutoWiringModule {
-
- public OvsdbModule(GuiceClassPathBinder classPathBinder) {
- super(classPathBinder, "org.opendaylight.ovsdb");
- }
-
-}
+++ /dev/null
-# This file has the same format as etc/org.ops4j.pax.logging.cfg
-# but ${karaf.data} has been replaced by "data/", all Karaf/OSGi appenders etc. have been removed,
-# the file name changed from karaf.log to opendaylight.log, and the "log4j2." prefix needed to be removed.
-
-rootLogger.level = DEBUG
-# uncomment to use asynchronous loggers, which require mvn:com.lmax/disruptor/3.3.2 library
-#rootLogger.type = asyncRoot
-#rootLogger.includeLocation = false
-rootLogger.appenderRef.RollingFile.ref = RollingFile
-rootLogger.appenderRef.Console.ref = Console
-rootLogger.appenderRef.Console.filter.threshold.type = ThresholdFilter
-rootLogger.appenderRef.Console.filter.threshold.level = WARN
-
-appender.console.type = Console
-appender.console.name = Console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-
-appender.rolling.type = RollingRandomAccessFile
-appender.rolling.name = RollingFile
-appender.rolling.fileName = data/log/opendaylight.log
-appender.rolling.filePattern = data/log/opendaylight.log.%i
-# uncomment to not force a disk flush
-#appender.rolling.immediateFlush = false
-appender.rolling.append = true
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | %m%n
-appender.rolling.policies.type = Policies
-appender.rolling.policies.size.type = SizeBasedTriggeringPolicy
-appender.rolling.policies.size.size = 16MB
-
-logger.netconfsal.name = org.opendaylight.controller.sal.connect.netconf
-logger.netconfsal.level = TRACE
-logger.netconf.name = org.opendaylight.netconf
-logger.netconf.level = TRACE
+++ /dev/null
-/*
- * Copyright (c) 2017 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.infrautils.simple.testutils;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.mycila.guice.ext.closeable.CloseableInjector;
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.junit.Test;
-import org.opendaylight.infrautils.testutils.LogRule;
-
-/**
- * Abstract base class for simple distribution component tests.
- *
- * @author Michael Vorburger.ch
- */
-public abstract class AbstractSimpleDistributionTest {
-
- // TODO public static @ClassRule ClasspathHellDuplicatesCheckRule jHades = new ClasspathHellDuplicatesCheckRule();
-
- public @Rule LogRule logRule = new LogRule();
- // TODO NOK together with Log4j on CP, re-enable when split into separate modules:
- // public @Rule LogCaptureRule logCaptureRule = new LogCaptureRule();
-
- // The point of this is really just to make sure that subclasses have a @Rule GuiceRule
- private @Inject CloseableInjector closeableInjector;
-
- @Test public void testDistribution() {
- assertThat(closeableInjector).isNotNull();
- }
-}
+++ /dev/null
-/*
- * Copyright (c) 2018 Red Hat, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.ovsdb.simple.test;
-
-import javax.inject.Inject;
-import org.junit.Rule;
-import org.opendaylight.aaa.simple.CertModule;
-import org.opendaylight.controller.simple.InMemoryControllerModule;
-import org.opendaylight.infrautils.inject.guice.GuiceClassPathBinder;
-import org.opendaylight.infrautils.inject.guice.testutils.AnnotationsModule;
-import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule;
-import org.opendaylight.infrautils.ready.guice.ReadyModule;
-import org.opendaylight.infrautils.simple.DiagStatusModule;
-import org.opendaylight.infrautils.simple.testutils.AbstractSimpleDistributionTest;
-import org.opendaylight.infrautils.web.WebModule;
-import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundProvider;
-import org.opendaylight.ovsdb.lib.OvsdbConnection;
-import org.opendaylight.ovsdb.lib.impl.OvsdbConnectionService;
-import org.opendaylight.ovsdb.simple.OvsdbModule;
-import org.opendaylight.ovsdb.southbound.SouthboundProvider;
-
-public class OvsdbModuleTest extends AbstractSimpleDistributionTest {
-
- private static final GuiceClassPathBinder CLASS_PATH_BINDER = new GuiceClassPathBinder("org.opendaylight");
-
- public @Rule GuiceRule guice = new GuiceRule(new OvsdbModule(CLASS_PATH_BINDER), new CertModule(),
- new InMemoryControllerModule(), new DiagStatusModule(), new WebModule(), new ReadyModule(),
- new AnnotationsModule());
-
- @Inject OvsdbConnection ovsdbConnection;
- @Inject SouthboundProvider southboundProvider;
- @Inject OvsdbConnectionService ovsdbConnectionService;
- @Inject HwvtepSouthboundProvider hwvtepSouthboundProvider;
-
-}
Code Review / odlmicro.git / commitdiff