commit 0bc12091cc135360d533425360aebf74fd324bc8
author Aihua Guo <agva123@gmail.com> Fri Feb 10 09:53:55 2017 -0500
committer Thomas Vachuska <tom@onlab.us> Thu Jul 06 23:23:35 2017 +0000
tree a7252fbbbb40b0f3f2357d3a8b0d8e1554fbbacd
parent 090d77d7c13733991f2fa13a9bc041bbdab71eef

Add "Optimization type" support on Network

Change-Id: I3ade07cd774fcf73104a799f40743730ddd56b57

apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/DefaultBuilder.java

diff --git a/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/DefaultBuilder.java b/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/DefaultBuilder.java
index 9ed72ba..c92bbc7 100644
--- a/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/DefaultBuilder.java
+++ b/apps/tetopology/app/src/test/java/org/onosproject/tetopology/management/DefaultBuilder.java
@@ -25,6 +25,7 @@
 import org.onosproject.tetopology.management.api.EncodingType;
 import org.onosproject.tetopology.management.api.KeyId;
 import org.onosproject.tetopology.management.api.Network;
+import org.onosproject.tetopology.management.api.OptimizationType;
 import org.onosproject.tetopology.management.api.SwitchingType;
 import org.onosproject.tetopology.management.api.TeConstants;
 import org.onosproject.tetopology.management.api.TeStatus;
@@ -253,15 +254,18 @@
     }
 
     private static Network networkBuilder(TeTopologyId teTopologyId, KeyId supportingNetworkId,
-                                         Map<KeyId, NetworkNode> nodes, Map<KeyId, NetworkLink> links,
-                                         boolean serverProvided, DeviceId ownerId) {
+                                          Map<KeyId, NetworkNode> nodes,
+                                          Map<KeyId, NetworkLink> links,
+                                          boolean serverProvided,
+                                          DeviceId ownerId,
+                                          OptimizationType optType) {
         KeyId networkId = TeMgrUtil.toNetworkId(teTopologyId);
         List<KeyId> supportingNetworkIds = null;
         if (supportingNetworkId != null) {
             supportingNetworkIds = Lists.newArrayList(supportingNetworkId);
         }
         return new DefaultNetwork(networkId, supportingNetworkIds, nodes, links, teTopologyId,
-                              serverProvided, ownerId);
+                                  serverProvided, ownerId, optType);
     }
 
     /**
@@ -318,10 +322,10 @@
                                   ODU4);
         links.put(networkLink.linkId(), networkLink);
         DeviceId ownerId = DeviceId.deviceId(DOMAIN_ID);
-        TeTopologyId topologyId = new TeTopologyId(PROVIDER_ID, CLIENT_ID, Long
-                .toString(ABSTRACT_TOPOLOGY_ID));
+        TeTopologyId topologyId = new TeTopologyId(PROVIDER_ID, CLIENT_ID,
+                                                   Long.toString(ABSTRACT_TOPOLOGY_ID));
         network = networkBuilder(topologyId, null, nodes, links, false,
-                                 ownerId);
+                                 ownerId, OptimizationType.NOT_OPTIMIZED);
         return network;
     }