From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 31 Dec 2018 17:21:27 +0200
Subject: Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../model/AaiGetNetworkCollectionDetails/Vlan.java | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java

(limited to 'vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java')

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java
new file mode 100644
index 000000000..a18464850
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java
@@ -0,0 +1,41 @@
+package org.onap.vid.aai.model.AaiGetNetworkCollectionDetails;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.onap.vid.aai.model.interfaces.AaiModelWithRelationships;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Vlan implements AaiModelWithRelationships {
+
+    public Vlan(
+            @JsonProperty("vlan-interface") String vlanInterface,
+            @JsonProperty("vlan-id-inner") String vlanIdInner,
+            @JsonProperty("relationship-list") RelationshipList relationshipList) {
+        this.vlanInterface = vlanInterface;
+        this.vlanIdInner = vlanIdInner;
+        this.relationshipList = relationshipList;
+    }
+
+    @JsonProperty("vlan-interface")
+    private final String vlanInterface;
+
+    @JsonProperty("vlan-id-inner")
+    private final String vlanIdInner;
+
+    @JsonProperty("relationship-list")
+    public final RelationshipList relationshipList;
+
+    public String getVlanInterface() {
+        return vlanInterface;
+    }
+
+    public String getVlanIdInner() {
+        return vlanIdInner;
+    }
+
+    @Override
+    public RelationshipList getRelationshipList() {
+        return relationshipList;
+    }
+
+}
-- 
cgit 1.2.3-korg