import org.opendaylight.neutron.spi.NeutronSecurityGroup;
import org.opendaylight.neutron.spi.NeutronSecurityRule;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150325.Neutron;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.groups.attributes.SecurityGroups;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.groups.attributes.security.groups.SecurityGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.groups.attributes.security.groups.SecurityGroupBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.SecurityGroups;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroup;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroupBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.slf4j.LoggerFactory;
-public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<SecurityGroup,NeutronSecurityGroup> implements INeutronSecurityGroupCRUD {
+public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<SecurityGroup, SecurityGroups, NeutronSecurityGroup> implements INeutronSecurityGroupCRUD {
private static final Logger LOGGER = LoggerFactory.getLogger(NeutronSecurityGroupInterface.class);
@Override
public boolean neutronSecurityGroupExists(String uuid) {
- SecurityGroup group = readMd(createInstanceIdentifier(toMd(uuid)));
- if (group == null) {
- return false;
- }
- return true;
+ return exists(uuid);
}
@Override
public NeutronSecurityGroup getNeutronSecurityGroup(String uuid) {
- SecurityGroup group = readMd(createInstanceIdentifier(toMd(uuid)));
- if (group == null) {
- return null;
- }
- return fromMd(group);
+ return get(uuid);
+ }
+
+ @Override
+ protected List<SecurityGroup> getDataObjectList(SecurityGroups groups) {
+ return groups.getSecurityGroup();
}
@Override
public List<NeutronSecurityGroup> getAllNeutronSecurityGroups() {
- Set<NeutronSecurityGroup> allSecurityGroups = new HashSet<NeutronSecurityGroup>();
- SecurityGroups groups = readMd(createInstanceIdentifier());
- if (groups != null) {
- for (SecurityGroup group: groups.getSecurityGroup()) {
- allSecurityGroups.add(fromMd(group));
- }
- }
- LOGGER.debug("Exiting getSecurityGroups, Found {} OpenStackSecurityGroup", allSecurityGroups.size());
- List<NeutronSecurityGroup> ans = new ArrayList<NeutronSecurityGroup>();
- ans.addAll(allSecurityGroups);
- return ans;
+ return getAll();
}
-
+
@Override
public boolean addNeutronSecurityGroup(NeutronSecurityGroup input) {
- if (neutronSecurityGroupExists(input.getID())) {
- return false;
- }
- addMd(input);
- return true;
+ return add(input);
}
@Override
public boolean removeNeutronSecurityGroup(String uuid) {
- if (!neutronSecurityGroupExists(uuid)) {
- return false;
- }
- removeMd(toMd(uuid));
- return true;
+ return remove(uuid);
}
@Override
public boolean updateNeutronSecurityGroup(String uuid, NeutronSecurityGroup delta) {
- if (!neutronSecurityGroupExists(uuid)) {
- return false;
- }
- updateMd(delta);
- return true;
+ return update(uuid, delta);
}
@Override
public boolean neutronSecurityGroupInUse(String securityGroupUUID) {
- return !neutronSecurityGroupExists(securityGroupUUID);
+ return !exists(securityGroupUUID);
}
protected NeutronSecurityGroup fromMd(SecurityGroup group) {
answer.setSecurityGroupDescription(group.getDescription());
}
if (group.getTenantId() != null) {
- answer.setSecurityGroupTenantID(group.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(group.getTenantId());
}
if (group.getSecurityRules() != null) {
NeutronCRUDInterfaces interfaces = new NeutronCRUDInterfaces()
if (securityGroup.getSecurityGroupDescription() != null) {
securityGroupBuilder.setDescription(securityGroup.getSecurityGroupDescription());
}
- if (securityGroup.getSecurityGroupTenantID() != null) {
- securityGroupBuilder.setTenantId(toUuid(securityGroup.getSecurityGroupTenantID()));
+ if (securityGroup.getTenantID() != null) {
+ securityGroupBuilder.setTenantId(toUuid(securityGroup.getTenantID()));
}
if (securityGroup.getSecurityRules() != null) {
List<Uuid> neutronSecurityRule = new ArrayList<Uuid>();
securityGroup.getKey());
}
+ @Override
protected InstanceIdentifier<SecurityGroups> createInstanceIdentifier() {
return InstanceIdentifier.create(Neutron.class)
.child(SecurityGroups.class);