mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-11-07 11:42:03 +01:00
Code Issues Projects Releases Wiki Activity

Fixed sona refactoring related issues

Browse Source 
Change-Id: Ied0ce985921be2fda503fefc6af3388c5289c2d6
This commit is contained in:
Hyunsun Moon 2016-02-23 04:21:42 -08:00 committed by Gerrit Code Review
parent e2b37e3c6f
commit b0f09be1a4
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cordvtn/app.xml
View File

@ -18,7 +18,7 @@
category="default" url="http://onosproject.org" category="default" url="http://onosproject.org"
featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features" featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
features="${project.artifactId}" features="${project.artifactId}"
apps="org.onosproject.ovsdb-base,org.onosproject.openstackswitching,org.onosproject.dhcp"> apps="org.onosproject.ovsdb-base,org.onosproject.openstacknetworking,org.onosproject.dhcp">
<description>${project.description}</description> <description>${project.description}</description>
<artifact>mvn:${project.groupId}/onos-app-cordvtn/${project.version}</artifact> <artifact>mvn:${project.groupId}/onos-app-cordvtn/${project.version}</artifact>
</app> </app>

19
apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkingManager.java
View File

@ -304,9 +304,26 @@ public class OpenstackNetworkingManager implements OpenstackNetworkingService {
@Override @Override
public OpenstackNetwork network(String networkId) { public OpenstackNetwork network(String networkId) {
return getNetworks().stream() Collection<OpenstackSubnet> subnets = getSubnets().stream()
.filter(s -> s.networkId().equals(networkId))
.collect(Collectors.toList());
OpenstackNetwork openstackNetwork = getNetworks().stream()
.filter(n -> n.id().equals(networkId)) .filter(n -> n.id().equals(networkId))
.findAny().orElse(null); .findAny().orElse(null);
if (openstackNetwork == null) {
return null;
}
return OpenstackNetwork.builder()
.id(openstackNetwork.id())
.name(openstackNetwork.name())
.networkType(openstackNetwork.networkType())
.segmentId(openstackNetwork.segmentId())
.tenantId(openstackNetwork.tenantId())
.subnets(subnets)
.build();
} }
@Override @Override