From: Henrik Andersson <henrik.b.andersson@est.tech>
Date: Wed, 22 Jan 2020 09:17:28 +0000 (+0000)
Subject: Merge "Move RefreshConfigTask under tasks"
X-Git-Tag: 1.0.1~37
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=eec4647d457ca8c2ebecc86485127bd529919533;hp=636b5946ed5f9475d13cf4c942a2d9d35d1a5cbd;p=nonrtric.git

Merge "Move RefreshConfigTask under tasks"
---

diff --git a/near-rt-ric-simulator/pom.xml b/near-rt-ric-simulator/pom.xml
index 217fcc9f..179faf28 100644
--- a/near-rt-ric-simulator/pom.xml
+++ b/near-rt-ric-simulator/pom.xml
@@ -20,59 +20,90 @@
 -->
 
 <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>
-	<groupId>org.oran.nearric</groupId>
-	<artifactId>nearric-simulator</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>${project.artifactId}</name>
+  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>
+  <groupId>org.oran.nearric</groupId>
+  <artifactId>nearric-simulator</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>${project.artifactId}</name>
 
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.9.RELEASE</version>
-		<relativePath />
-	</parent>
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>2.1.9.RELEASE</version>
+    <relativePath />
+  </parent>
 
-	<properties>
-		<spring.boot.version>2.1.9.RELEASE</spring.boot.version>
-        <java.version>11</java.version>
-	</properties>
+  <properties>
+    <spring.boot.version>2.1.9.RELEASE</spring.boot.version>
+    <java.version>11</java.version>
+    <docker-maven-plugin.version>0.30.0</docker-maven-plugin.version>
+  </properties>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-dependencies</artifactId>
-				<version>${spring.boot.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-dependencies</artifactId>
+        <version>${spring.boot.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <release>${java.version}</release>
-                </configuration>
-			</plugin>
-		</plugins>
-	</build>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <release>${java.version}</release>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>io.fabric8</groupId>
+        <artifactId>docker-maven-plugin</artifactId>
+        <version>${docker-maven-plugin.version}</version>
+        <inherited>false</inherited>
+        <executions>
+          <execution>
+            <id>push-policy-agent-image</id>
+            <goals>
+              <goal>build</goal>
+              <goal>push</goal>
+            </goals>
+            <configuration>
+              <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
+              <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
+              <images>
+                <image>
+                  <name>o-ran-sc/policy-agent:${project.version}</name>
+                    <build>
+                      <contextDir>${basedir}/ric-plt/a1</contextDir>
+                      <dockerFile>Dockerfile</dockerFile>
+                      <tags>
+                        <tag>${project.version}</tag>
+                      </tags>
+                    </build>
+                  </image>
+                </images>
+              </configuration>
+            </execution>
+         </executions>
+       </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/near-rt-ric-simulator/ric-plt/a1/commands.sh b/near-rt-ric-simulator/ric-plt/a1/commands.sh
index f2f8bb58..da058851 100755
--- a/near-rt-ric-simulator/ric-plt/a1/commands.sh
+++ b/near-rt-ric-simulator/ric-plt/a1/commands.sh
@@ -6,7 +6,7 @@
 curl -v "http://localhost:8085/"
 
 # PUT a policy type STD_QoSNudging_0.1.0
-curl -X PUT -v "http://localhost:8085/policytypes/STD_QoSNudging_0.1.0" -H "accept: application/json" -H "Content-Type: application/json" --data-binary @policy_type_STD_QoSNudging_0.1.0.json.json
+curl -X PUT -v "http://localhost:8085/policytypes/STD_QoSNudging_0.1.0" -H "accept: application/json" -H "Content-Type: application/json" --data-binary @policy_type_STD_QoSNudging_0.1.0.json
 
 # GET policy types
 curl -v "http://localhost:8085/A1-P/v1/policytypes"