commit de82adae283e7c6182ca98d756c0de1795c85829
author David Glantz <david.glantz@windstream.com> Thu Mar 19 14:43:32 2020 -0500
committer Thomas Vachuska <tom@opennetworking.org> Fri Mar 20 20:41:48 2020 +0000
tree 67c44eee5bda507ac0e9da958875df06cc0acaf1
parent 33bac62576f029c0abaf7fb2558b0c307252bdbf

Added annotations for tier and meteredUsage

Change-Id: I9a32bc1b5787361cdb7c4b6d7a23279c75188571

core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java

diff --git a/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java b/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java
index 05943e5..f3b7f27 100644
--- a/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java
+++ b/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java
@@ -44,6 +44,8 @@
     private static final double DEF_AVAILABILITY = -1.0;
     private static final double DEF_FLAPPING = -1.0;
     private static final double DEF_METRIC = -1;
+    private static final long DEF_TIER = -1;
+    private static final double DEF_METERED_USAGE = -1;
     private static final Duration DEF_DURATION = Duration.ofNanos(-1L);
     private static final Logger log = getLogger(BasicLinkOperator.class);
 
@@ -116,6 +118,12 @@
         if (cfg.isMetered() != null) {
             b.set(AnnotationKeys.METERED, String.valueOf(cfg.isMetered()));
         }
+        if (cfg.tier() != DEF_TIER) {
+            b.set(AnnotationKeys.TIER, String.valueOf(cfg.tier()));
+        }
+        if (cfg.meteredUsage() != DEF_METERED_USAGE) {
+            b.set(AnnotationKeys.METERED_USAGE, String.valueOf(cfg.meteredUsage()));
+        }
         return b.build();
     }