Update OofHoming w/ directives

Issue-ID: SO-746
Change-Id: I597f7621a32eeb5b8e92cf80700c60bccdc5e560
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

2 files changed, 5 insertions, 62 deletions

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/CloudFlavor.java b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/CloudFlavor.java
deleted file mode 100644
index 7160a2f333..0000000000
--- a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/CloudFlavor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 Intel Corp. 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.onap.so.bpmn.core.domain;
-
-import java.io.Serializable;
-
-/**
- * Stores Cloud Flavor information and is an attribute
- * of a <class>HomingSolution</class>
- *
- */
-public class CloudFlavor extends JsonWrapper implements Serializable {
-
-	private static final long serialVersionUID = 8423934332773299577L;
-	private String flavorLabel;
-    private String flavor;
-
-    public CloudFlavor (String flavorLabel, String flavor){
-        this.flavorLabel = flavorLabel;
-        this.flavor = flavor;
-    }
-
-    public String getFlavorLabel() {
-        return flavorLabel;
-    }
-
-    public void setFlavorLabel(String flavorLabel) {
-        this.flavorLabel = flavorLabel;
-    }
-
-    public String getFlavor() {
-        return flavor;
-    }
-
-    public void setFlavor(String flavor) {
-        this.flavor = flavor;
-    }
-
-}
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/HomingSolution.java b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/HomingSolution.java
index 57e6864943..e4eb01e7fb 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/HomingSolution.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/HomingSolution.java
@@ -45,7 +45,7 @@ public class HomingSolution extends JsonWrapper implements Serializable  {
 	private String aicVersion;
 	private String tenant;
 	private VnfResource vnf;
-	private List<CloudFlavor> flavors;
+	private String oofDirectives;
 	private License license = new License();
 
 
@@ -130,12 +130,12 @@ public class HomingSolution extends JsonWrapper implements Serializable  {
 	/**
 	 * @return a map<string, string> key is label name, value is any flavor
 	 */
-	public List<CloudFlavor> getFlavors() {
-		return flavors;
+	public String getOofDirectives() {
+		return oofDirectives;
 	}
 
-	public void setFlavors(List<CloudFlavor> flavors) {
-		this.flavors = flavors;
+	public void setOofDirectives(String oofDirectives) {
+		this.oofDirectives = oofDirectives;
 	}
 
 	public License getLicense() {