The pdpType field is redundant; it has the same value as the pdpSubgroup
field.
Change-Id: Id5cd0c726ffcf73aa82d35eb8cdbf1d7e3c2abc8
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
public class PdpUpdate extends PdpMessage {
private String name;
public class PdpUpdate extends PdpMessage {
private String name;
- private String pdpType;
private String description;
private String pdpGroup;
private String pdpSubgroup;
private String description;
private String pdpGroup;
private String pdpSubgroup;
super(PdpMessageType.PDP_UPDATE);
this.name = source.name;
super(PdpMessageType.PDP_UPDATE);
this.name = source.name;
- this.pdpType = source.pdpType;
this.description = source.description;
this.pdpGroup = source.pdpGroup;
this.pdpSubgroup = source.pdpSubgroup;
this.description = source.description;
this.pdpGroup = source.pdpGroup;
this.pdpSubgroup = source.pdpSubgroup;
PdpUpdate orig = new PdpUpdate();
// verify with null values
PdpUpdate orig = new PdpUpdate();
// verify with null values
- assertEquals("PdpUpdate(name=null, pdpType=null, description=null, pdpGroup=null, "
+ assertEquals("PdpUpdate(name=null, description=null, pdpGroup=null, "
+ "pdpSubgroup=null, policies=null)", new PdpUpdate(orig).toString());
// verify with all values
+ "pdpSubgroup=null, policies=null)", new PdpUpdate(orig).toString());
// verify with all values
orig.setName("my-name");
orig.setPdpGroup("my-group");
orig.setPdpSubgroup("my-subgroup");
orig.setName("my-name");
orig.setPdpGroup("my-group");
orig.setPdpSubgroup("my-subgroup");
- orig.setPdpType("my-type");
ToscaPolicy policy1 = new ToscaPolicy();
policy1.setName("policy-a");
ToscaPolicy policy1 = new ToscaPolicy();
policy1.setName("policy-a");
PdpUpdate other = new PdpUpdate(orig);
PdpUpdate other = new PdpUpdate(orig);
- assertEquals("PdpUpdate(name=my-name, pdpType=my-type, description=my-description, "
+ assertEquals("PdpUpdate(name=my-name, description=my-description, "
+ "pdpGroup=my-group, pdpSubgroup=my-subgroup, policies=["
+ "ToscaPolicy(super=ToscaEntity(name=policy-a, version=1.2.3, derivedFrom=null, "
+ "metadata=null, description=null), type=null, typeVersion=null, properties=null), "
+ "pdpGroup=my-group, pdpSubgroup=my-subgroup, policies=["
+ "ToscaPolicy(super=ToscaEntity(name=policy-a, version=1.2.3, derivedFrom=null, "
+ "metadata=null, description=null), type=null, typeVersion=null, properties=null), "