1 files changed, 16 insertions, 9 deletions

diff --git a/v3po/api/src/main/yang/v3po.yang b/v3po/api/src/main/yang/v3po.yang
index f503afe2b..fff8293d5 100644
--- a/v3po/api/src/main/yang/v3po.yang
+++ b/v3po/api/src/main/yang/v3po.yang
@@ -271,6 +271,17 @@ module v3po {
     }
   }
 
+  grouping routing-base-attributes {
+    leaf ipv4-vrf-id {
+      type uint32;
+    }
+    leaf ipv6-vrf-id {
+      type uint32;
+    }
+    description
+      "Defines VRF tables used for ipv4 and ipv6 traffic";
+  }
+
   grouping ethernet-state-attributes {
     leaf manufacturer-description {
       type string;
@@ -472,15 +483,7 @@ module v3po {
     }
 
     container routing {
-      // TODO (HONEYCOMB-127): add routing info for oper
-      leaf ipv4-vrf-id {
-        type uint32;
-      }
-      leaf ipv6-vrf-id {
-        type uint32;
-      }
-      description
-        "Defines VRF tables used for ipv4 and ipv6 traffic";
+      uses routing-base-attributes;
     }
 
     container vhost-user {
@@ -578,6 +581,10 @@ module v3po {
       uses ethernet-state-attributes;
     }
 
+    container routing {
+      uses routing-base-attributes;
+    }
+
     container vhost-user {
       when "../if:type = 'v3po:vhost-user'";
       uses vhost-user-interface-base-attributes;