weibit

fixed a bug in the optical path provisoner

Change-Id: Ib5960d07d044b0b2645cf98c47b3ec1c040f6251
...@@ -160,7 +160,7 @@ public class OpticalPathProvisioner { ...@@ -160,7 +160,7 @@ public class OpticalPathProvisioner {
160 ConnectPoint dstWdmPoint = null; 160 ConnectPoint dstWdmPoint = null;
161 Iterator<Path> itrPath = paths.iterator(); 161 Iterator<Path> itrPath = paths.iterator();
162 Path firstPath = itrPath.next(); 162 Path firstPath = itrPath.next();
163 - log.info(firstPath.toString()); 163 + log.info(firstPath.links().toString());
164 164
165 ArrayList<Map<ConnectPoint, ConnectPoint>> connectionList = new ArrayList<>(); 165 ArrayList<Map<ConnectPoint, ConnectPoint>> connectionList = new ArrayList<>();
166 166
...@@ -181,14 +181,17 @@ public class OpticalPathProvisioner { ...@@ -181,14 +181,17 @@ public class OpticalPathProvisioner {
181 } else { 181 } else {
182 break; 182 break;
183 } 183 }
184 +
185 + /*
184 if (itrLink.hasNext()) { 186 if (itrLink.hasNext()) {
185 Link link3 = itrLink.next(); 187 Link link3 = itrLink.next();
186 - if (!isOpticalLink(link3)) { 188 + if (isOpticalLink(link3)) {
187 break; 189 break;
188 } 190 }
189 } else { 191 } else {
190 break; 192 break;
191 - } 193 + }*/
194 +
192 } 195 }
193 196
194 Map<ConnectPoint, ConnectPoint> pair = 197 Map<ConnectPoint, ConnectPoint> pair =
...@@ -210,7 +213,8 @@ public class OpticalPathProvisioner { ...@@ -210,7 +213,8 @@ public class OpticalPathProvisioner {
210 213
211 intentService.submit(opticalIntent); 214 intentService.submit(opticalIntent);
212 215
213 - log.info(opticalIntent.toString()); 216 + log.info(srcWdmPoint.toString());
217 + log.info(dstWdmPoint.toString());
214 } 218 }
215 } 219 }
216 220
......