Skip to content

Commit

Permalink
Correct version in docs & scripts
Browse files Browse the repository at this point in the history
Signed-off-by: Michal Banik <[email protected]>
  • Loading branch information
Michal Banik committed Apr 13, 2021
1 parent 4fc0d62 commit 97dc867
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion lighty-core/lighty-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ To use Lighty controller in your project:
<dependency>
<groupId>io.lighty.core</groupId>
<artifactId>lighty-controller</artifactId>
<version>14.0.0-SNAPSHOT</version>
<version>12.1.2</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion lighty-examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ODL core services represent MD-SAL layer, controller, DataStore, global schema c
<dependency>
<groupId>io.lighty.core.parents</groupId>
<artifactId>lighty-dependency-artifacts</artifactId>
<version>14.0.0-SNAPSHOT</version>
<version>12.1.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions lighty-examples/lighty-cluster-app/Dockerfile.k8s
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM openjdk:11-jre-slim

COPY target/lighty-cluster-app-14.0.0-SNAPSHOT-bin.zip /
COPY target/lighty-cluster-app-12.1.2-bin.zip /

RUN apt-get update && apt-get install unzip \
&& unzip /lighty-cluster-app-14.0.0-SNAPSHOT-bin.zip \
&& rm /lighty-cluster-app-14.0.0-SNAPSHOT-bin.zip
&& unzip /lighty-cluster-app-12.1.2-bin.zip \
&& rm /lighty-cluster-app-12.1.2-bin.zip

ENTRYPOINT ["/lighty-cluster-app-14.0.0-SNAPSHOT/start-controller-node-k8s.sh"]
ENTRYPOINT ["/lighty-cluster-app-12.1.2/start-controller-node-k8s.sh"]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh

#start controller
cd /lighty-cluster-app-14.0.0-SNAPSHOT
java -ms128m -mx128m -XX:MaxMetaspaceSize=128m -jar lighty-cluster-app-14.0.0-SNAPSHOT.jar -n 0 -k
cd /lighty-cluster-app-12.1.2
java -ms128m -mx128m -XX:MaxMetaspaceSize=128m -jar lighty-cluster-app-12.1.2.jar -n 0 -k
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ mvn clean compile quarkus:dev
## Build package & Run
```
mvn clean package
java -Xms128m -Xmx128m -XX:MaxMetaspaceSize=128m -jar target/lighty-quarkus-netconf-app-14.0.0-SNAPSHOT-runner.jar
java -Xms128m -Xmx128m -XX:MaxMetaspaceSize=128m -jar target/lighty-quarkus-netconf-app-12.1.2-runner.jar
```

## Build native image
Expand Down Expand Up @@ -59,4 +59,4 @@ Parameters measured after application start.
| No. of jars | 254 |

```** -Xms128m -Xmx128m -XX:MaxMetaspaceSize=128m```
```*** sudo ps -o pid,rss,user,command ax | grep java | grep quarkus```
```*** sudo ps -o pid,rss,user,command ax | grep java | grep quarkus```
10 changes: 5 additions & 5 deletions lighty-examples/lighty-community-restconf-netconf-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ build the project: ```mvn clean install```
### Start this demo example
* build the project using ```mvn clean install```
* go to target directory ```cd lighty-examples/lighty-community-restconf-netconf-app/target```
* unzip example application bundle ```unzip lighty-community-restconf-netconf-app-14.0.0-SNAPSHOT-bin.zip```
* go to unzipped application directory ```cd lighty-community-restconf-netconf-app-14.0.0-SNAPSHOT```
* start controller example controller application ```java -jar lighty-community-restconf-netconf-app-14.0.0-SNAPSHOT.jar```
* unzip example application bundle ```unzip lighty-community-restconf-netconf-app-12.1.2-bin.zip```
* go to unzipped application directory ```cd lighty-community-restconf-netconf-app-12.1.2```
* start controller example controller application ```java -jar lighty-community-restconf-netconf-app-12.1.2.jar```

### Test example application
Once example application has been started using command ```java -jar lighty-community-restconf-netconf-app-14.0.0-SNAPSHOT.jar```
Once example application has been started using command ```java -jar lighty-community-restconf-netconf-app-12.1.2.jar```
RESTCONF web interface is available at URL ```http://localhost:8888/restconf/*```

##### URLs to start with
Expand All @@ -43,7 +43,7 @@ URLs for Swagger (choose RESTCONF [draft18](https://tools.ietf.org/html/draft-ie

### Use custom config files
There are two separated config files: for NETCONF SBP single node and for cluster.
`java -jar lighty-community-restconf-netconf-app-14.0.0-SNAPSHOT.jar /path/to/singleNodeConfig.json`
`java -jar lighty-community-restconf-netconf-app-12.1.2.jar /path/to/singleNodeConfig.json`

Example configuration for single node is [here](src/main/assembly/resources/sampleConfigSingleNode.json)

Expand Down
10 changes: 5 additions & 5 deletions lighty-examples/lighty-community-restconf-ofp-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM openjdk:11-jre-slim

COPY ./target/lighty-community-restconf-ofp-app-14.0.0-SNAPSHOT-bin.zip /
COPY ./target/lighty-community-restconf-ofp-app-12.1.2-bin.zip /
RUN apt-get update && apt-get install unzip \
&& unzip /lighty-community-restconf-ofp-app-14.0.0-SNAPSHOT-bin.zip \
&& rm /lighty-community-restconf-ofp-app-14.0.0-SNAPSHOT-bin.zip
&& unzip /lighty-community-restconf-ofp-app-12.1.2-bin.zip \
&& rm /lighty-community-restconf-ofp-app-12.1.2-bin.zip


##libstdc++ is required by leveldbjni-1.8 (Akka dispatcher)
#Uncaught error from thread [opendaylight-cluster-data-akka.persistence.dispatchers.default-plugin-dispatcher-22]: Could not load library. Reasons: [no leveldbjni64-1.8 in java.library.path, no leveldbjni-1.8 in java.library.path, no leveldbjni in java.library.path, /tmp/libleveldbjni-64-1-3166161234556196376.8: Error loading shared library libstdc++.so.6: No such file or directory (needed by /tmp/libleveldbjni-64-1-3166161234556196376.8)], shutting down JVM since 'akka.jvm-exit-on-fatal-error' is enabled for ActorSystem[opendaylight-cluster-data]
RUN apt-get install libstdc++6

WORKDIR /lighty-community-restconf-ofp-app-14.0.0-SNAPSHOT
WORKDIR /lighty-community-restconf-ofp-app-12.1.2

EXPOSE 8888
EXPOSE 8185
Expand All @@ -19,4 +19,4 @@ EXPOSE 6653
EXPOSE 2550
EXPOSE 80

CMD java -jar lighty-community-restconf-ofp-app-14.0.0-SNAPSHOT.jar sampleConfigSingleNode.json
CMD java -jar lighty-community-restconf-ofp-app-12.1.2.jar sampleConfigSingleNode.json
6 changes: 3 additions & 3 deletions lighty-examples/lighty-community-restconf-ofp-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Build the project using maven command: ```mvn clean install```.
This will create *.zip* archive in target directory. Extract this archive
and run *.jar* file using java with command:
```
java -jar lighty-community-restconf-ofp-app-14.0.0-SNAPSHOT.jar
java -jar lighty-community-restconf-ofp-app-12.1.2.jar
```

### Use custom config files
Expand All @@ -24,7 +24,7 @@ after build.

When running application pass path to configuration file as argument:
```
java -jar lighty-community-restconf-ofp-app-14.0.0-SNAPSHOT.jar sampleConfigSingleNode.json
java -jar lighty-community-restconf-ofp-app-12.1.2.jar sampleConfigSingleNode.json
```

### Building and running Docker Image
Expand Down Expand Up @@ -377,4 +377,4 @@ curl --request POST \
Default logging configuration may be overwritten by JVM option
```-Dlog4j.configuration=/path/to/log4j.properties```

Content of ```log4j.properties``` is described [here](https://logging.apache.org/log4j/2.x/manual/configuration.html).
Content of ```log4j.properties``` is described [here](https://logging.apache.org/log4j/2.x/manual/configuration.html).
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ mvn spring-boot:run
or

```
java -jar target/lighty-controller-springboot-14.0.0-SNAPSHOT.jar
java -jar target/lighty-controller-springboot-12.1.2.jar
```

or in any IDE, run main in
Expand Down
2 changes: 1 addition & 1 deletion lighty-models/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ my-model/pom.xml
<parent>
<groupId>io.lighty.core</groupId>
<artifactId>lighty-binding-parent</artifactId>
<version>14.0.0-SNAPSHOT</version>
<version>12.1.2</version>
<relativePath/>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion lighty-modules/lighty-netconf-sb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ To use NETCONF in your project:
<dependency>
<groupId>io.lighty.modules</groupId>
<artifactId>lighty-netconf-sb</artifactId>
<version>14.0.0-SNAPSHOT</version>
<version>12.1.2</version>
</dependency>
```
2. Initialize and start an instance of NETCONF SBP in your code:
Expand Down
2 changes: 1 addition & 1 deletion lighty-modules/lighty-openflow-sb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ is Lighty's version of openflow plugin.
<dependency>
<groupId>io.lighty.modules</groupId>
<artifactId>lighty-openflow-sb</artifactId>
<version>14.0.0-SNAPSHOT</version>
<version>12.1.2</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion lighty-modules/lighty-restconf-nb-community/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ To use RESTCONF in your project:
<dependency>
<groupId>io.lighty.modules</groupId>
<artifactId>lighty-restconf-nb-community</artifactId>
<version>14.0.0-SNAPSHOT</version>
<version>12.1.2</version>
</dependency>
```

Expand Down

0 comments on commit 97dc867

Please sign in to comment.