From 563a3579e907daa3952e10e25071b676430fd09d Mon Sep 17 00:00:00 2001
From: Munir Ahmad <munir.ahmad@bell.ca>
Date: Fri, 8 Feb 2019 16:42:03 -0500
Subject: heatbridge implementation for openstack-adapter
Converted heatbridge to use AAI Client
Removed open feign
Removed new aai client implementation
Removed aai helper classes
Removed unnecessary pom.xml imports
converted HeatBridgeImpl to rely on AAI transactions
added some example unit tests
Replaced MsoLogger with slf4j
Resolved merge conflicts
Change-Id: I933b49fae82c2f0d7a66d9a85b367b29006c73cc
Issue-ID: SO-1484
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Change-Id: I547b35ebdf51f4534de5d51d7d50a90bb9de4c72
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
Issue-ID: SO-1484
---
common/src/main/java/org/onap/so/client/aai/AAIObjectType.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'common/src')
diff --git a/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java b/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java
index 21e36cde6c..34d560210c 100644
--- a/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAIObjectType.java
@@ -21,7 +21,6 @@
package org.onap.so.client.aai;
import java.io.Serializable;
-import java.lang.reflect.Field;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -39,7 +38,9 @@ import org.onap.aai.domain.yang.Connector;
import org.onap.aai.domain.yang.Customer;
import org.onap.aai.domain.yang.Device;
import org.onap.aai.domain.yang.ExtAaiNetwork;
+import org.onap.aai.domain.yang.Flavor;
import org.onap.aai.domain.yang.GenericVnf;
+import org.onap.aai.domain.yang.Image;
import org.onap.aai.domain.yang.InstanceGroup;
import org.onap.aai.domain.yang.L3Network;
import org.onap.aai.domain.yang.LInterface;
@@ -134,6 +135,8 @@ public class AAIObjectType implements GraphInventoryObjectType, Serializable {
public static final AAIObjectType EXT_AAI_NETWORK = new AAIObjectType(AAINamespaceConstants.NETWORK, ExtAaiNetwork.class);
public static final AAIObjectType AGGREGATE_ROUTE = new AAIObjectType(AAINamespaceConstants.NETWORK, AggregateRoute.class);
public static final AAIObjectType L_INTERFACE = new AAIObjectType(AAIObjectType.VSERVER.uriTemplate(), LInterface.class);
+ public static final AAIObjectType IMAGE = new AAIObjectType(AAIObjectType.CLOUD_REGION.uriTemplate(), Image.class);
+ public static final AAIObjectType FLAVOR = new AAIObjectType(AAIObjectType.CLOUD_REGION.uriTemplate(), Flavor.class);
public static final AAIObjectType UNKNOWN = new AAIObjectType("", "", "unknown");
public static final AAIObjectType DSL = new AAIObjectType("/dsl", "", "dsl");
--
cgit