diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java
index bf2b274..4ba0bfe 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/HostToHostIntentCompiler.java
@@ -102,7 +102,7 @@
         for (Link link : path.links()) {
             reverseLinks.add(0, reverseLink(link));
         }
-        return new DefaultPath(path.providerId(), reverseLinks, path.cost());
+        return new DefaultPath(path.providerId(), reverseLinks, path.weight());
     }
 
     // Produces a reverse variant of the specified link.
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java
index 0c47196..32784a3 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PointToPointIntentCompiler.java
@@ -21,6 +21,7 @@
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.onlab.graph.ScalarWeight;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DefaultPath;
 import org.onosproject.net.DeviceId;
@@ -150,7 +151,7 @@
                                              ConnectPoint egressPoint,
                                              PointToPointIntent intent) {
         List<Link> links = asList(createEdgeLink(ingressPoint, true), createEdgeLink(egressPoint, false));
-        return asList(createPathIntent(new DefaultPath(PID, links, DEFAULT_COST),
+        return asList(createPathIntent(new DefaultPath(PID, links, ScalarWeight.toWeight(DEFAULT_COST)),
                                        intent, PathIntent.ProtectionType.PRIMARY));
     }
 
@@ -179,7 +180,7 @@
         links.addAll(path.links());
         links.add(createEdgeLink(egressPoint, false));
 
-        return asList(createPathIntent(new DefaultPath(PID, links, path.cost(),
+        return asList(createPathIntent(new DefaultPath(PID, links, path.weight(),
                                                        path.annotations()), intent,
                                        PathIntent.ProtectionType.PRIMARY));
     }
@@ -253,23 +254,24 @@
             PortNumber primaryPort = getPrimaryPort(intent);
             if (primaryPort != null && !links.get(0).src().port().equals(primaryPort)) {
                 reusableIntents.add(createPathIntent(new DefaultPath(PID, links,
-                                                                     path.cost(), path.annotations()),
+                                                     path.weight(), path.annotations()),
                                                      intent, PathIntent.ProtectionType.BACKUP));
                 updateFailoverGroup(intent, links);
                 return reusableIntents;
 
             } else {
-                reusableIntents.add(createPathIntent(new DefaultPath(PID, backupLinks, path.backup().cost(),
-                                     path.backup().annotations()), intent, PathIntent.ProtectionType.BACKUP));
+                reusableIntents.add(createPathIntent(new DefaultPath(PID, backupLinks,
+                        path.backup().weight(),
+                        path.backup().annotations()), intent, PathIntent.ProtectionType.BACKUP));
                 updateFailoverGroup(intent, backupLinks);
                 return reusableIntents;
             }
         }
 
-        intentList.add(createPathIntent(new DefaultPath(PID, links, path.cost(),
+        intentList.add(createPathIntent(new DefaultPath(PID, links, path.weight(),
                                                         path.annotations()),
                                         intent, PathIntent.ProtectionType.PRIMARY));
-        intentList.add(createPathIntent(new DefaultPath(PID, backupLinks, path.backup().cost(),
+        intentList.add(createPathIntent(new DefaultPath(PID, backupLinks, path.backup().weight(),
                                                         path.backup().annotations()),
                                         intent, PathIntent.ProtectionType.BACKUP));
 
@@ -335,7 +337,7 @@
             links.add(createEdgeLink(ingressPoint, true));
             links.addAll(onlyPath.links());
             links.add(createEdgeLink(egressPoint, false));
-            return asList(createPathIntent(new DefaultPath(PID, links, onlyPath.cost(),
+            return asList(createPathIntent(new DefaultPath(PID, links, onlyPath.weight(),
                                                            onlyPath.annotations()),
                                            intent, PathIntent.ProtectionType.PRIMARY));
         }
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ProtectedTransportIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ProtectedTransportIntentCompiler.java
index f7eceef..9020e5a 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ProtectedTransportIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/ProtectedTransportIntentCompiler.java
@@ -299,7 +299,7 @@
         List<Link> revLinks = Lists.reverse(transform(path.links(), this::reverse));
         return new DefaultPath(path.providerId(),
                                revLinks,
-                               path.cost(),
+                               path.weight(),
                                path.annotations());
     }
 
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java
index 6d015ae..e37ae41 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/PathIntentCompilerTest.java
@@ -18,6 +18,7 @@
 import com.google.common.collect.ImmutableList;
 import org.junit.Before;
 import org.junit.Test;
+import org.onlab.graph.ScalarWeight;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.MplsLabel;
 import org.onlab.packet.VlanId;
@@ -172,7 +173,7 @@
                 .selector(selector)
                 .treatment(treatment)
                 .priority(PRIORITY)
-                .path(new DefaultPath(pid, links, hops))
+                .path(new DefaultPath(pid, links, ScalarWeight.toWeight(hops)))
                 .build();
 
         //Intent with VLAN encap without egress VLAN
@@ -182,7 +183,7 @@
                 .treatment(treatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, links, hops))
+                .path(new DefaultPath(pid, links, ScalarWeight.toWeight(hops)))
                 .build();
 
         //Intent with VLAN encap with ingress and egress VLAN
@@ -192,7 +193,7 @@
                 .treatment(vlanTreatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, links, hops))
+                .path(new DefaultPath(pid, links, ScalarWeight.toWeight(hops)))
                 .build();
 
         constraintMplsIntent = PathIntent.builder()
@@ -201,7 +202,7 @@
                 .treatment(treatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.MPLS)))
-                .path(new DefaultPath(pid, links, hops))
+                .path(new DefaultPath(pid, links, ScalarWeight.toWeight(hops)))
                 .build();
 
         edgeIntentNoVlan = PathIntent.builder()
@@ -210,7 +211,7 @@
                 .treatment(treatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, edgeNet, edgeHops))
+                .path(new DefaultPath(pid, edgeNet, ScalarWeight.toWeight(edgeHops)))
                 .build();
 
         edgeIntentIngressVlan = PathIntent.builder()
@@ -219,7 +220,7 @@
                 .treatment(treatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, edgeNet, edgeHops))
+                .path(new DefaultPath(pid, edgeNet, ScalarWeight.toWeight(edgeHops)))
                 .build();
 
         edgeIntentEgressVlan = PathIntent.builder()
@@ -228,7 +229,7 @@
                 .treatment(vlanTreatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, edgeNet, edgeHops))
+                .path(new DefaultPath(pid, edgeNet, ScalarWeight.toWeight(edgeHops)))
                 .build();
 
         edgeIntentVlan = PathIntent.builder()
@@ -237,7 +238,7 @@
                 .treatment(vlanTreatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, edgeNet, edgeHops))
+                .path(new DefaultPath(pid, edgeNet, ScalarWeight.toWeight(edgeHops)))
                 .build();
 
         singleHopIndirectIntentNoVlan = PathIntent.builder()
@@ -246,7 +247,7 @@
                 .treatment(treatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, singleHopIndirect, singleHopIndirectHops))
+                .path(new DefaultPath(pid, singleHopIndirect, ScalarWeight.toWeight(singleHopIndirectHops)))
                 .build();
 
         singleHopIndirectIntentIngressVlan = PathIntent.builder()
@@ -255,7 +256,7 @@
                 .treatment(treatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, singleHopIndirect, singleHopIndirectHops))
+                .path(new DefaultPath(pid, singleHopIndirect, ScalarWeight.toWeight(singleHopIndirectHops)))
                 .build();
 
         singleHopIndirectIntentEgressVlan = PathIntent.builder()
@@ -264,7 +265,7 @@
                 .treatment(vlanTreatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, singleHopIndirect, singleHopIndirectHops))
+                .path(new DefaultPath(pid, singleHopIndirect, ScalarWeight.toWeight(singleHopIndirectHops)))
                 .build();
 
         singleHopIndirectIntentVlan = PathIntent.builder()
@@ -273,7 +274,7 @@
                 .treatment(vlanTreatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, singleHopIndirect, singleHopIndirectHops))
+                .path(new DefaultPath(pid, singleHopIndirect, ScalarWeight.toWeight(singleHopIndirectHops)))
                 .build();
 
         singleHopDirectIntentNoVlan = PathIntent.builder()
@@ -282,7 +283,7 @@
                 .treatment(treatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, singleHopDirect, singleHopDirectHops))
+                .path(new DefaultPath(pid, singleHopDirect, ScalarWeight.toWeight(singleHopDirectHops)))
                 .build();
 
         singleHopDirectIntentIngressVlan = PathIntent.builder()
@@ -291,7 +292,7 @@
                 .treatment(treatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, singleHopDirect, singleHopDirectHops))
+                .path(new DefaultPath(pid, singleHopDirect, ScalarWeight.toWeight(singleHopDirectHops)))
                 .build();
 
         singleHopDirectIntentEgressVlan = PathIntent.builder()
@@ -300,7 +301,7 @@
                 .treatment(vlanTreatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, singleHopDirect, singleHopDirectHops))
+                .path(new DefaultPath(pid, singleHopDirect, ScalarWeight.toWeight(singleHopDirectHops)))
                 .build();
 
         singleHopDirectIntentVlan = PathIntent.builder()
@@ -309,7 +310,7 @@
                 .treatment(vlanTreatment)
                 .priority(PRIORITY)
                 .constraints(ImmutableList.of(new EncapsulationConstraint(EncapsulationType.VLAN)))
-                .path(new DefaultPath(pid, singleHopDirect, singleHopDirectHops))
+                .path(new DefaultPath(pid, singleHopDirect, ScalarWeight.toWeight(singleHopDirectHops)))
                 .build();
 
         intentExtensionService = createMock(IntentExtensionService.class);
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/phase/CompilingTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/phase/CompilingTest.java
index 982a4f9..c504501 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/phase/CompilingTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/phase/CompilingTest.java
@@ -17,6 +17,7 @@
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onlab.graph.ScalarWeight;
 import org.onosproject.TestApplicationId;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.IdGenerator;
@@ -67,7 +68,7 @@
 
     private final List<Link> links = Collections.singletonList(
             DefaultLink.builder().providerId(pid).src(cp2).dst(cp4).type(DIRECT).build());
-    private final Path path = new DefaultPath(pid, links, 10);
+    private final Path path = new DefaultPath(pid, links, ScalarWeight.toWeight(10));
 
     private PointToPointIntent input;
     private PathIntent compiled;
