[SDC] Onboarding 1710 rebase.

Change-Id: If3b6b81d221fde13908f1e8160db6f7d9433c535
Signed-off-by: Avi Ziv <avi.ziv@amdocs.com>

4 files changed, 64 insertions, 50 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ComponentMibInfo.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ComponentMibInfo.java
deleted file mode 100644
index 88dbedc136..0000000000
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ComponentMibInfo.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.core.enrichment.types;
-
-public class ComponentMibInfo {
-  private MibInfo snmpTrap;
-  private MibInfo snmpPoll;
-
-
-  public MibInfo getSnmpTrap() {
-    return snmpTrap;
-  }
-
-  public void setSnmpTrap(MibInfo snmpTrap) {
-    this.snmpTrap = snmpTrap;
-  }
-
-  public MibInfo getSnmpPoll() {
-    return snmpPoll;
-  }
-
-  public void setSnmpPoll(MibInfo snmpPoll) {
-    this.snmpPoll = snmpPoll;
-  }
-
-
-}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ComponentMonitoringUploadInfo.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ComponentMonitoringUploadInfo.java
new file mode 100644
index 0000000000..a3a76a561b
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ComponentMonitoringUploadInfo.java
@@ -0,0 +1,60 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.core.enrichment.types;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.openecomp.core.enrichment.types.MonitoringUploadType.SNMP_POLL;
+import static org.openecomp.core.enrichment.types.MonitoringUploadType.SNMP_TRAP;
+import static org.openecomp.core.enrichment.types.MonitoringUploadType.VES_EVENTS;
+
+public class ComponentMonitoringUploadInfo {
+
+
+  private Map<MonitoringUploadType, MonitoringArtifactInfo> infoByType = new HashMap<>();
+  //todo as part of ATTASDC-4503
+
+
+  public MonitoringArtifactInfo getSnmpTrap() {
+    return infoByType.get(SNMP_TRAP);
+  }
+
+  public void setSnmpTrap(MonitoringArtifactInfo snmpTrapInfo) {
+    infoByType.put(SNMP_TRAP, snmpTrapInfo);
+  }
+
+  public MonitoringArtifactInfo getSnmpPoll() {
+    return infoByType.get(SNMP_POLL);
+  }
+
+  public void setSnmpPoll(MonitoringArtifactInfo snmpPollInfo) {
+    infoByType.put(SNMP_POLL, snmpPollInfo);
+  }
+
+  public MonitoringArtifactInfo getVesEvent() {
+    return infoByType.get(VES_EVENTS);
+  }
+
+  public void setVesEvent(MonitoringArtifactInfo snmpPollInfo) {
+    infoByType.put(VES_EVENTS, snmpPollInfo);
+  }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/MibInfo.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/MonitoringArtifactInfo.java
index f5d2fcb90d..27a0d83069 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/MibInfo.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/MonitoringArtifactInfo.java
@@ -23,7 +23,7 @@ package org.openecomp.core.enrichment.types;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-public class MibInfo {
+public class MonitoringArtifactInfo {
   private String name;
   private byte[] content;
 
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactType.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/MonitoringUploadType.java
index 48805d7ca5..077480f95f 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactType.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/MonitoringUploadType.java
@@ -20,11 +20,10 @@
 
 package org.openecomp.core.enrichment.types;
 
-public enum ArtifactType {
+public enum MonitoringUploadType {
   SNMP_POLL,
-  SNMP_TRAP;
-
-
+  SNMP_TRAP,
+  VES_EVENTS
 }