Modify VES configuration

Change-Id: If2151c09ec1bb03450a8dac79c0a2dde5fb3f466
Issue-Id: VFC-548
Signed-off-by: wangguirong <wangguirong@boco.com.cn>

diff --git a/ems/boco/3rdParty/evel_javalib2-0.0.1-SNAPSHOT.jar b/ems/boco/3rdParty/evel_javalib2-0.0.1-SNAPSHOT.jar
new file mode 100644 (file)
index 0000000..90d8f76
Binary files /dev/null and b/ems/boco/3rdParty/evel_javalib2-0.0.1-SNAPSHOT.jar differ

diff --git a/ems/boco/lib/VESLibrary.jar b/ems/boco/lib/VESLibrary.jar
deleted file mode 100644 (file)
index 0bad86f..0000000
Binary files a/ems/boco/lib/VESLibrary.jar and /dev/null differ

diff --git a/ems/boco/lib/dependencies-all.jar b/ems/boco/lib/dependencies-all.jar
deleted file mode 100644 (file)
index ac153c5..0000000
Binary files a/ems/boco/lib/dependencies-all.jar and /dev/null differ

diff --git a/ems/boco/pom.xml b/ems/boco/pom.xml
index 115da0f..b2d9c01 100644 (file)
--- a/ems/boco/pom.xml
+++ b/ems/boco/pom.xml
@@ -209,19 +209,11 @@
         <version>${swagger.version}</version>
     </dependency>
      <dependency>
-                   <groupId>dependencies-all</groupId>
-                   <artifactId>test</artifactId>
-                   <version>3.0</version>
+                   <groupId>evel_javalib2</groupId>
+                   <artifactId>evel_javalib2</artifactId>
+                   <version>0.0.1-SNAPSHOT</version>
                    <scope>system</scope> 
-                       <systemPath>${basedir}/lib/dependencies-all.jar</systemPath> 
-               </dependency>
-                       
-               <dependency>
-                   <groupId>VESLibrary</groupId>
-                   <artifactId>test</artifactId>
-                   <version>3.0</version>
-                   <scope>system</scope> 
-                       <systemPath>${basedir}/lib/VESLibrary.jar</systemPath> 
-               </dependency>
+                       <systemPath>${basedir}/3rdParty/evel_javalib2-0.0.1-SNAPSHOT.jar</systemPath> 
+       </dependency>
   </dependencies>
 </project>

diff --git a/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java b/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
index 84fb7f6..b2bba0c 100644 (file)
--- a/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
+++ b/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
@@ -21,11 +21,6 @@ import java.util.Date;
 import java.util.Map;
 import java.util.Properties;
 
-import javax.json.Json;
-import javax.json.JsonBuilderFactory;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-
 import org.apache.log4j.Level;
 import org.onap.vfc.nfvo.emsdriver.commons.constant.Constant;
 import org.onap.vfc.nfvo.emsdriver.commons.utils.DriverThread;

diff --git a/ems/microservice-standalone/src/main/assembly/3rdParty/evel_javalib2-0.0.1-SNAPSHOT.jar b/ems/microservice-standalone/src/main/assembly/3rdParty/evel_javalib2-0.0.1-SNAPSHOT.jar
new file mode 100644 (file)
index 0000000..90d8f76
Binary files /dev/null and b/ems/microservice-standalone/src/main/assembly/3rdParty/evel_javalib2-0.0.1-SNAPSHOT.jar differ

diff --git a/ems/microservice-standalone/src/main/assembly/conf/config.properties b/ems/microservice-standalone/src/main/assembly/conf/config.properties
index 7a946d0..2a8bd42 100644 (file)
--- a/ems/microservice-standalone/src/main/assembly/conf/config.properties
+++ b/ems/microservice-standalone/src/main/assembly/conf/config.properties
@@ -26,14 +26,11 @@ ftp_type = ftp
 msbAddress=10.74.205.123:80
 esr_ems_listUrl=/aai/v11/external-system/esr-ems-list
 esr_emsUrl=/aai/v11/external-system/esr-ems-list/esr-ems/%s?depth=all
-alarmUrl=/alarm
 
 
 #north
 event_api_url=http://127.0.0.1
 port=30000
-path=/vendor_event_listener
-topic=/example_vnf
 username=pill
 password=will
 level=debug

diff --git a/ems/microservice-standalone/src/main/assembly/conf/crontab.xml b/ems/microservice-standalone/src/main/assembly/conf/crontab.xml
index 0d7f591..e6ef0aa 100644 (file)
--- a/ems/microservice-standalone/src/main/assembly/conf/crontab.xml
+++ b/ems/microservice-standalone/src/main/assembly/conf/crontab.xml
@@ -18,15 +18,15 @@
 
 -->
 <scheduler>
-      <crontab type ="ems-resource" crontab="0 0/15 * * * ?">
+      <crontab type ="ems-resource" crontab="">
          <match>*</match>
          <granularity>15</granularity>
       </crontab>
-      <crontab type ="ems-performance" crontab="">
+      <crontab type ="ems-performance" crontab="0 0/15 * * * ?">
           <match>*</match>
           <granularity>15</granularity>
       </crontab>
-      <crontab type ="ems-alarm" iscollect = "false">
-               <readtimeout>6</readtimeout>;
+      <crontab type ="ems-alarm" iscollect = "true">
+               <readtimeout>180000</readtimeout>;
       </crontab>
 </scheduler>
\ No newline at end of file

diff --git a/ems/microservice-standalone/src/main/assembly/docker/instance_config.sh b/ems/microservice-standalone/src/main/assembly/docker/instance_config.sh
index f0142b4..4968343 100755 (executable)
--- a/ems/microservice-standalone/src/main/assembly/docker/instance_config.sh
+++ b/ems/microservice-standalone/src/main/assembly/docker/instance_config.sh
@@ -5,7 +5,13 @@ MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
 
 sed -i "s|msbAddress.*|msbAddress: $MSB_IP:$MSB_PORT|" emsdriver/conf/emsdriver.yml
 sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" emsdriver/conf/emsdriver.yml
+sed -i "s|msbAddress=.*|msbAddress=$MSB_IP:$MSB_PORT|" emsdriver/conf/config.properties
+sed -i "s|event_api_url=.*|event_api_url=$EVENT_API_URL|" emsdriver/conf/config.properties
+sed -i "s|port=.*|port=$PORT|" emsdriver/conf/config.properties
+sed -i "s|username=.*|username=$USER_NAME|" emsdriver/conf/config.properties
+sed -i "s|password=.*|password=$PASSWORD|" emsdriver/conf/config.properties
 
 
 cat emsdriver/conf/emsdriver.yml
+cat emsdriver/conf/config.properties
 

diff --git a/ems/microservice-standalone/src/main/assembly/lib/VESLibrary.jar b/ems/microservice-standalone/src/main/assembly/lib/VESLibrary.jar
deleted file mode 100644 (file)
index 0bad86f..0000000
Binary files a/ems/microservice-standalone/src/main/assembly/lib/VESLibrary.jar and /dev/null differ

diff --git a/ems/microservice-standalone/src/main/assembly/lib/dependencies-all.jar b/ems/microservice-standalone/src/main/assembly/lib/dependencies-all.jar
deleted file mode 100644 (file)
index ac153c5..0000000
Binary files a/ems/microservice-standalone/src/main/assembly/lib/dependencies-all.jar and /dev/null differ