Skip to content

Commit

Permalink
Merge pull request #969 from PeterSuna/release_Sulfur
Browse files Browse the repository at this point in the history
Prepare release 16.0.0
  • Loading branch information
vainyksi authored May 6, 2022
2 parents b645d10 + 55d496e commit e6deef2
Show file tree
Hide file tree
Showing 19 changed files with 30 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ls -1 yangs
#Run simulator for testing purpose
printLine
echo -e "-- Starting gNMI simulator device --\n"
java -jar ${GITHUB_WORKSPACE}/lighty-modules/lighty-gnmi/lighty-gnmi-device-simulator/target/lighty-gnmi-device-simulator-16.0.0-SNAPSHOT.jar -c ./simulator/example_config.json > /dev/null 2>&1 &
java -jar ${GITHUB_WORKSPACE}/lighty-modules/lighty-gnmi/lighty-gnmi-device-simulator/target/lighty-gnmi-device-simulator-16.0.0.jar -c ./simulator/example_config.json > /dev/null 2>&1 &

#Add yangs into controller through REST rpc
./add_yangs_via_rpc.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lighty-rnc-app/simulator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine/git as clone
WORKDIR /netconf-simulator
RUN git clone https://github.com/PANTHEONtech/lighty-netconf-simulator.git -b 14.2.0
RUN git clone https://github.com/PANTHEONtech/lighty-netconf-simulator.git -b 15.2.0

FROM maven:3.8-jdk-11-slim as build
WORKDIR /lighty-netconf-simulator
Expand All @@ -13,4 +13,4 @@ COPY --from=build /lighty-netconf-simulator/examples/devices/lighty-network-topo

EXPOSE 17380

ENTRYPOINT ["java", "-jar", "/lighty-netconf-simulator/target/lighty-network-topology-device-14.2.0.jar"]
ENTRYPOINT ["java", "-jar", "/lighty-netconf-simulator/target/lighty-network-topology-device-15.2.0.jar"]
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>io.lighty.applications.rcgnmi</groupId>
<artifactId>lighty-rcgnmi-app-docker</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>16.0.0</version>

<properties>
<image.name>lighty-rcgnmi</image.name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<groupId>io.lighty.applications.rnc</groupId>
<artifactId>lighty-rnc-app-docker</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>16.0.0</version>

<properties>
<image.name>lighty-rnc</image.name>
Expand Down
4 changes: 2 additions & 2 deletions lighty-core/dependency-versions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@
<connection>scm:git:https://github.com/PANTHEONtech/lighty.git</connection>
<developerConnection>scm:git:https://github.com/PANTHEONtech/lighty.git</developerConnection>
<url>https://github.com/PANTHEONtech/lighty</url>
<tag>HEAD</tag>
</scm>
<tag>16.0.0</tag>
</scm>
<developers>
<developer>
<id>rovarga</id>
Expand Down
4 changes: 2 additions & 2 deletions lighty-core/lighty-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@
<connection>scm:git:https://github.com/PANTHEONtech/lighty.git</connection>
<developerConnection>scm:git:https://github.com/PANTHEONtech/lighty.git</developerConnection>
<url>https://github.com/PANTHEONtech/lighty</url>
<tag>HEAD</tag>
</scm>
<tag>16.0.0</tag>
</scm>
<developers>
<developer>
<id>rovarga</id>
Expand Down
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>16.0.0-SNAPSHOT</version>
<version>16.0.0</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions lighty-core/lighty-minimal-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@
<connection>scm:git:https://github.com/PANTHEONtech/lighty.git</connection>
<developerConnection>scm:git:https://github.com/PANTHEONtech/lighty.git</developerConnection>
<url>https://github.com/PANTHEONtech/lighty</url>
<tag>HEAD</tag>
</scm>
<tag>16.0.0</tag>
</scm>
<developers>
<developer>
<id>rovarga</id>
Expand Down
2 changes: 1 addition & 1 deletion lighty-examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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>16.0.0-SNAPSHOT</version>
<version>16.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
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-16.0.0-SNAPSHOT-bin.zip```
* go to unzipped application directory ```cd lighty-community-restconf-netconf-app-16.0.0-SNAPSHOT```
* start controller example controller application ```java -jar lighty-community-restconf-netconf-app-16.0.0-SNAPSHOT.jar```
* unzip example application bundle ```unzip lighty-community-restconf-netconf-app-16.0.0-bin.zip```
* go to unzipped application directory ```cd lighty-community-restconf-netconf-app-16.0.0```
* start controller example controller application ```java -jar lighty-community-restconf-netconf-app-16.0.0.jar```

### Test example application
Once example application has been started using command ```java -jar lighty-community-restconf-netconf-app-16.0.0-SNAPSHOT.jar```
Once example application has been started using command ```java -jar lighty-community-restconf-netconf-app-16.0.0.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-16.0.0-SNAPSHOT.jar /path/to/singleNodeConfig.json`
`java -jar lighty-community-restconf-netconf-app-16.0.0.jar /path/to/singleNodeConfig.json`

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

Expand Down
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-16.0.0-SNAPSHOT.jar
java -jar target/lighty-controller-springboot-16.0.0.jar
```

or in any IDE, run main in
Expand Down
4 changes: 0 additions & 4 deletions lighty-examples/lighty-controller-springboot-netconf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,4 @@
</plugins>
</pluginManagement>
</build>

<scm>
<tag>HEAD</tag>
</scm>
</project>
10 changes: 5 additions & 5 deletions lighty-examples/lighty-gnmi-community-restconf-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This application starts:
* [Lighty.io Controller](../../lighty-core/lighty-controller) with modules:
* [lighty.io RESTCONF module](../../lighty-modules/lighty-restconf-nb-community)
* [lighty.io gNMI module](../../lighty-modules/lighty-gnmi/lighty-gnmi-sb)
* [lighty.io gNMI device simulator](https://github.com/PANTHEONtech/lighty/tree/14.2.0/lighty-modules/lighty-gnmi/lighty-gnmi-device-simulator)
* [lighty.io gNMI device simulator](../../lighty-modules/lighty-gnmi/lighty-gnmi-device-simulator)

![lighty.io gNMI / RESTCONF architecture](docs/lighty-gnmi-restconf-architecture.png)

Expand Down Expand Up @@ -42,22 +42,22 @@ cd lighty-examples/lighty-gnmi-community-restconf-app
### Start RCgNMI controller app
Unzip lighty-rcgnmi-app to current location
```
unzip ../../lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app/target/lighty-rcgnmi-app-16.0.0-SNAPSHOT-bin.zip
unzip ../../lighty-applications/lighty-rcgnmi-app-aggregator/lighty-rcgnmi-app/target/lighty-rcgnmi-app-16.0.0-bin.zip
```
Start application with pre-prepared configuration [example_config.json](example_config.json).
```
java -jar lighty-rcgnmi-app-16.0.0-SNAPSHOT/lighty-rcgnmi-app-16.0.0-SNAPSHOT.jar -c example_config.json
java -jar lighty-rcgnmi-app-16.0.0/lighty-rcgnmi-app-16.0.0.jar -c example_config.json
```

### Start lighty.io gNMI device simulator
Unzip gNMI simulator app to current folder.
```
unzip ../../lighty-modules/lighty-gnmi/lighty-gnmi-device-simulator/target/lighty-gnmi-device-simulator-16.0.0-SNAPSHOT-bin.zip
unzip ../../lighty-modules/lighty-gnmi/lighty-gnmi-device-simulator/target/lighty-gnmi-device-simulator-16.0.0-bin.zip
```

Start the application with pre-prepared configuration [simulator_config.json](simulator/simulator_config.json)
```
java -jar lighty-gnmi-device-simulator-16.0.0-SNAPSHOT/lighty-gnmi-device-simulator-16.0.0-SNAPSHOT.jar -c simulator/simulator_config.json
java -jar lighty-gnmi-device-simulator-16.0.0/lighty-gnmi-device-simulator-16.0.0.jar -c simulator/simulator_config.json
```

### Add client certificates to lighty.io gNMI keystore
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>16.0.0-SNAPSHOT</version>
<version>16.0.0</version>
<relativePath/>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion lighty-modules/lighty-bgp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ To use lighty BGP plugin in your project:
<dependency>
<groupId>io.lighty.modules</groupId>
<artifactId>lighty-bgp</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>16.0.0</version>
</dependency>
```
* Initialize and start BgpModule instance:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This simulator provides gNMI device driven by gNMI proto files, with datastore d
<dependency>
<groupId>io.lighty.modules.gnmi</groupId>
<artifactId>lighty-gnmi-device-simulator</artifactId>
<version>16.0.0-SNAPSHOT</version>
<version>16.0.0</version>
</dependency>
```

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>16.0.0-SNAPSHOT</version>
<version>16.0.0</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-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>16.0.0-SNAPSHOT</version>
<version>16.0.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<connection>scm:git:https://github.com/PANTHEONtech/lighty.git</connection>
<developerConnection>scm:git:https://github.com/PANTHEONtech/lighty.git</developerConnection>
<url>https://github.com/PANTHEONtech/lighty</url>
<tag>HEAD</tag>
<tag>16.0.0</tag>
</scm>
<developers>
<developer>
Expand Down

0 comments on commit e6deef2

Please sign in to comment.