From: Li Zi
Date: Wed, 25 Jul 2018 01:00:48 +0000 (+0000)
Subject: Merge "Update architecture diagram"
X-Git-Tag: 1.2.1~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=commitdiff_plain;h=e3fb006f31daa5dc1ab3d0a0521ff6cb5ca9230a;hp=ed29410ba96fc7e0b07f7bf2acb412adf20e669f
Merge "Update architecture diagram"
---
diff --git a/docs/index.rst b/docs/index.rst
index 2e9d3a8..6b68c45 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -3,7 +3,7 @@
AAI-esr-server
------------------------------------------------
-ESR provide a way to register external system which not included in ONAP system, mainly inclouded VIM/VNFM/EMS/thirdparty SDNC. esr-server as the backend of exteral system register service mainly include the system register information preprocessing, system available check.
+ESR provide a way to register external system which not included in ONAP system, mainly inclouded VIM/VNFM/EMS/thirdparty SDNC. esr-server as the backend of external system register service mainly include the system register information preprocessing, system available check.
ESR comprises two modules: the esr server module and the esr gui module. And both esr service and esr gui belongs A&AI.
diff --git a/docs/offeredapis.rst b/docs/offeredapis.rst
new file mode 100644
index 0000000..8f33185
--- /dev/null
+++ b/docs/offeredapis.rst
@@ -0,0 +1,22 @@
+ESR server Component Offered APIs
+==================================
+The esr server module provides the following APIs.
+
+* VIM register
+* VIM query
+* VIM update
+* VIM Deletion
+* VNFM register
+* VNFM query
+* VNFM update
+* VNFM Deletion
+* EMS register
+* EMS query
+* EMS update
+* EMS Deletion
+* thirdparty SDNC register
+* thirdparty SDNC query
+* thirdparty SDNC update
+* thirdparty SDNC Deletion
+
+
diff --git a/docs/platform/consumedapis.rst b/docs/platform/consumedapis.rst
index 2a8ce7c..9d64a9b 100644
--- a/docs/platform/consumedapis.rst
+++ b/docs/platform/consumedapis.rst
@@ -56,7 +56,7 @@ More details could be found at `A&AI APIs
- 1.2.2
+ 1.3.0
1.5.3
2.16
5.0
diff --git a/standalone/pom.xml b/standalone/pom.xml
index a0b5b53..9bffe50 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -36,7 +36,7 @@
target/assembly/${win64id}
target/version
${project.version}
- yyMMdd-HHmmss
+ yyyyMMdd'T'HHmmss'Z'
@@ -225,6 +225,13 @@
io.fabric8
docker-maven-plugin
0.16.5
+
+
+ com.github.jnr
+ jnr-unixsocket
+ 0.13
+
+
false
@@ -236,7 +243,7 @@
${basedir}/target/version/Dockerfile
${project.version}
- ${project.version}-STAGING-${maven.build.timestamp}
+ ${project.version}-${maven.build.timestamp}
${project.docker.latesttag.version}
diff --git a/standalone/src/main/assembly/Dockerfile b/standalone/src/main/assembly/Dockerfile
index 952c871..3ccd857 100644
--- a/standalone/src/main/assembly/Dockerfile
+++ b/standalone/src/main/assembly/Dockerfile
@@ -10,9 +10,9 @@ RUN apt-get update
RUN apt-get install -y openjdk-8-jdk
#configure the JDK
-RUN sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
-ENV PATH $PATH:/usr/lib/jvm/java-8-openjdk-amd64/jre/bin:/usr/lib/jvm/java-8-openjdk-amd64/bin
+RUN sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/jre/lib/security/java.security
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)
+ENV PATH $PATH:/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/jre/bin:/usr/lib/jvm/java-8-openjdk-$(dpkg --print-architecture)/bin
ENV CLASSPATH .:${JAVA_HOME}/lib:${JRE_HOME}/lib
ENV JRE_HOME ${JAVA_HOME}/jre
diff --git a/standalone/src/main/assembly/docker/instance_config.sh b/standalone/src/main/assembly/docker/instance_config.sh
index 8987eef..a52335d 100644
--- a/standalone/src/main/assembly/docker/instance_config.sh
+++ b/standalone/src/main/assembly/docker/instance_config.sh
@@ -4,6 +4,6 @@ MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
sed -i "s|msbDiscoveryIp.*|msbDiscoveryIp: $MSB_IP|" /home/esr/conf/extsys.yml
-sed -i "s|msbServerAddr.*|msbServerAddr: http://$MSB_IP:443|" /home/esr/conf/extsys.yml
+sed -i "s|msbServerAddr.*|msbServerAddr: http://$MSB_IP|" /home/esr/conf/extsys.yml
cat /home/esr/conf/extsys.yml