From 14e1daaddad9320927890bdee4c6d2853a12c67d Mon Sep 17 00:00:00 2001 From: pprakhar Date: Wed, 4 Oct 2017 16:40:34 +0530 Subject: Solution for Artifact Generation for PNF Resource Fix done in artifact generator to enable it to generate for resource type PNF. Change-Id: I114fc1ee022c0e4ec00d90eae55f5bf5f50a4d02 Issue-ID: SDC-431 Signed-off-by: pprakhar --- .../java/org/openecomp/sdc/generator/aai/model/Model.java | 3 +++ .../org/openecomp/sdc/generator/aai/model/PnfResource.java | 9 +++++++++ .../java/org/openecomp/sdc/generator/aai/model/PnfWidget.java | 11 +++++++++++ .../java/org/openecomp/sdc/generator/aai/model/Widget.java | 4 +++- 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfResource.java create mode 100644 common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfWidget.java diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Model.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Model.java index c55abb36c2..6668836518 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Model.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Model.java @@ -80,6 +80,9 @@ public abstract class Model { case "org.openecomp.resource.vfc.nodes.heat.cinder": modelToBeReturned = new VolumeWidget(); break; + case "org.openecomp.resource.pnf": + modelToBeReturned = new PnfResource(); + break; default: modelToBeReturned = null; break; diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfResource.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfResource.java new file mode 100644 index 0000000000..67e19392ba --- /dev/null +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfResource.java @@ -0,0 +1,9 @@ +package org.openecomp.sdc.generator.aai.model; + +import org.openecomp.sdc.generator.aai.types.Cardinality; + +@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.PNF, cardinality = Cardinality + .UNBOUNDED, + dataDeleteFlag = true) +public class PnfResource extends Resource { +} diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfWidget.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfWidget.java new file mode 100644 index 0000000000..2aa03b38bd --- /dev/null +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfWidget.java @@ -0,0 +1,11 @@ +package org.openecomp.sdc.generator.aai.model; + +import org.openecomp.sdc.generator.aai.types.Cardinality; +import org.openecomp.sdc.generator.aai.types.ModelType; +import org.openecomp.sdc.generator.aai.types.ModelWidget; + +@org.openecomp.sdc.generator.aai.types.Model(widget = Widget.Type.PNF, cardinality + = Cardinality.UNBOUNDED, dataDeleteFlag = true) +@ModelWidget(type = ModelType.WIDGET, name = "pnf") +public class PnfWidget extends ResourceWidget { +} diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Widget.java b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Widget.java index 6220519a3f..ce1ef703d9 100644 --- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Widget.java +++ b/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Widget.java @@ -78,6 +78,8 @@ public abstract class Widget extends Model { return new AllotedResourceWidget(); case TUNNEL_XCONNECT: return new TunnelXconnectWidget(); + case PNF: + return new PnfWidget(); default: return null; } @@ -191,6 +193,6 @@ public abstract class Widget extends Model { public enum Type { SERVICE, VF, VFC, VSERVER, VOLUME, FLAVOR, TENANT, VOLUME_GROUP, LINT, L3_NET, VFMODULE, IMAGE, - OAM_NETWORK,ALLOTTED_RESOURCE,TUNNEL_XCONNECT + OAM_NETWORK,ALLOTTED_RESOURCE,TUNNEL_XCONNECT, PNF } } -- cgit 1.2.3-korg