Merge changes from topic 'fix-amsterdam' into release-1.1.0

* changes:
  Fix ONAP entity-event-policy.xml bean package
  Fix docker image name for AAI
  Output the Robot logs at the proper place

4 files changed, 9 insertions, 9 deletions

diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 524d534b61..ce625b7ab3 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -7,19 +7,19 @@ image:
   aaiProxyVersion: 1.1.0
   aaiHbaseImage: aaionap/hbase
   aaiHbaseVersion: 1.2.0
-  modelLoaderImage: nexus3.onap.org:10001/openecomp/model-loader
+  modelLoaderImage: nexus3.onap.org:10001/onap/model-loader
   modelLoaderVersion: v1.1.0
   aaiResourcesImage: nexus3.onap.org:10001/openecomp/aai-resources
   aaiResourcesVersion: v1.1.0
   aaiTraversalImage: nexus3.onap.org:10001/openecomp/aai-traversal
   aaiTraversalVersion: v1.1.0
-  dataRouterImage: nexus3.onap.org:10001/openecomp/data-router
+  dataRouterImage: nexus3.onap.org:10001/onap/data-router
   dataRouterVersion: v1.1.0
   elasticsearchImage: elasticsearch
   elasticsearchVersion: 2.4.1
-  searchDataImage: nexus3.onap.org:10001/openecomp/search-data-service
+  searchDataImage: nexus3.onap.org:10001/onap/search-data-service
   searchDataVersion: v1.1.0
-  sparkyBeImage: nexus3.onap.org:10001/openecomp/sparky-be
+  sparkyBeImage: nexus3.onap.org:10001/onap/sparky-be
   sparkyBeVersion: v1.1.0
   gremlinServerImage: aaionap/gremlin-server
   filebeat: docker.elastic.co/beats/filebeat:5.5.0
diff --git a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml b/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml
index e0dd8cb8f5..e995053f12 100644
--- a/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml
+++ b/kubernetes/config/docker/init/src/config/aai/data-router/dynamic/conf/entity-event-policy.xml
@@ -4,7 +4,7 @@
               http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-  <bean id="eepConfig" class="org.openecomp.datarouter.policy.EntityEventPolicyConfig" >
+  <bean id="eepConfig" class="org.onap.aai.datarouter.policy.EntityEventPolicyConfig" >
     <property name="sourceDomain" value="default" />
     <property name="searchBaseUrl" value="https://search-data-service:9509" />
     <property name="searchEndpoint" value="services/search-data-service/v1/search/indexes/" />
@@ -18,7 +18,7 @@
     <property name="searchKeystore" value="tomcat_keystore" />
   </bean>
 
-  <bean id="entityEventPolicy" class="org.openecomp.datarouter.policy.EntityEventPolicy" init-method="startup" >
+  <bean id="entityEventPolicy" class="org.onap.aai.datarouter.policy.EntityEventPolicy" init-method="startup" >
     <constructor-arg ref="eepConfig"/>
   </bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index a870972ed6..2836fca85d 100755
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -124,4 +124,4 @@ done
 ETEHOME=/var/opt/OpenECOMP_ETE
 VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py"
 POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot)
-kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d ${ETEHOME}/html/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out
+kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out
diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh
index 26eedc97f7..2305a584c3 100755
--- a/kubernetes/robot/ete-k8s.sh
+++ b/kubernetes/robot/ete-k8s.sh
@@ -20,4 +20,4 @@ VARIABLES="-v GLOBAL_BUILD_NUMBER:$$"
 #docker exec openecompete_container ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88
 
 POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot)
-kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d ${ETEHOME}/html/logs/ete/${OUTPUT_FOLDER} ${TAGS} --display 88
+kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88