<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReports</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReportsApi</artifactId>
- <version>2.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>sdnc-oam :: SdncReports :: SdncReportsApi</name>
<!-- CSS -->
<script src="./node_modules/jquery.min.js"></script>
<script src="./node_modules/tether.min.js" ></script>
- <link rel="stylesheet" href="/webjars/bootstrap/3.3.7/css/bootstrap.min.css">
- <script src="/webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <link rel="stylesheet" href="/webjars/bootstrap/3.3.7/css/bootstrap.min.css">
+ <script src="/webjars/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<link rel="stylesheet" href="/style/sdnc-style.css">
<!-- JS -->
<!-- load angular,date-time picker,pagination,growl and ui-router -->
<script src = "./node_modules/angular.min.js"></script>
<script src = "./node_modules/angular-route.min.js"></script>
<script src="./node_modules/angular-utils-pagination/dirPagination.js"></script>
- <script src="./node_modules/ng-csv/build/ng-csv.min.js"></script>
+ <script src="./node_modules/ng-csv/build/ng-csv.min.js"></script>
<script src="./node_modules/angular-sanitize.min.js"></script>
<link rel="stylesheet" href="./node_modules/angularjs-datetime-picker/angularjs-datetime-picker.css" />
<script src="./node_modules/angularjs-datetime-picker/angularjs-datetime-picker.js"></script>
<div class="container">
<!-- header page -->
<div ng-include="" src="'header.html'"></div>
- <div style="border-style:ridge;">
+ <div style="border-style:ridge;">
<div ng-include="" src="'tabs.html'"></div>
<!-- views will be injected here -->
<div ng-view></div>
</div> </div>
<!-- footer page -->
<div width="100%" align="center" ng-include="" src="'footer.html'"></div>
-
+
</body>
-</html>
\ No newline at end of file
+</html>
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReports</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReportsDao</artifactId>
- <version>2.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>sdnc-oam :: SdncReports :: SdncReportsDao</name>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>SdncReports</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: SdncReports</name>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>admportal</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: admportal</name>
<parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>getBackupVnfDetailService</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>sdnc-oam :: vnfbackup :: getBackupVnfDetailService</name>
<url>http://maven.apache.org</url>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: vnfbackup</name>
<parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigbackupservice</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>sdnc-oam :: vnfbackup :: vnfconfigbackupservice</name>
<url>http://maven.apache.org</url>
<dependency>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>getBackupVnfDetailService</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigreportsservice</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<script src = "./node_modules/angular.min.js"></script>
<script src = "./node_modules/angular-route.min.js"></script>
<script src="./node_modules/angular-utils-pagination/dirPagination.js"></script>
- <script src="./node_modules/ng-csv/build/ng-csv.min.js"></script>
+ <script src="./node_modules/ng-csv/build/ng-csv.min.js"></script>
<script src="./node_modules/angular-sanitize.min.js"></script>
<link rel="stylesheet" href="./node_modules/angularjs-datetime-picker/angularjs-datetime-picker.css" />
<script src="./node_modules/angularjs-datetime-picker/angularjs-datetime-picker.js"></script>
<div class="container">
<!-- header page -->
<div ng-include="'static/views/header.html'"></div>
- <div style="border-style:ridge;height:auto;">
+ <div style="border-style:ridge;height:auto;">
<div ng-include="'static/views/tabs.html'" ></div>
<!-- views will be injected here -->
<div ng-view></div>
<div ng-include="'static/views/footer.html'" ></div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
<parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>configbackuprestore</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam.vnfbackup</groupId>
<artifactId>vnfconfigreportsservice</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>sdnc-oam :: vnfbackup :: vnfconfigreportservice</name>
<url>http://maven.apache.org</url>
# Modifications copyright (c) 2021 AT&T Intellectual Property
#
-#
+# Remove all dangling images
+docker image prune -f
###################### Netconf Simulator Setup ######################
mkdir ${WORKSPACE}/archives/pnf-simulator
git clone "https://gerrit.onap.org/r/integration/simulators/pnf-simulator" ${WORKSPACE}/archives/pnf-simulator
-# Fix docker-compose to add nexus repo for onap dockers
+# Fix docker-compose to add nexus repo for onap dockers
mv ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml.orig
cat ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml.orig | sed -e "s/image: onap/image: nexus3.onap.org:10001\/onap/" > ${WORKSPACE}/archives/pnf-simulator/netconfsimulator/docker-compose.yml
sdnc:
image: onap/sdnc-image:latest
- container_name: sdnc
+ container_name: sdnc_controller
volumes:
- /etc/localtime:/etc/localtime:ro
- $SDNC_CERT_PATH:/opt/opendaylight/current/certs
- ODL_USER=${ODL_USER}
- ODL_PASSWORD=${ODL_PASSWORD}
- ODL_CERT_DIR=/opt/opendaylight/current/certs
- - SDNC_DB_INIT=true
+ - SDNC_DB_INIT=true
- HONEYCOMB_USER=${HONEYCOMB_USER}
- HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD}
- TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}
-export SDNC_CONTAINER_NAME=sdnc
+export SDNC_CONTAINER_NAME=sdnc_controller
export DB_CONTAINER_NAME=mariadb
export SDNC_CERT_PATH=${WORKSPACE}/archives/certs
export NETCONF_PNP_SIM_CONTAINER_NAME=netconf-simulator
export NEXUS_USERNAME=${NEXUS_USERNAME:-docker}
export NEXUS_PASSWD=${NEXUS_PASSWD:-docker}
export NEXUS_DOCKER_REPO=${NEXUS_DOCKER_REPO:-nexus3.onap.org:10001}
-export MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-secretPassword}
-export MYSQL_USER=${MYSQL_USER:-testdb}
-export MYSQL_PASSWORD=${MYSQL_PASSWORD:-test123}
-export MYSQL_DATABASE=${MYSQL_DATABASE:-testdb}
+export MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-itsASecret}
+export MYSQL_USER=${MYSQL_USER:-sdnctl}
+export MYSQL_PASSWORD=${MYSQL_PASSWORD:-gamma}
+export MYSQL_DATABASE=${MYSQL_DATABASE:-sdnctl}
export ODL_USER=${ODL_USER:-admin}
export ODL_PASSWORD=${ODL_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
export HONEYCOMB_USER=${HONEYCOMB_USER:-admin}
[Documentation] Testing GRA service assign
Send Post File And Validate Response ${GRA_SERVICE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/svc-topology-assign.json 200
-Check GRA network assign
- [Tags] SDNC-GRA-NETWORK-ASSIGN
- [Documentation] Testing GRA network assign
- Send Post File And Validate Response ${GRA_NETWORK_TOPOLOGY} ${GRA_DATA_DIRECTORY}/network-topology-assign.json 200
+#Check GRA network assign
+# [Tags] SDNC-GRA-NETWORK-ASSIGN
+# [Documentation] Testing GRA network assign
+# Send Post File And Validate Response ${GRA_NETWORK_TOPOLOGY} ${GRA_DATA_DIRECTORY}/network-topology-assign.json 200
-Check GRA vnf assign
- [Tags] SDNC-GRA-VNF-ASSIGN
- [Documentation] Testing GRA vnf assign
- Send Post File And Validate Response ${GRA_VNF_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vnf-topology-assign.json 200
+#Check GRA vnf assign
+# [Tags] SDNC-GRA-VNF-ASSIGN
+# [Documentation] Testing GRA vnf assign
+# Send Post File And Validate Response ${GRA_VNF_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vnf-topology-assign.json 200
-Check GRA vf-module assign
- [Tags] SDNC-GRA-VF-MODULE-ASSIGN
- [Documentation] Testing GRA vf-module assign
- Send Post File And Validate Response ${GRA_VFMODULE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vf-module-topology-assign.json 200
+#Check GRA vf-module assign
+# [Tags] SDNC-GRA-VF-MODULE-ASSIGN
+# [Documentation] Testing GRA vf-module assign
+# Send Post File And Validate Response ${GRA_VFMODULE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vf-module-topology-assign.json 200
Check GRA vf-module unassign
[Tags] SDNC-GRA-VF-MODULE-UNASSIGN
[Documentation] Testing GRA vnf unassign
Send Post File And Validate Response ${GRA_VNF_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vnf-topology-unassign.json 200
-Check GRA network unassign
- [Tags] SDNC-GRA-NETWORK-UNASSIGN
- [Documentation] Testing GRA network unassign
- Send Post File And Validate Response ${GRA_NETWORK_TOPOLOGY} ${GRA_DATA_DIRECTORY}/network-topology-unassign.json 200
+#Check GRA network unassign
+# [Tags] SDNC-GRA-NETWORK-UNASSIGN
+# [Documentation] Testing GRA network unassign
+# Send Post File And Validate Response ${GRA_NETWORK_TOPOLOGY} ${GRA_DATA_DIRECTORY}/network-topology-unassign.json 200
Check GRA service delete
[Tags] SDNC-GRA-SERVICE-DELETE
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>data-migrator</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>sdnc-oam :: data-migrator</name>
<parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-admportal</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-ansible-server</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
<includes>
<include>**/*</include>
</includes>
- <filtering>false</filtering>
+ <filtering>true</filtering>
</resource>
</resources>
</configuration>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.28.0</version>
+ <version>0.34.0</version>
<inherited>false</inherited>
<configuration>
<images>
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+ <noCache>true</noCache>
+ <contextDir>${basedir}/target/docker-stage</contextDir>
<dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
</build>
</image>
</images>
+ <verbose>${docker.verbose}</verbose>
+ <skipPush>${docker.skip.push}</skipPush>
</configuration>
<executions>
<execution>
- <id>generate-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
-
- <execution>
- <id>push-images</id>
- <phase>deploy</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
<goal>push</goal>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-dmaap-listener</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<build>
<plugins>
-
-
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
</execution>
</executions>
</plugin>
-
-
-
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
</resources>
</configuration>
</execution>
-
<execution>
<id>copy-scripts</id>
<goals>
<includes>
<include>*.sh</include>
</includes>
- <filtering>false</filtering>
+ <filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
-
<execution>
<id>copy-properties</id>
<goals>
<includes>
<include>*</include>
</includes>
- <filtering>false</filtering>
+ <filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
-
</executions>
</plugin>
<plugin>
</execution>
</executions>
</plugin>
-
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.5.0</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
<executions>
-
-
-
<execution>
- <id>change shell permissions</id>
+ <id>change-shell-permissions</id>
<phase>process-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
<configuration>
- <executable>/usr/bin/find</executable>
- <arguments>
- <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
- <argument>-name</argument>
- <argument>*.sh</argument>
- <argument>-exec</argument>
- <argument>chmod</argument>
- <argument>+x</argument>
- <argument>{}</argument>
- <argument>;</argument>
- </arguments>
+ <target>
+ <chmod dir="${basedir}/target/docker-stage/opt/onap/sdnc" perm="+x" includes="**/*.sh"/>
+ </target>
</configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.28.0</version>
+ <version>0.34.0</version>
<inherited>false</inherited>
<configuration>
<images>
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+ <noCache>true</noCache>
+ <contextDir>${basedir}/target/docker-stage</contextDir>
<dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
</build>
</image>
</images>
+ <verbose>${docker.verbose}</verbose>
+ <skipPush>${docker.skip.push}</skipPush>
</configuration>
<executions>
<execution>
- <id>generate-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
-
- <execution>
- <id>push-images</id>
- <phase>deploy</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
<goal>push</goal>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation</name>
<build.number>${maven.build.timestamp}</build.number>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <docker.skip.push>false</docker.skip.push>
+ <docker.verbose>true</docker.verbose>
</properties>
</project>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-sdnc-web</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
- <docker.push.phase>deploy</docker.push.phase>
- <docker.verbose>true</docker.verbose>
</properties>
<dependencies>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.34.0</version>
<inherited>false</inherited>
<configuration>
<images>
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <noCache>true</noCache>
+ <contextDir>${basedir}/target/docker-stage</contextDir>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
<tag>${project.docker.latestfulltag.version}</tag>
</build>
</image>
</images>
+ <verbose>${docker.verbose}</verbose>
+ <skipPush>${docker.skip.push}</skipPush>
</configuration>
<executions>
<execution>
- <id>generate-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>push-images</id>
- <phase>${docker.push.phase}</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
<goal>push</goal>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-sdnc</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<properties>
<image.name>onap/sdnc-aaf-image</image.name>
<standalone.image.name>onap/sdnc-image</standalone.image.name>
- <sdnc.project.version>${project.version}</sdnc.project.version>
- <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
<ccsdk.docker.version>${ccsdk.docker.odlsli.alpine.version}</ccsdk.docker.version>
<sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
<sdnc.keypass><![CDATA[;:G58,7ZhqOSI:7^oZCY[9Dv]]></sdnc.keypass>
<sdnc.secureport>8443</sdnc.secureport>
+
+ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+ <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
- <docker.push.phase>deploy</docker.push.phase>
- <docker.verbose>true</docker.verbose>
<docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
- <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
</properties>
<dependencies>
<type>zip</type>
<classifier>repo</classifier>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.onap.sdnc.northbound</groupId>
<artifactId>optical-service-installer</artifactId>
<version>${sdnc.northbound.version}</version>
<build>
<plugins>
-
-
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.28.0</version>
+ <version>0.34.0</version>
<inherited>false</inherited>
+ <configuration>
+ <images>
+ <image>
+ <name>${image.name}</name>
+ <build>
+ <cleanup>try</cleanup>
+ <noCache>true</noCache>
+ <contextDir>${basedir}/target/docker-stage</contextDir>
+ <dockerFile>Dockerfile</dockerFile>
+ <args>
+ <AAF>true</AAF>
+ </args>
+ <tags>
+ <tag>${project.docker.latestminortag.version}</tag>
+ <tag>${project.docker.latestfulltag.version}</tag>
+ <tag>${project.docker.latesttagtimestamp.version}</tag>
+ </tags>
+ </build>
+ </image>
+ <image>
+ <name>${standalone.image.name}</name>
+ <build>
+ <cleanup>try</cleanup>
+ <noCache>true</noCache>
+ <contextDir>${basedir}/target/docker-stage</contextDir>
+ <dockerFile>Dockerfile</dockerFile>
+ <args>
+ <AAF>false</AAF>
+ </args>
+ <tags>
+ <tag>${project.docker.latestminortag.version}</tag>
+ <tag>${project.docker.latestfulltag.version}</tag>
+ <tag>${project.docker.latesttagtimestamp.version}</tag>
+ </tags>
+ </build>
+ </image>
+ </images>
+ <verbose>${docker.verbose}</verbose>
+ <skipPush>${docker.skip.push}</skipPush>
+ </configuration>
<executions>
<execution>
- <id>generate-images</id>
- <phase>package</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
+ <goal>push</goal>
</goals>
- <configuration>
- <images>
- <image>
- <name>${image.name}</name>
- <build>
- <cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>Dockerfile</dockerFile>
- <tags>
- <tag>${project.docker.latestminortag.version}</tag>
- <tag>${project.docker.latestfulltag.version}</tag>
- <tag>${project.docker.latesttagtimestamp.version}</tag>
- </tags>
- </build>
- </image>
- </images>
- </configuration>
</execution>
- <execution>
- <id>start-it-instance</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- <configuration>
- <images>
- <image>
- <name>mariadb:10.5</name>
- <alias>sdnc-db</alias>
- <run>
- <env>
- <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
- <MYSQL_USER>sdnctl</MYSQL_USER>
- <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
- <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
- </env>
- <network>
- <mode>custom</mode>
- <name>sdnc</name>
- <alias>dbhost</alias>
- <alias>sdnctldb01</alias>
- <alias>sdnctldb02</alias>
- </network>
- <ports>
- <port>sdncdb.port:3306</port>
- </ports>
- <log>
- <enabled>true</enabled>
- </log>
- </run>
- </image>
- <image>
- <name>${image.name}:${project.docker.latesttagtimestamp.version}</name>
- <alias>sdnc-container</alias>
- <run>
- <env>
- <ODL_ADMIN_PASSWORD>admin</ODL_ADMIN_PASSWORD>
- <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
- <MYSQL_USER>sdnctl</MYSQL_USER>
- <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
- <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
- <SDNC_CONFIG_DIR>/opt/onap/sdnc/data/properties</SDNC_CONFIG_DIR>
- <KARAF_CONSOLE_LOG_LEVEL>INFO</KARAF_CONSOLE_LOG_LEVEL>
- </env>
- <dependsOn>
- <container>sdnc-db</container>
- </dependsOn>
- <network>
- <mode>custom</mode>
- <name>sdnc</name>
- <alias>sdnc</alias>
- </network>>
- <ports>
- <port>sdnc.port:8181</port>
- </ports>
- <wait>
- <log>all warp coils are now operating at peak efficiency</log>
- <time>120000</time>
- </wait>
- <log>
- <enabled>true</enabled>
- </log>
- </run>
- </image>
- </images>
- </configuration>
- </execution>
- <execution>
- <id>stop-it-instance</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- <execution>
- <id>push-images</id>
- <phase>${docker.push.phase}</phase>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- <configuration>
- <images>
- <image>
- <name>${image.name}</name>
- <build>
- <cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>Dockerfile</dockerFile>
- <tags>
- <tag>${project.docker.latestminortag.version}</tag>
- <tag>${project.docker.latestfulltag.version}</tag>
- <tag>${project.docker.latesttagtimestamp.version}</tag>
- </tags>
- </build>
- </image>
- </images>
- </configuration>
- </execution>
- <execution>
- <id>generate-standalone-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- <configuration>
- <images>
- <image>
- <name>${standalone.image.name}</name>
- <build>
- <cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>standalone.Dockerfile</dockerFile>
- <tags>
- <tag>${project.docker.latestminortag.version}</tag>
- <tag>${project.docker.latestfulltag.version}</tag>
- <tag>${project.docker.latesttagtimestamp.version}</tag>
- </tags>
- </build>
- </image>
- </images>
- </configuration>
- </execution>
- <execution>
- <id>push-standalone-images</id>
- <phase>${docker.push.phase}</phase>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- <configuration>
- <images>
- <image>
- <name>${standalone.image.name}</name>
- <build>
- <cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>standalone.Dockerfile</dockerFile>
- <tags>
- <tag>${project.docker.latestminortag.version}</tag>
- <tag>${project.docker.latestfulltag.version}</tag>
- <tag>${project.docker.latesttagtimestamp.version}</tag>
- </tags>
- </build>
- </image>
- </images>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
<directory>src/main/docker</directory>
<includes>
<include>Dockerfile</include>
- <include>standalone.Dockerfile</include>
</includes>
<filtering>true</filtering>
</resource>
<include>*.py</include>
<include>*.sh</include>
</includes>
- <filtering>false</filtering>
+ <filtering>true</filtering>
</resource>
</resources>
</configuration>
<version>3.0.2</version>
<executions>
<execution>
- <id>unpack sdnc features</id>
+ <id>unpack-sdnc-features</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack-dependencies</goal>
</configuration>
</execution>
<execution>
- <id>unpack dgs</id>
+ <id>unpack-platform-logic</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack</goal>
</configuration>
</execution>
<execution>
- <id>unpack migration utility</id>
+ <id>unpack-data-migrator</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack</goal>
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.5.0</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
<executions>
<execution>
- <id>change shell permissions</id>
+ <id>change-shell-permissions</id>
<phase>process-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
<configuration>
- <executable>/usr/bin/find</executable>
- <arguments>
- <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
- <argument>-name</argument>
- <argument>*.sh</argument>
- <argument>-exec</argument>
- <argument>chmod</argument>
- <argument>+x</argument>
- <argument>{}</argument>
- <argument>;</argument>
- </arguments>
+ <target>
+ <chmod dir="${basedir}/target/docker-stage/opt/onap/sdnc" perm="+x" includes="**/*.sh"/>
+ </target>
</configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
</executions>
</plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
</executions>
<configuration>
- <skipITs>false</skipITs>
- <environmentVariables>
- <SDNC_PORT>${sdnc.port}</SDNC_PORT>
- </environmentVariables>
+ <skipITs>false</skipITs>
+ <environmentVariables>
+ <SDNC_PORT>${sdnc.port}</SDNC_PORT>
+ </environmentVariables>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
ports:
- "3306"
environment:
- - MYSQL_ROOT_PASSWORD=MySecretPassword
+ - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
- MYSQL_ROOT_HOST=%
- logging:
+ - MYSQL_USER=${MYSQL_USER}
+ - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+ - MYSQL_DATABASE=${MYSQL_DATABASE}
+ logging:
driver: "json-file"
- options:
+ options:
max-size: "30m"
max-file: "5"
- db:sdnctldb01
- db:sdnctldb02
environment:
- - MYSQL_ROOT_PASSWORD=MySecretPassword
+ - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+ - MYSQL_USER=${MYSQL_USER}
+ - MYSQL_PASSWORD=${MYSQL_PASSWORD}
+ - MYSQL_DATABASE=${MYSQL_DATABASE}
- SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
- SDNC_REPLICAS=1
- - SDNC_DB_USER=sdnctl
- - SDNC_DB_PASSWORD=gamma
- - MYSQL_DATABASE=sdnctl
+ - SDNC_BIN=/opt/onap/sdnc/bin
+ - ODL_CERT_DIR=/tmp
+ - ODL_ADMIN_USERNAME=${ODL_USER}
+ - ODL_ADMIN_PASSWORD=${ODL_PASSWORD}
+ - ODL_USER=${ODL_USER}
+ - ODL_PASSWORD=${ODL_PASSWORD}
- SDNC_DB_INIT=true
+ - HONEYCOMB_USER=${HONEYCOMB_USER}
+ - HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD}
+ - TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}
+ - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD}
+ - SO_USER=${SO_USER}
+ - SO_PASSWORD=${SO_PASSWORD}
+ - NENG_USER=${NENG_USER}
+ - NENG_PASSWORD=${NENG_PASSWORD}
+ - CDS_USER=${CDS_USER}
+ - CDS_PASSWORD=${CDS_PASSWORD}
+ - ANSIBLE_USER=${ANSIBLE_USER}
+ - ANSIBLE_PASSWORD=${ANSIBLE_PASSWORD}
+ - SQL_CRYPTKEY=${SQL_CRYPTKEY}
+ - A1_TRUSTSTORE_PASSWORD=a1adapter
- KARAF_CONSOLE_LOG_LEVEL=info
logging:
driver: "json-file"
max-size: "30m"
max-file: "5"
extra_hosts:
- aaf.osaaf.org: 10.12.6.214
-
+ aaf.osaaf.org: 10.12.6.214
# Prepare stage for multistage image build
## START OF STAGE0 ##
FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version} AS stage0
-
USER root
-# copy onap
-COPY opt /opt
-RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc
-RUN mkdir $ODL_HOME/current/certs
-
-# copy SDNC mvn artifacts to ODL repository
-COPY system /tmp/system
-RUN rsync -a /tmp/system $ODL_HOME
-## END OF STAGE0 ##
-
-FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
-
-LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
+ENV JAVA_HOME /opt/java/openjdk
+ENV PATH $PATH:/opt/java/openjdk/bin
-ENV PATH=$PATH:/opt/java/openjdk/bin
ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
-ENV SSL_CERTS_DIR /etc/ssl/certs
-ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java
-ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features
+ENV JAVA_SECURITY_DIR /etc/ssl/certs/java
+
ENV SDNC_KEYSTORE ${sdnc.keystore}
ENV SDNC_KEYPASS ${sdnc.keypass}
ENV SDNC_SECUREPORT ${sdnc.secureport}
-USER root
-COPY --from=stage0 --chown=odl:odl /opt /opt
+ARG AAF=false
-# Add SDNC repositories to boot repositories
+# Copy onap
+COPY opt /opt
+RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc
+RUN mkdir $ODL_HOME/current/certs
+
+# Copy SDNC mvn artifacts to ODL repository
+COPY system /tmp/system
+RUN rsync -a /tmp/system $ODL_HOME
+
+# Add odl-netconf-topology to boot repositories
RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
-RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg
RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg
-# install AAF configs
-COPY aaa-app-config.xml $ODL_HOME/etc/opendaylight/datastore/initial/config/
-RUN echo "cadi_prop_files=$SDNC_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc/system.properties
+# Add SDNC repositories to boot repositories
+ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features
+RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
+RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg
+
+
+# Add aaa-app-config.xml Only if AAF is set to true (being passed as an argument in docker-maven-plugin configuration)
+COPY aaa-app-config.xml /tmp/aaa-app-config.xml
+RUN if "${AAF}" ; then \
+ mkdir -p $ODL_HOME/etc/opendaylight/datastore/initial/config ;\
+ mv /tmp/aaa-app-config.xml $ODL_HOME/etc/opendaylight/datastore/initial/config/. ;\
+ echo "cadi_prop_files=$SDNC_CONFIG_DIR/org.onap.sdnc.props" >> $ODL_HOME/etc/system.properties ;\
+ fi
# Install ssl and java certificates
COPY truststoreONAPall.jks $SDNC_STORE_DIR
# Overwrite svclogic compiler properties
RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties
-RUN chown -R odl:odl /opt
+# Changing ownership and permission of /opt
+RUN chown -R odl:odl /opt && chmod -R 755 /opt
-USER odl
+## END OF STAGE0 ##
+#################################################
+
+## This will create actual image
+FROM scratch
+LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
+USER root
+
+ENV JAVA_HOME /opt/java/openjdk
+ENV PATH $PATH:/opt/java/openjdk/bin
+
+ENV ODL_HOME /opt/opendaylight/current
+ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
+ENV SDNC_KEYSTORE ${sdnc.keystore}
+ENV SDNC_KEYPASS ${sdnc.keypass}
+
+# Copy Everything from stage0
+COPY --from=stage0 / /
+
+USER odl
ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh
EXPOSE 8181
+++ /dev/null
-# Prepare stage for multistage image build
-## START OF STAGE0 ##
-FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version} AS stage0
-
-USER root
-
-# copy onap
-COPY opt /opt
-RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc
-RUN mkdir $ODL_HOME/current/certs
-
-# copy SDNC mvn artifacts to ODL repository
-COPY system /tmp/system
-RUN rsync -a /tmp/system $ODL_HOME
-## END OF STAGE0 ##
-
-FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version}
-
-LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
-
-ENV PATH=$PATH:/opt/java/openjdk/bin
-ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
-ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores
-ENV SSL_CERTS_DIR /etc/ssl/certs
-ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java
-ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features
-ENV SDNC_KEYSTORE ${sdnc.keystore}
-ENV SDNC_KEYPASS ${sdnc.keypass}
-ENV SDNC_SECUREPORT ${sdnc.secureport}
-
-USER root
-
-COPY --from=stage0 --chown=odl:odl /opt /opt
-
-# Add SDNC repositories to boot repositories
-RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig
-RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg
-RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg
-
-# Install ssl and java certificates
-COPY truststoreONAPall.jks $SDNC_STORE_DIR
-RUN if [ -f $JAVA_SECURITY_DIR}/cacerts ] ; then keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore $JAVA_SECURITY_DIR/cacerts -deststorepass changeit -noprompt ; fi
-RUN keytool -importkeystore -srckeystore $SDNC_STORE_DIR/truststoreONAPall.jks -srcstorepass changeit -destkeystore /opt/java/openjdk/lib/security/cacerts -deststorepass changeit -noprompt
-
-
-# Secure with TLS
-RUN echo org.osgi.service.http.secure.enabled=true >> $ODL_HOME/etc/custom.properties
-RUN echo org.osgi.service.http.secure.port=$SDNC_SECUREPORT >> $ODL_HOME/etc/custom.properties
-RUN echo org.ops4j.pax.web.ssl.keystore=$SDNC_STORE_DIR/$SDNC_KEYSTORE >> $ODL_HOME/etc/custom.properties
-RUN echo org.ops4j.pax.web.ssl.password=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
-RUN echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom.properties
-
-# Overwrite svclogic compiler properties
-RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties
-RUN chown -R odl:odl /opt
-
-USER odl
-
-ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh
-EXPOSE 8181
netbox-client"
-
SDNC_NORTHBOUND_FEATURES=" \
generic-resource-api \
vnfapi \
vnftools"
-SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.3.1-SNAPSHOT}
-
# Install CCSDK features
${CCSDK_HOME}/bin/installCcsdkFeatures.sh
then
${CCSDK_FEATURE_DIR}/ccsdk-${feature}/install-feature.sh
else
- echo "No installer found for ${feature}"
+ echo "No installer found for ${feature}"
fi
done
-SDNC_NORTHBOUND_VERSION=${SDNC_NORTHBOUND_VERSION:-1.2.0}
-SDNC_OAM_VERSION=${SDNC_OAM_VERSION:-1.2.0}
-
if [ ! -d ${targetDir} ]
then
mkdir -p ${targetDir}
mavenOpts=${2:-"-s ${SETTINGS_FILE} -gs ${GLOBAL_SETTINGS_FILE}"}
cd /tmp
-echo "Installing SDN-C core version ${SDNC_CORE_VERSION}"
+echo "Installing SDN-C core version ${ccsdk.sli.version}"
for feature in ${SDNC_CORE_FEATURES}
do
rm -f /tmp/${feature}-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.sdnc.core:${feature}-installer:${SDNC_CORE_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
+mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.sdnc.core:${feature}-installer:${ccsdk.sli.version}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
unzip -d ${featureDir} /tmp/${feature}-installer*zip
done
-echo "Installing SDN-C adaptors version ${SDNC_ADAPTORS_VERSION}"
+echo "Installing SDN-C adaptors version ${ccsdk.sli.version}"
for feature in ${SDNC_ADAPTORS_FEATURES}
do
rm -f /tmp/${feature}-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.sdnc.adaptors:${feature}-installer:${SDNC_ADAPTORS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
+mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.sdnc.adaptors:${feature}-installer:${ccsdk.sli.version}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
unzip -d ${featureDir} /tmp/${feature}-installer*zip
done
-echo "Installing SDN-C northbound version ${SDNC_NORTHBOUND_VERSION}"
+echo "Installing SDN-C northbound version ${sdnc.northbound.version}"
for feature in ${SDNC_NORTHBOUND_FEATURES}
do
rm -f /tmp/${feature}-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.sdnc.northbound:${feature}-installer:${SDNC_NORTHBOUND_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
+mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.sdnc.northbound:${feature}-installer:${sdnc.northbound.version}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
unzip -d ${featureDir} /tmp/${feature}-installer*zip
done
-echo "Installing SDN-C plugins version ${SDNC_PLUGINS_VERSION}"
+echo "Installing SDN-C plugins version ${ccsdk.sli.version}"
for feature in ${SDNC_PLUGINS_FEATURES}
do
rm -f /tmp/${feature}-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.sdnc.plugins:${feature}-installer:${SDNC_PLUGINS_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
+mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.sdnc.plugins:${feature}-installer:${ccsdk.sli.version}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
unzip -d ${featureDir} /tmp/${feature}-installer*zip
done
echo "Installing platform-logic"
rm -f /tmp/platform-logic-installer*.zip
-mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.sdnc.oam:platform-logic-installer:${SDNC_OAM_VERSION}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
+mvn -U ${mavenOpts} org.apache.maven.plugins:maven-dependency-plugin:2.9:copy -Dartifact=org.onap.sdnc.oam:platform-logic-installer:${sdnc.project.version}:zip -DoutputDirectory=/tmp -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.ssl.insecure=true
unzip -d ${targetDir} /tmp/platform-logic-installer*.zip
find ${targetDir} -name '*.sh' -exec chmod +x '{}' \;
isRepoExisting() {
REPO=$(echo "$1" | sed -E "s#mvn:(.*)/xml/features\$#\1#")
OIFS="$IFS"
- IFS='/'
+ IFS='/'
set parts $REPO
IFS="$OIFS"
path="$ODL_HOME/system/$(echo "$2" | tr '.' '/')/$3/$4"
initialize_sdnrdb() {
printf "SDN-R Database Initialization"
INITCMD="$JAVA_HOME/bin/java -jar "
- FN=$(find "$ODL_HOME/system" -name "sdnr-wt-data-provider-setup-$CCSDKFEATUREVERSION.jar")
+ FN=$(find "$ODL_HOME/system" -name "sdnr-wt-data-provider-setup-${ccsdk.features.version}.jar")
INITCMD="${INITCMD} ${FN} $SDNRDBCOMMAND"
printf "%s\n" "Execute: $INITCMD"
n=0
install_sdnrwt_features() {
# Repository setup provided via sdnc dockerfile
if $SDNRWT; then
-
if $SDNRONLY; then
cleanupFeatureBoot
fi
addToFeatureBoot "$SDNROAUTH_BOOTFEATURES"
}
install_sdnr_northbound_features() {
- addToFeatureBoot "$SDNR_NORTHBOUND_BOOTFEATURES"
+ addToFeatureBoot "$SDNR_NORTHBOUND_BOOTFEATURES"
}
install_a1_northbound_features() {
addToFeatureBoot "$A1_ADAPTER_NORTHBOUND_BOOTFEATURES"
# ODL NETCONF setup
printf "Installing Opendaylight cluster features for mdsal and netconf\n"
-
+
#Be sure to remove feature odl-netconf-connector-all from list
replaceFeatureBoot "odl-netconf-connector-all,"
#${ODL_HOME}/bin/client feature:install odl-jolokia
# ODL Cluster or Geo cluster configuration
-
+
printf "Update cluster information statically\n"
fqdn=$(hostname -f)
printf "%s\n" "Get current fqdn ${fqdn}"
done
"${ODL_HOME}"/bin/configure_cluster.sh $((node_index+1)) "${node_list}"
else
- printf "Unhandled cluster scenario. Terminating the container\n"
+ printf "Unhandled cluster scenario. Terminating the container\n"
printf "Any one of the below 2 conditions should be satisfied for successfully enabling cluster mode : \n"
printf "1. OOM Environment - Both SERVICE_NAME and NAMESPACE environment variables have to be set.\n"
printf "2. Docker (standalone) Environment - Neither of SERVICE_NAME and NAMESPACE have to be set.\n"
ODL_FEATURES_BOOT_FILE=$ODL_HOME/etc/org.apache.karaf.features.cfg
ODL_ADMIN_USERNAME=${ODL_ADMIN_USERNAME:-admin}
+ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-admin}
ODL_REMOVEIDMDB=${ODL_REMOVEIDMDB:-true}
if $ODL_REMOVEIDMDB ; then
- if [ -f $ODL_HOME/data/idmlight.db.mv.db ]; then
+ if [ -f $ODL_HOME/data/idmlight.db.mv.db ]; then
rm $ODL_HOME/data/idmlight.db.mv.db
fi
fi
+CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin}
+JDEBUG=${JDEBUG:-false}
+SDNC_AAF_ENABLED=${SDNC_AAF_ENABLED:-false}
+INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim}
+
# Whether to intialize MYSql DB or not. Default is to initialize
SDNC_DB_INIT=${SDNC_DB_INIT:-false}
-CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
-JDEBUG=${JDEBUG:-false}
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0}
+
+IS_PRIMARY_CLUSTER=${IS_PRIMARY_CLUSTER:-false}
+MY_ODL_CLUSTER=${MY_ODL_CLUSTER:-127.0.0.1}
ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
ENABLE_OAUTH=${ENABLE_OAUTH:-false}
ENABLE_ODLUX_RBAC=${ENABLE_ODLUX_RBAC:-false}
GEO_ENABLED=${GEO_ENABLED:-false}
-SDNC_AAF_ENABLED=${SDNC_AAF_ENABLED:-false}
-IS_PRIMARY_CLUSTER=${IS_PRIMARY_CLUSTER:-false}
-MY_ODL_CLUSTER=${MY_ODL_CLUSTER:-127.0.0.1}
-INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim}
+
SDNRWT=${SDNRWT:-false}
+SDNRDM=${SDNRDM:-false}
SDNRODLUX_BOOTFEATURES=${SDNRODLUX_BOOTFEATURES:-sdnr-wt-helpserver-feature,sdnr-wt-odlux-core-feature,sdnr-wt-odlux-apps-feature}
SDNROAUTH_BOOTFEATURES=${SDNROAUTH_BOOTFEATURES:-sdnr-wt-feature-aggregator-oauth}
-SDNRDM=${SDNRDM:-false}
SDNR_NETCONF_CALLHOME_ENABLED=${SDNR_NETCONF_CALLHOME_ENABLED:-false}
+
# Add devicemanager features
SDNRDM_SDM_LIST=${SDNRDM_SDM_LIST:-sdnr-wt-feature-aggregator-devicemanager}
SDNRDM_BOOTFEATURES=${SDNRDM_BOOTFEATURES:-sdnr-wt-feature-aggregator-devicemanager-base,${SDNRDM_SDM_LIST}}
+
# Whether to Initialize the ElasticSearch DB.
SDNRINIT=${SDNRINIT:-false}
SDNRONLY=${SDNRONLY:-false}
SDNR_NORTHBOUND=${SDNR_NORTHBOUND:-false}
SDNR_NORTHBOUND_BOOTFEATURES=${SDNR_NORTHBOUND_BOOTFEATURES:-sdnr-northbound-all}
SDNR_NETCONF_CALLHOME_FEATURE=${SDNR_NETCONF_CALLHOME_FEATURE:-odl-netconf-callhome-ssh}
+
# if only SDNR features then do not start A1 adapter
if $SDNRONLY ; then
A1_ADAPTER_NORTHBOUND=false
printf "%s\n" " SDNC_HOME=$SDNC_HOME"
printf "%s\n" " SDNC_DB_INIT=$SDNC_DB_INIT"
printf "%s\n" " ODL_CERT_DIR=$ODL_CERT_DIR"
-printf "%s\n" " CCSDKFEATUREVERSION=$CCSDKFEATUREVERSION"
printf "%s\n" " ENABLE_ODL_CLUSTER=$ENABLE_ODL_CLUSTER"
printf "%s\n" " ODL_REMOVEIDMDB=$ODL_REMOVEIDMDB"
printf "%s\n" " SDNC_REPLICAS=$SDNC_REPLICAS"
exit 1
fi
-# Check for MySQL DB connectivity only if SDNC_DB_INIT is set to "true"
+# Check for MySQL DB connectivity only if SDNC_DB_INIT is set to "true"
if $SDNC_DB_INIT; then
#
# Wait for database
#
printf "Waiting for mysql"
- until mysql -h dbhost -u root -p"${MYSQL_ROOT_PASSWORD}" -e "select 1" > /dev/null 2>&1
+ until mysql -h dbhost -u root -p"${MYSQL_ROOT_PASSWORD}" -e "select 1" > /dev/null 2>&1
do
printf "."
sleep 1
if $SDNRWT ; then install_sdnrwt_features ; fi
if $ENABLE_OAUTH ; then
cp $SDNC_HOME/data/oauth-aaa-app-config.xml $ODL_HOME/system/org/opendaylight/aaa/aaa-shiro/0.12.1/aaa-shiro-0.12.1-aaa-app-config.xml
- install_sdnr_oauth_features
+ install_sdnr_oauth_features
fi
-
+
# The enable_odl_cluster call should not be moved above this line as the cleanFeatureBoot will overwrite entries. Ex: odl-jolokia
if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
if $SDNR_NORTHBOUND ; then install_sdnr_northbound_features ; fi
if $A1_ADAPTER_NORTHBOUND ; then install_a1_northbound_features ; fi
-
+
printf "%s" "Installed at $(date)" > "${SDNC_HOME}"/.installed
fi
printf "Startup opendaylight\n"
printf "%s\n" "$ODL_REPOSITORIES_BOOT"
printf "%s\n" "$ODL_FEATURES_BOOT"
+
exec "${ODL_HOME}"/bin/karaf server
- MYSQL_USER=${MYSQL_USER}
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
- MYSQL_DATABASE=${MYSQL_DATABASE}
- logging:
+ logging:
driver: "json-file"
- options:
+ options:
max-size: "30m"
max-file: "5"
depends_on :
- db
- ansible
- container_name: sdnc_controller_container
+ container_name: sdnc_controller
entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
ports:
- "8282:8181"
- ODL_ADMIN_PASSWORD=${ODL_PASSWORD}
- ODL_USER=${ODL_USER}
- ODL_PASSWORD=${ODL_PASSWORD}
- - SDNC_DB_INIT=true
+ - SDNC_DB_INIT=true
- HONEYCOMB_USER=${HONEYCOMB_USER}
- HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD}
- TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}
image: onap/ccsdk-dgbuilder-image:latest
depends_on:
- db
- container_name: sdnc_dgbuilder_container
+ container_name: sdnc_dgbuilder_container
entrypoint:
- "/bin/bash"
- "-c"
image: onap/sdnc-ueb-listener-image:latest
depends_on:
- db
- container_name: sdnc_ueblistener_container
+ container_name: sdnc_ueblistener_container
entrypoint: ["/opt/onap/sdnc/ueb-listener/bin/start-ueb-listener.sh" ]
links:
- db:dbhost
image: onap/sdnc-dmaap-listener-image:latest
depends_on:
- db
- container_name: sdnc_dmaaplistener_container
+ container_name: sdnc_dmaaplistener_container
entrypoint: ["/opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh" ]
links:
- db:dbhost
- MYSQL_USER=${MYSQL_USER}
- MYSQL_PASSWORD=${MYSQL_PASSWORD}
- MYSQL_DATABASE=${MYSQL_DATABASE}
- logging:
+ logging:
driver: "json-file"
- options:
+ options:
max-size: "30m"
max-file: "5"
image: onap/sdnc-image:latest
depends_on :
- db
- container_name: sdnc_controller_container
+ container_name: sdnc_controller
entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
ports:
- "8282:8181"
- ODL_ADMIN_PASSWORD=${ODL_PASSWORD}
- ODL_USER=${ODL_USER}
- ODL_PASSWORD=${ODL_PASSWORD}
- - SDNC_DB_INIT=true
+ - SDNC_DB_INIT=true
- HONEYCOMB_USER=${HONEYCOMB_USER}
- HONEYCOMB_PASSWORD=${HONEYCOMB_PASSWORD}
- TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>installation-ueb-listener</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: installation :: ${project.artifactId}</name>
<sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
<ccsdk.docker.version>${ccsdk.docker.alpine.j11.version}</ccsdk.docker.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
- <docker.push.phase>deploy</docker.push.phase>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
</properties>
<build>
<plugins>
-
-
<plugin>
<groupId>org.codehaus.groovy.maven</groupId>
<artifactId>gmaven-plugin</artifactId>
+ <version>1.0</version>
<executions>
<execution>
<phase>validate</phase>
</execution>
</executions>
</plugin>
-
-
-
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
</resources>
</configuration>
</execution>
-
<execution>
<id>copy-scripts</id>
<goals>
<includes>
<include>*.sh</include>
</includes>
- <filtering>false</filtering>
+ <filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
-
<execution>
<id>copy-properties</id>
<goals>
<includes>
<include>*</include>
</includes>
- <filtering>false</filtering>
+ <filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
-
</executions>
</plugin>
<plugin>
</execution>
</executions>
</plugin>
-
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.5.0</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
<executions>
-
-
-
<execution>
- <id>change shell permissions</id>
+ <id>change-shell-permissions</id>
<phase>process-sources</phase>
- <goals>
- <goal>exec</goal>
- </goals>
<configuration>
- <executable>/usr/bin/find</executable>
- <arguments>
- <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
- <argument>-name</argument>
- <argument>*.sh</argument>
- <argument>-exec</argument>
- <argument>chmod</argument>
- <argument>+x</argument>
- <argument>{}</argument>
- <argument>;</argument>
- </arguments>
+ <target>
+ <chmod dir="${basedir}/target/docker-stage/opt/onap/sdnc" perm="+x" includes="**/*.sh"/>
+ </target>
</configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.28.0</version>
+ <version>0.34.0</version>
<inherited>false</inherited>
<configuration>
<images>
<name>${image.name}</name>
<build>
<cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+ <noCache>true</noCache>
+ <contextDir>${basedir}/target/docker-stage</contextDir>
<dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${project.docker.latestminortag.version}</tag>
</build>
</image>
</images>
+ <verbose>${docker.verbose}</verbose>
+ <skipPush>${docker.skip.push}</skipPush>
</configuration>
<executions>
<execution>
- <id>generate-images</id>
- <phase>package</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
-
- <execution>
- <id>push-images</id>
- <!--<phase>deploy</phase> -->
- <phase>${docker.push.phase}</phase>
+ <id>build-push-images</id>
<goals>
<goal>build</goal>
<goal>push</goal>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-datachange</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-generic-resource-api</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-installer</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-lcm</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-optical-service</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic</name>
<module>setup</module>
<module>generic-resource-api</module>
<module>vnfapi</module>
- <module>lcm</module>
- <module>optical-service</module>
+ <module>lcm</module>
+ <module>optical-service</module>
<module>restapi-templates</module>
<module>restconfapi-yang</module>
<module>datachange</module>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-restapi-templates</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-restconfapi-yang</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-setup</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<version>2.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.sdnc.oam</groupId>
<artifactId>platform-logic-vnfapi</artifactId>
- <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
</organization>
<properties>
+ <sdnc.project.version>${project.version}</sdnc.project.version>
+
<!-- Artifacts -->
<ccsdk.distribution.version>1.2.0-SNAPSHOT</ccsdk.distribution.version> <!-- Used by platform-logic/setup -->
<ccsdk.features.version>${ccsdk.distribution.version}</ccsdk.features.version> <!-- Used by installation/sdnc-web -->
<sdnc.northbound.version>2.2.0-SNAPSHOT</sdnc.northbound.version> <!-- Used by installation/sdnc -->
<!-- docker images -->
- <ccsdk.docker.alpine.j11.version>1.1.1</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
+ <ccsdk.docker.alpine.j11.version>1.2-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener -->
<ccsdk.docker.odlsli.alpine.version>1.2-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc -->
- <ccsdk.docker.ansible.server.version>1.0-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
- <ccsdk.docker.ubuntu.version>0.7-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
+ <ccsdk.docker.ansible.server.version>1.2-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server -->
+ <ccsdk.docker.ubuntu.version>1.2-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal -->
</properties>
<modules>
</executions>
</plugin>
</plugins>
-
-
</build>
-
</profile>
<profile>
<id>docker</id>
<module>installation</module>
</modules>
</profile>
-
</profiles>
</project>
Code Review / sdnc / oam.git / commitdiff