Policy 1707 Second commit

Change-Id: I18f5b142238733d17280cf17c3d1dd28204d34e9
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>

2 files changed, 71 insertions, 0 deletions

diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTagPicker.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTagPicker.java
index 129ad37df..032f77f3c 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTagPicker.java
+++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/FWTagPicker.java
@@ -59,6 +59,9 @@ public class FWTagPicker implements Serializable {
 
 	@Column(name="description", nullable=true, length=2048)
 	private String description;
+	
+	@Column(name="networkRole", nullable=true)
+	private String networkRole;
 
 	@Column(name="tags", nullable=true)
 	@OrderBy("asc")
@@ -135,6 +138,14 @@ public class FWTagPicker implements Serializable {
 		this.description = description;
 	}
 
+	public String getNetworkRole() {
+		return networkRole;
+	}
+
+	public void setNetworkRole(String networkRole) {
+		this.networkRole = networkRole;
+	}
+	
 	public String getTagValues() {
 		return tagValues;
 	}
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyGroupEntity.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyGroupEntity.java
new file mode 100644
index 000000000..85c42ee48
--- /dev/null
+++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/PolicyGroupEntity.java
@@ -0,0 +1,60 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ECOMP-REST
+ * ================================================================================
+ * Copyright (C) 2017 AT&T 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.openecomp.policy.rest.jpa;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+
+@Entity
+@Table(name="PolicyGroupEntity")
+@NamedQuery(name="PolicyGroupEntity.findAll", query="SELECT p FROM PolicyGroupEntity p ")
+public class PolicyGroupEntity implements Serializable{
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name="groupKey")
+	private int groupKey;
+	
+	@Id
+	@Column(name="policyid")
+	private int policyid;
+
+	public int getGroupKey() {
+		return groupKey;
+	}
+
+	public void setGroupKey(int groupKey) {
+		this.groupKey = groupKey;
+	}
+
+	public int getPolicyid() {
+		return policyid;
+	}
+
+	public void setPolicyid(int policyid) {
+		this.policyid = policyid;
+	}
+}