summaryrefslogtreecommitdiffstats
path: root/controlloop
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2017-09-08 16:47:59 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-08 16:47:59 +0000
commit045198cd1a5a73ffe6630e6833e1d021585fb82f (patch)
tree53cbabe4f5b0657e13142d7a3fa8041e3dce5f24 /controlloop
parent9641684f3084e3e6a0ce8b8594258c25c1092c2d (diff)
parentbf2a2faad8e56abfe39cba37fe5e8cee6bfe3a5c (diff)
Merge "Clearing sonar critical for missing serialization"
Diffstat (limited to 'controlloop')
-rw-r--r--controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java5
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VServer.java9
-rw-r--r--controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java7
3 files changed, 15 insertions, 6 deletions
diff --git a/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java b/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java
index e7b7d2371..2d2992106 100644
--- a/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java
+++ b/controlloop/common/actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/APPCActorServiceProvider.java
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.List;
import org.onap.policy.controlloop.VirtualControlLoopEvent;
-import org.onap.policy.controlloop.actor.appclcm.AppcLcmActorServiceProvider;
import org.onap.policy.appc.CommonHeader;
import org.onap.policy.appc.Request;
import org.onap.policy.controlloop.ControlLoopOperation;
@@ -101,9 +100,7 @@ public class APPCActorServiceProvider implements Actor {
* specified in the yaml, the target vnf-id is retrieved by
* a named query to A&AI.
*/
- String resourceId = policy.getTarget().getResourceID();
- String sourceVnfId = onset.AAI.get("generic-vnf.vnf-id");
- String vnfId = "test"; //AppcLcmActorServiceProvider.vnfNamedQuery(resourceId, sourceVnfId);
+ String vnfId = "test";
/*
* For now Policy generates the PG Streams as a demo, in the
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VServer.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VServer.java
index 8667544eb..823dc76a0 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VServer.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/AAINQF199/AAINQF199VServer.java
@@ -20,9 +20,16 @@
package org.onap.policy.aai.AAINQF199;
+import java.io.Serializable;
+
import com.google.gson.annotations.SerializedName;
-public class AAINQF199VServer {
+public class AAINQF199VServer implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -6718526692734215643L;
@SerializedName("vserver-id")
public String vserverId;
diff --git a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
index 36d34f75b..4799733da 100644
--- a/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
+++ b/controlloop/common/model-impl/aai/src/main/java/org/onap/policy/aai/RelationshipList.java
@@ -21,12 +21,17 @@
package org.onap.policy.aai;
import java.util.List;
+import java.io.Serializable;
import java.util.LinkedList;
import com.google.gson.annotations.SerializedName;
-public class RelationshipList {
+public class RelationshipList implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1769880386474240406L;
@SerializedName("relationship")
public List<RelationshipItem> relationship = new LinkedList<RelationshipItem>();
e License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= """run as server: python -m otihandler""" import logging import os import sys from otihandler.config import Config from otihandler.onap.audit import Audit from otihandler.web_server import DTIWeb from otihandler.dbclient import DaoBase class LogWriter(object): """redirect the standard out + err to the logger""" def __init__(self, logger_func): self.logger_func = logger_func def write(self, log_line): """actual writer to be used in place of stdout or stderr""" log_line = log_line.rstrip() if log_line: self.logger_func(log_line) def flush(self): """no real flushing of the buffer""" pass def run_event_handler(): """main run function for event_handler""" Config.load_from_file() # Config.discover() logger = logging.getLogger("event_handler") sys.stdout = LogWriter(logger.info) sys.stderr = LogWriter(logger.error) logger.info("========== run_event_handler ==========") app_version = os.getenv("APP_VER") logger.info("app_version %s", app_version) Audit.init(Config.get_system_name(), app_version, Config.LOGGER_CONFIG_FILE_PATH) logger.info("starting event_handler with config:") logger.info(Audit.log_json_dumps(Config.config)) audit = Audit(req_message="start event_handler") audit = Audit(req_message="DB init start") DaoBase.init_db(os.environ.get("DB_CONN_URL")) DTIWeb.run_forever(audit) if __name__ == "__main__": run_event_handler()