aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorpprakhar <Prakhar.Pandey@amdocs.com>2017-10-09 18:41:23 +0530
committerpprakhar <Prakhar.Pandey@amdocs.com>2017-10-09 18:50:08 +0530
commit7783d915581806ed2f1e4c40a232cf90ffde0d3c (patch)
tree15f2f1c08313eac8633aaf3935e0df1dcae9a74c /common
parent14e1daaddad9320927890bdee4c6d2853a12c67d (diff)
Revert "Solution for Artifact Gen for PNFResource"
This reverts commit 14e1daaddad9320927890bdee4c6d2853a12c67d. Change-Id: I919e264953a1bc63b861088cb0de800efb8a0604 Issue-ID: SDC-431 Signed-off-by: pprakhar <Prakhar.Pandey@amdocs.com>
Diffstat (limited to 'common')
-rw-r--r--common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Model.java3
-rw-r--r--common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfResource.java9
-rw-r--r--common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfWidget.java11
-rw-r--r--common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/Widget.java4
4 files changed, 1 insertions, 26 deletions
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 6668836518..c55abb36c2 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,9 +80,6 @@ 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
deleted file mode 100644
index 67e19392ba..0000000000
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfResource.java
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 2aa03b38bd..0000000000
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-api/src/main/java/org/openecomp/sdc/generator/aai/model/PnfWidget.java
+++ /dev/null
@@ -1,11 +0,0 @@
-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 ce1ef703d9..6220519a3f 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,8 +78,6 @@ public abstract class Widget extends Model {
return new AllotedResourceWidget();
case TUNNEL_XCONNECT:
return new TunnelXconnectWidget();
- case PNF:
- return new PnfWidget();
default:
return null;
}
@@ -193,6 +191,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, PNF
+ OAM_NETWORK,ALLOTTED_RESOURCE,TUNNEL_XCONNECT
}
}