Skip to content

Commit 263b9bc

Browse files
wooreawoorea
committed
security groups
1 parent 81e1728 commit 263b9bc

24 files changed

+210
-250
lines changed

‎openstack-api/src/main/java/org/openstack/api/compute/ext/SecurityGroupResource.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import org.openstack.api.common.Resource;
1010
import org.openstack.model.compute.SecurityGroup;
11-
import org.openstack.model.compute.nova.NovaServer;
1211
import org.openstack.model.compute.nova.securitygroup.NovaSecurityGroup;
1312

1413
public class SecurityGroupResource extends Resource {

‎openstack-api/src/main/java/org/openstack/api/compute/ext/SecurityGroupsResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public SecurityGroupList get() {
2020
return target.request(MediaType.APPLICATION_JSON).get(NovaSecurityGroupList.class);
2121
}
2222

23-
public SecurityGroup post(NovaSecurityGroup securityGroup) {
23+
public SecurityGroup post(SecurityGroup securityGroup) {
2424
return target.request(MediaType.APPLICATION_JSON).post(Entity.entity(securityGroup, MediaType.APPLICATION_JSON), NovaSecurityGroup.class);
2525

2626
}

‎openstack-api/src/main/java/org/openstack/model/compute/SecurityGroup.java‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,26 @@
22

33
import java.util.List;
44

5-
import javax.xml.bind.annotation.XmlAttribute;
5+
public interface SecurityGroup {
66

7-
import org.openstack.model.compute.nova.securitygroup.NovaSecurityGroupRule;
7+
public abstract void setRules(List<SecurityGroupRule> rules);
88

9-
public interface SecurityGroup {
9+
public abstract List<SecurityGroupRule> getRules();
10+
11+
public abstract void setDescription(String description);
12+
13+
public abstract String getDescription();
14+
15+
public abstract void setName(String name);
1016

11-
Integer getId();
17+
public abstract String getName();
1218

13-
String getTenantId();
19+
public abstract void setTenantId(String tenantId);
1420

15-
@XmlAttribute(name = "name")
16-
String getName();
21+
public abstract String getTenantId();
1722

18-
String getDescription();
23+
public abstract void setId(Integer id);
1924

20-
List<NovaSecurityGroupRule> getRules();
25+
public abstract Integer getId();
2126

22-
}
27+
}

‎openstack-api/src/main/java/org/openstack/model/compute/SecurityGroupList.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import java.util.List;
44

5-
import org.openstack.model.compute.nova.securitygroup.NovaSecurityGroup;
6-
75
public interface SecurityGroupList {
86

97
List<SecurityGroup> getList();

‎openstack-api/src/main/java/org/openstack/model/compute/SecurityGroupRule.java‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,36 @@
55

66
public interface SecurityGroupRule {
77

8-
Integer getId();
8+
public abstract void setGroup(Group group);
99

10-
String getName();
10+
public abstract Group getGroup();
1111

12-
Integer getParentGroupId();
12+
public abstract void setIpRange(IpRange ipRange);
1313

14-
Integer getFromPort();
14+
public abstract IpRange getIpRange();
1515

16-
Integer getToPort();
16+
public abstract void setIpProtocol(String ipProtocol);
1717

18-
String getIpProtocol();
18+
public abstract String getIpProtocol();
1919

20-
IpRange getIpRange();
20+
public abstract void setToPort(Integer toPort);
2121

22-
Group getGroup();
22+
public abstract Integer getToPort();
2323

24-
}
24+
public abstract void setFromPort(Integer fromPort);
25+
26+
public abstract Integer getFromPort();
27+
28+
public abstract void setParentGroupId(Integer parentGroupId);
29+
30+
public abstract Integer getParentGroupId();
31+
32+
public abstract void setName(String name);
33+
34+
public abstract String getName();
35+
36+
public abstract void setId(Integer id);
37+
38+
public abstract Integer getId();
39+
40+
}

‎openstack-api/src/main/java/org/openstack/model/compute/nova/securitygroup/NovaSecurityGroup.java‎

Lines changed: 47 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.openstack.model.compute.nova.securitygroup;
22

33
import java.io.Serializable;
4+
import java.util.ArrayList;
45
import java.util.List;
56

67
import javax.xml.bind.annotation.XmlAccessType;
@@ -12,11 +13,12 @@
1213

1314
import org.openstack.model.common.JsonRootElement;
1415
import org.openstack.model.compute.SecurityGroup;
16+
import org.openstack.model.compute.SecurityGroupRule;
1517

1618
@XmlRootElement(name = "security_group")
1719
@XmlAccessorType(XmlAccessType.NONE)
1820
@JsonRootElement("security_group")
19-
public class NovaSecurityGroup implements Serializable, SecurityGroup {
21+
public class NovaSecurityGroup implements SecurityGroup, Serializable {
2022

2123
@XmlAttribute
2224
protected Integer id;
@@ -35,7 +37,7 @@ public class NovaSecurityGroup implements Serializable, SecurityGroup {
3537

3638
@XmlElementWrapper(name = "rules")
3739
@XmlElement(name = "rule")
38-
protected List<NovaSecurityGroupRule> rules;
40+
protected List<NovaSecurityGroupRule> rules = new ArrayList<NovaSecurityGroupRule>();
3941

4042
public NovaSecurityGroup() {
4143
// TODO Auto-generated constructor stub
@@ -46,87 +48,54 @@ public NovaSecurityGroup(int id, String name) {
4648
this.name = name;
4749
}
4850

49-
50-
51-
/* (non-Javadoc)
52-
* @see org.openstack.model.compute.SecurityGroup#getId()
53-
*/
5451
@Override
5552
public Integer getId() {
56-
return id;
57-
}
53+
return id;
54+
}
5855

59-
public void setId(Integer id) {
60-
this.id = id;
61-
}
56+
@Override
57+
public void setId(Integer id) {
58+
this.id = id;
59+
}
6260

63-
/* (non-Javadoc)
64-
* @see org.openstack.model.compute.SecurityGroup#getTenantId()
65-
*/
66-
@Override
61+
@Override
6762
public String getTenantId() {
68-
return tenantId;
69-
}
70-
71-
public void setTenantId(String tenantId) {
72-
this.tenantId = tenantId;
73-
}
74-
75-
/* (non-Javadoc)
76-
* @see org.openstack.model.compute.SecurityGroup#getName()
77-
*/
78-
@Override
79-
@XmlAttribute(name = "name")
80-
public String getName() {
81-
/*
82-
if (nameAttribute == null) {
83-
return nameElement;
84-
}
85-
if (nameElement == null) {
86-
return nameAttribute;
87-
}
88-
if (!nameElement.equals(nameAttribute))
89-
throw new IllegalStateException();
90-
return nameElement;
91-
*/
92-
return name;
93-
}
94-
95-
public void setName(String name) {
96-
this.name = name;
97-
/*
98-
this.nameAttribute = name;
99-
this.nameElement = name;
100-
*/
101-
}
102-
103-
/* (non-Javadoc)
104-
* @see org.openstack.model.compute.SecurityGroup#getDescription()
105-
*/
106-
@Override
63+
return tenantId;
64+
}
65+
66+
@Override
67+
public void setTenantId(String tenantId) {
68+
this.tenantId = tenantId;
69+
}
70+
71+
@Override
72+
public String getName() {
73+
return name;
74+
}
75+
76+
@Override
77+
public void setName(String name) {
78+
this.name = name;
79+
}
80+
81+
@Override
10782
public String getDescription() {
108-
return description;
109-
}
110-
111-
public void setDescription(String description) {
112-
this.description = description;
113-
}
114-
115-
/* (non-Javadoc)
116-
* @see org.openstack.model.compute.SecurityGroup#getRules()
117-
*/
118-
@Override
119-
public List<NovaSecurityGroupRule> getRules() {
120-
return rules;
121-
}
122-
123-
public void setRules(List<NovaSecurityGroupRule> rules) {
124-
this.rules = rules;
125-
}
126-
127-
@Override
128-
public String toString() {
129-
return "SecurityGroup [id=" + id + ", tenantId=" + tenantId + ", name=" + name + ", description=" + description + ", rules=" + rules + "]";
130-
}
83+
return description;
84+
}
85+
86+
@Override
87+
public void setDescription(String description) {
88+
this.description = description;
89+
}
90+
91+
@Override
92+
public List<SecurityGroupRule> getRules() {
93+
return (List<SecurityGroupRule>) (List<?>) rules;
94+
}
95+
96+
@Override
97+
public void setRules(List<SecurityGroupRule> rules) {
98+
this.rules = (List<NovaSecurityGroupRule>) (List<?>) rules;
99+
}
131100

132101
}

‎openstack-api/src/main/java/org/openstack/model/compute/nova/securitygroup/NovaSecurityGroupList.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.io.Serializable;
44
import java.util.ArrayList;
5-
import java.util.Iterator;
65
import java.util.List;
76

87
import javax.xml.bind.annotation.XmlAccessType;
@@ -21,7 +20,7 @@
2120
@XmlRootElement(name = "security_groups")
2221
@XmlAccessorType(XmlAccessType.NONE)
2322
@JsonRootElement()
24-
public class NovaSecurityGroupList implements Serializable, Iterable<NovaSecurityGroup>, SecurityGroupList {
23+
public class NovaSecurityGroupList implements Serializable, SecurityGroupList {
2524

2625
@XmlElementWrapper(name = "security_groups")
2726
@XmlElement(name = "security_group")
@@ -39,11 +38,6 @@ public List<SecurityGroup> getList() {
3938
return (List<SecurityGroup>) (List<?>) list;
4039
}
4140

42-
@Override
43-
public Iterator<NovaSecurityGroup> iterator() {
44-
return list.iterator();
45-
}
46-
4741
@Override
4842
public String toString() {
4943
return "NovaSecurityGroupList [list=" + list + "]";

0 commit comments

Comments
 (0)