change remove MANDATORY_ON_CREATE for SAI_ROUTE_ATTR_NEXT_HOP_ID (son…

…ic-net#81)
dmytroxshevchuk · Oct 7, 2016 · 6dfda77 · 6dfda77
1 parent 47a6c84
commit 6dfda77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/meta/sai_meta_route.cpp b/meta/sai_meta_route.cpp
@@ -36,10 +36,10 @@ const sai_attr_metadata_t sai_route_attr_metadata[] = {
         .objecttype             = SAI_OBJECT_TYPE_ROUTE,
         .attrid                 = SAI_ROUTE_ATTR_NEXT_HOP_ID,
         .serializationtype      = SAI_SERIALIZATION_TYPE_OBJECT_ID,
-        .flags                  = SAI_ATTR_FLAGS_MANDATORY_ON_CREATE | SAI_ATTR_FLAGS_CREATE_AND_SET,
+        .flags                  = SAI_ATTR_FLAGS_CREATE_AND_SET,
         .allowedobjecttypes     = { SAI_OBJECT_TYPE_NEXT_HOP, SAI_OBJECT_TYPE_NEXT_HOP_GROUP, SAI_OBJECT_TYPE_ROUTER_INTERFACE, SAI_OBJECT_TYPE_PORT },
-        .allownullobjectid      = false,
-        .defaultvaluetype       = SAI_DEFAULT_VALUE_TYPE_NONE,
+        .allownullobjectid      = true,
+        .defaultvaluetype       = SAI_DEFAULT_VALUE_TYPE_CONST,
         .defaultvalue           = { },
         .enumtypestr            = NULL,
         .enumallowedvalues      = { },

diff --git a/meta/tests.cpp b/meta/tests.cpp
@@ -2000,10 +2000,11 @@ void test_route_entry_create()
 
     SWSS_LOG_NOTICE("create tests");
 
-    SWSS_LOG_NOTICE("zero attribute count (but there are mandatory attributes)");
-    attr.id = SAI_ROUTE_ATTR_NEXT_HOP_ID;
-    status = meta_sai_create_route_entry(&route_entry, 0, &attr, &dummy_success_sai_create_route_entry);
-    META_ASSERT_FAIL(status);
+    // commneted out as there is no mandatory attribute
+    // SWSS_LOG_NOTICE("zero attribute count (but there are mandatory attributes)");
+    // attr.id = SAI_ROUTE_ATTR_NEXT_HOP_ID;
+    // status = meta_sai_create_route_entry(&route_entry, 0, &attr, &dummy_success_sai_create_route_entry);
+    // META_ASSERT_FAIL(status);
 
     SWSS_LOG_NOTICE("attr is null");
     status = meta_sai_create_route_entry(&route_entry, 1, NULL, &dummy_success_sai_create_route_entry);