yang model revise: neutron-secgroups.yang

[neutron.git] / neutron-spi / src / main / java / org / opendaylight / neutron / spi / NeutronSecurityGroup.java

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
index 600a7797e3d0bb20aaa5332a9b1373e0c994386f..81ddb0a7e9cdbd5bb19dd21793ac742b8a8b1ea8 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
@@ -9,7 +9,6 @@
 package org.opendaylight.neutron.spi;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -25,9 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
  * <p>
  * id                   uuid-str unique ID for the security group.
  * name                 String name of the security group.
- * description          String name of the security group.
  * tenant_id            uuid-str Owner of security rule..
- * security_group_rules List&lt;NeutronSecurityRule&gt; nested RO in the sec group.
  */
 
 @XmlRootElement
@@ -39,25 +36,7 @@ public class NeutronSecurityGroup extends NeutronObject implements Serializable,
     @XmlElement(name = "name")
     String securityGroupName;
 
-    @XmlElement(name = "description")
-    String securityGroupDescription;
-
-    @XmlElement(name = "security_group_rules")
-    List<NeutronSecurityRule> neutronSecurityRule;
-
     public NeutronSecurityGroup() {
-        neutronSecurityRule = new ArrayList<NeutronSecurityRule>();
-
-    }
-
-    // @deprecated use getID()
-    public String getSecurityGroupUUID() {
-        return getID();
-    }
-
-    // @deprecated use setID()
-    public void setSecurityGroupUUID(String uuid) {
-        setID(uuid);
     }
 
     public String getSecurityGroupName() {
@@ -68,33 +47,6 @@ public class NeutronSecurityGroup extends NeutronObject implements Serializable,
         this.securityGroupName = securityGroupName;
     }
 
-    public String getSecurityGroupDescription() {
-        return securityGroupDescription;
-    }
-
-    public void setSecurityGroupDescription(String securityGroupDescription) {
-        this.securityGroupDescription = securityGroupDescription;
-    }
-
-    @Deprecated
-    public String getSecurityGroupTenantID() {
-        return getTenantID();
-    }
-
-    @Deprecated
-    public void setSecurityGroupTenantID(String tenantID) {
-        setTenantID(tenantID);
-    }
-
-    // Rules In Group
-    public List<NeutronSecurityRule> getSecurityRules() {
-        return neutronSecurityRule;
-    }
-
-    public void setSecurityRules(List<NeutronSecurityRule> neutronSecurityRule) {
-        this.neutronSecurityRule = neutronSecurityRule;
-    }
-
     public NeutronSecurityGroup extractFields(List<String> fields) {
         NeutronSecurityGroup ans = new NeutronSecurityGroup ();
         Iterator<String> i = fields.iterator ();
@@ -106,15 +58,9 @@ public class NeutronSecurityGroup extends NeutronObject implements Serializable,
             if (s.equals ("name")) {
                 ans.setSecurityGroupName (this.getSecurityGroupName ());
             }
-            if (s.equals ("description")) {
-                ans.setSecurityGroupDescription (this.getSecurityGroupDescription ());
-            }
             if (s.equals ("tenant_id")) {
                 ans.setTenantID (this.getTenantID ());
             }
-            if (s.equals ("security_group_rules")) {
-                ans.setSecurityRules (this.getSecurityRules ());
-            }
         }
         return ans;
     }
@@ -124,9 +70,8 @@ public class NeutronSecurityGroup extends NeutronObject implements Serializable,
         return "NeutronSecurityGroup{" +
                 "securityGroupUUID='" + uuid + '\'' +
                 ", securityGroupName='" + securityGroupName + '\'' +
-                ", securityGroupDescription='" + securityGroupDescription + '\'' +
                 ", securityGroupTenantID='" + tenantID + '\'' +
-                ", securityRules=" + neutronSecurityRule + "]";
+                "]";
     }
 
     @Override