홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
alshabib
48dd9a1b 1 parent 0603afb0

cord fixes 

Change-Id: I63ea3b451a70c978172821ff7c81c22e2dfc1e21
Inline Side-by-side
Showing 2 changed files with 7 additions and 6 deletions
...@@ -120,11 +120,11 @@ public class CordFabricManager implements FabricService { ...@@ -120,11 +120,11 @@ public class CordFabricManager implements FabricService {
120 .matchEthType(Ethernet.TYPE_IPV4) 120 .matchEthType(Ethernet.TYPE_IPV4)
121 .matchIPProtocol(IPv4.PROTOCOL_TCP) 121 .matchIPProtocol(IPv4.PROTOCOL_TCP)
122 .matchTcpSrc(ofPort) 122 .matchTcpSrc(ofPort)
123 - .matchInPort(PortNumber.portNumber(5)) 123 + .matchInPort(PortNumber.portNumber(1))
124 .build(); 124 .build();
125 125
126 TrafficTreatment up = DefaultTrafficTreatment.builder() 126 TrafficTreatment up = DefaultTrafficTreatment.builder()
127 - .setOutput(PortNumber.portNumber(5)) 127 + .setOutput(PortNumber.portNumber(1))
128 .build(); 128 .build();
129 129
130 TrafficTreatment down = DefaultTrafficTreatment.builder() 130 TrafficTreatment down = DefaultTrafficTreatment.builder()
......
...@@ -339,9 +339,10 @@ public class OnosXOSIntegrationManager implements VoltTenantService { ...@@ -339,9 +339,10 @@ public class OnosXOSIntegrationManager implements VoltTenantService {
339 339
340 if (json.get("computeNodeName") != null) { 340 if (json.get("computeNodeName") != null) {
341 ConnectPoint point = nodeToPort.get(json.get("computeNodeName").asString()); 341 ConnectPoint point = nodeToPort.get(json.get("computeNodeName").asString());
342 + ConnectPoint fromPoint = newTenant.port();
342 343
343 provisionFabric(VlanId.vlanId(Short.parseShort(newTenant.vlanId())), 344 provisionFabric(VlanId.vlanId(Short.parseShort(newTenant.vlanId())),
344 - point); 345 + point, fromPoint);
345 } 346 }
346 347
347 } 348 }
...@@ -402,7 +403,7 @@ public class OnosXOSIntegrationManager implements VoltTenantService { ...@@ -402,7 +403,7 @@ public class OnosXOSIntegrationManager implements VoltTenantService {
402 flowObjectiveService.forward(FABRIC_PORT.deviceId(), forwardToGateway); 403 flowObjectiveService.forward(FABRIC_PORT.deviceId(), forwardToGateway);
403 } 404 }
404 405
405 - private void provisionFabric(VlanId vlanId, ConnectPoint point) { 406 + private void provisionFabric(VlanId vlanId, ConnectPoint point, ConnectPoint fromPoint) {
406 //String json = "{\"vlan\":" + vlanId + ",\"ports\":["; 407 //String json = "{\"vlan\":" + vlanId + ",\"ports\":[";
407 //json += "{\"device\":\"" + FABRIC_DEVICE_ID.toString() + "\",\"port\":\"" 408 //json += "{\"device\":\"" + FABRIC_DEVICE_ID.toString() + "\",\"port\":\""
408 // + FABRIC_OLT_CONNECT_POINT.toString() + "\"},"; 409 // + FABRIC_OLT_CONNECT_POINT.toString() + "\"},";
...@@ -417,8 +418,8 @@ public class OnosXOSIntegrationManager implements VoltTenantService { ...@@ -417,8 +418,8 @@ public class OnosXOSIntegrationManager implements VoltTenantService {
417 JsonObject cp2 = new JsonObject(); 418 JsonObject cp2 = new JsonObject();
418 cp1.add("device", point.deviceId().toString()); 419 cp1.add("device", point.deviceId().toString());
419 cp1.add("port", point.port().toLong()); 420 cp1.add("port", point.port().toLong());
420 - cp2.add("device", FABRIC_DEVICE_ID.toString()); 421 + cp2.add("device", fromPoint.deviceId().toString());
421 - cp2.add("port", FABRIC_OLT_CONNECT_POINT.toString()); 422 + cp2.add("port", fromPoint.port().toLong());
422 array.add(cp1); 423 array.add(cp1);
423 array.add(cp2); 424 array.add(cp2);
424 node.add("ports", array); 425 node.add("ports", array);
......