From 91fa338a0f8df74da079c42cb6145a075345476b Mon Sep 17 00:00:00 2001
From: YongchaoWu <yongchao.wu@est.tech>
Date: Sun, 12 Jan 2020 17:54:31 +0100
Subject: [PATCH] Change docker image name

Change docker image name for simulator and policy agent:
o-ran-sc/nonrtric-nearric-simulator
o-ran-sc/nonrtric-policy-agent

Issue-ID: NONRTRIC-79
Signed-off-by: YongchaoWu <yongchao.wu@est.tech>
Change-Id: Ide84bc2980710fb1c044b66c0b283540a9e2840b
---
 near-rt-ric-simulator/common/test_env.sh                              | 2 +-
 near-rt-ric-simulator/nearric-service/pom.xml                         | 2 +-
 .../simulator-group/{consul_cbs => }/docker-compose.yml               | 0
 policy-agent/pom.xml                                                  | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename near-rt-ric-simulator/simulator-group/{consul_cbs => }/docker-compose.yml (100%)

diff --git a/near-rt-ric-simulator/common/test_env.sh b/near-rt-ric-simulator/common/test_env.sh
index 0ea885b3..363f8794 100755
--- a/near-rt-ric-simulator/common/test_env.sh
+++ b/near-rt-ric-simulator/common/test_env.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Local image and tag, shall point to locally built image (non-nexus path)
-export POLICY_AGENT_LOCAL_IMAGE=o-ran-sc/policy-agent
+export POLICY_AGENT_LOCAL_IMAGE=o-ran-sc/nonrtric-policy-agent
 
 
 # Common env var for auto-test.
diff --git a/near-rt-ric-simulator/nearric-service/pom.xml b/near-rt-ric-simulator/nearric-service/pom.xml
index d142bedf..dd21d574 100644
--- a/near-rt-ric-simulator/nearric-service/pom.xml
+++ b/near-rt-ric-simulator/nearric-service/pom.xml
@@ -176,7 +176,7 @@
                         <image>
                             <!-- Specify a tag to avoid default tag "latest" -->
                             <!-- Avoid maven artifact name here -->
-                            <name>o-ran-sc/nearric-simulator:${project.version}</name>
+                            <name>o-ran-sc/nonrtric-nearric-simulator:${project.version}</name>
                             <build>
                                 <from>openjdk:11-jre-slim</from>
                                 <tags>
diff --git a/near-rt-ric-simulator/simulator-group/consul_cbs/docker-compose.yml b/near-rt-ric-simulator/simulator-group/docker-compose.yml
similarity index 100%
rename from near-rt-ric-simulator/simulator-group/consul_cbs/docker-compose.yml
rename to near-rt-ric-simulator/simulator-group/docker-compose.yml
diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml
index 3638dff6..3501a9e2 100644
--- a/policy-agent/pom.xml
+++ b/policy-agent/pom.xml
@@ -246,7 +246,7 @@
                             <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
                             <images>
                                 <image>
-                                    <name>o-ran-sc/policy-agent:${project.version}</name>
+                                    <name>o-ran-sc/nonrtric-policy-agent:${project.version}</name>
                                     <build>
                                         <cleanup>try</cleanup>
                                         <contextDir>${basedir}</contextDir>
@@ -273,7 +273,7 @@
                             <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
                             <images>
                                 <image>
-                                    <name>o-ran-sc/policy-agent:${project.version}</name>
+                                    <name>o-ran-sc/nonrtric-policy-agent:${project.version}</name>
                                     <build>
                                         <contextDir>${basedir}</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
-- 
2.16.6