[HICN-379] Add face priority support in face manager

Change-Id: If4f75d44fc66414a4a70135de7827f5082b97112
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>

3 files changed, 97 insertions, 4 deletions

diff --git a/ctrl/facemgr/includes/hicn/facemgr/facelet.h b/ctrl/facemgr/includes/hicn/facemgr/facelet.h
index db76ccdb9..a0318b206 100644
--- a/ctrl/facemgr/includes/hicn/facemgr/facelet.h
+++ b/ctrl/facemgr/includes/hicn/facemgr/facelet.h
@@ -161,6 +161,7 @@ extern const char * facelet_attr_status_str_short[];
 
 /* Facelet attribute */
 
+#ifdef WITH_POLICY
 #define foreach_facelet_attr                    \
     _(netdevice_type_t, netdevice_type)         \
     _(netdevice_t, netdevice)                   \
@@ -171,7 +172,21 @@ extern const char * facelet_attr_status_str_short[];
     _(u16, remote_port)                         \
     _(face_state_t, admin_state)                \
     _(face_state_t, state)                      \
+    _(u32, priority)                            \
     _(facemgr_face_type_t, face_type)
+#else
+#define foreach_facelet_attr                    \
+    _(netdevice_type_t, netdevice_type)         \
+    _(netdevice_t, netdevice)                   \
+    _(int, family)                              \
+    _(ip_address_t, local_addr)                 \
+    _(u16, local_port)                          \
+    _(ip_address_t, remote_addr)                \
+    _(u16, remote_port)                         \
+    _(face_state_t, admin_state)                \
+    _(face_state_t, state)                      \
+    _(facemgr_face_type_t, face_type)
+#endif /* WITH_POLICY */
 
 #define foreach_facelet_event   \
     _(UNDEFINED)                \
diff --git a/ctrl/facemgr/src/facelet.c b/ctrl/facemgr/src/facelet.c
index 761f920c4..929005f57 100644
--- a/ctrl/facemgr/src/facelet.c
+++ b/ctrl/facemgr/src/facelet.c
@@ -124,6 +124,9 @@ facelet_create()
     facelet->remote_port_status = FACELET_ATTR_STATUS_UNSET;
     facelet->admin_state_status = FACELET_ATTR_STATUS_UNSET;
     facelet->state_status = FACELET_ATTR_STATUS_UNSET;
+#ifdef WITH_POLICY
+    facelet->priority_status = FACELET_ATTR_STATUS_UNSET;
+#endif /* WITH_POLICY */
     facelet->face_type_status = FACELET_ATTR_STATUS_UNSET;
 
     facelet->status = FACELET_STATUS_UNDEFINED;
@@ -312,6 +315,16 @@ facelet_create_from_face(face_t * face)
         facelet->state_status = FACELET_ATTR_STATUS_UNSET;
     }
 
+#ifdef WITH_POLICY
+    /* Attribute : priority */
+    if (face->priority > 0) {
+        facelet->priority = face->priority;
+        facelet->priority_status = FACELET_ATTR_STATUS_CLEAN;
+    } else {
+        facelet->priority_status = FACELET_ATTR_STATUS_UNSET;
+    }
+#endif /* WITH_POLICY */
+
     /* Attribute : face_type */
     if ((face->type != FACE_TYPE_UNDEFINED) && (face->type != FACE_TYPE_N)) {
         switch(face->type) {
@@ -809,6 +822,15 @@ facelet_get_face(const facelet_t * facelet, face_t ** pface)
         face->state = FACE_STATE_UP;
     }
 
+#ifdef WITH_POLICY
+    /* Priority */
+    if (facelet_has_priority(facelet)) {
+        if (facelet_get_priority(facelet, &face->priority) < 0)
+            goto ERR;
+    } else {
+        face->priority = 0;
+    }
+
     /* Tags */
 
     /* - based on netdevice type */
@@ -839,6 +861,7 @@ facelet_get_face(const facelet_t * facelet, face_t ** pface)
         }
     }
     face->tags = tags;
+#endif /* WITH_POLICY */
 
     *pface = face;
 
@@ -1105,6 +1128,18 @@ facelet_snprintf(char * s, size_t size, const facelet_t * facelet)
             return cur - s;
     }
 
+#ifdef WITH_POLICY
+    /* Priority */
+    if (facelet_has_priority(facelet)) {
+        rc = snprintf(cur, s + size - cur, " priority=%d", facelet->priority);
+        if (rc < 0)
+            return rc;
+        cur += rc;
+        if (cur >= s + size)
+            return cur - s;
+    }
+#endif /* WITH_POLICY */
+
     /* Face type */
     if (facelet_has_face_type(facelet)) {
         rc = snprintf(cur, s + size - cur, " face_type=LAYER%s/%s",
@@ -1327,6 +1362,19 @@ int facelet_snprintf_json(char * s, size_t size, const facelet_t * facelet, int
             return cur - s;
     }
 
+#ifdef WITH_POLICY
+    /* Priority */
+    if (facelet_has_priority(facelet)) {
+        rc = snprintf(cur, s + size - cur, "%*s%s: %d,\n", 4 * (indent+1), "",
+                "\"priority\"", facelet->priority);
+        if (rc < 0)
+            return rc;
+        cur += rc;
+        if (cur >= s + size)
+            return cur - s;
+    }
+#endif /* WITH_POLICY */
+
     if (facelet_has_face_type(facelet)) {
         rc = snprintf(cur, s + size - cur, "%*s%s: \"LAYER%s/%s\",\n", 4 * (indent+1), "",
                 "\"face_type\"",
diff --git a/ctrl/facemgr/src/interfaces/hicn_light/hicn_light.c b/ctrl/facemgr/src/interfaces/hicn_light/hicn_light.c
index 53aa95a75..a6cd44fe0 100644
--- a/ctrl/facemgr/src/interfaces/hicn_light/hicn_light.c
+++ b/ctrl/facemgr/src/interfaces/hicn_light/hicn_light.c
@@ -294,9 +294,12 @@ int hl_on_event(interface_t * interface, const facelet_t * facelet)
     int rc;
     int ret = 0;
     hl_data_t * data = (hl_data_t *)interface->data;
-
     face_t * face = NULL;
 
+    hc_face.id = 0;
+    memset(hc_face.name, 0, sizeof(hc_face.name));
+
+
     /* NOTE
      *  - One example where this fails (and it is normal) is when we delete a
      *  face that was not completely created, because for instance bonjour did
@@ -324,8 +327,6 @@ int hl_on_event(interface_t * interface, const facelet_t * facelet)
             facelet_snprintf(buf, MAXSZ_FACELET, facelet);
             DEBUG("Create facelet %s", buf);
             }
-            hc_face.id = 0;
-            memset(hc_face.name, 0, sizeof(hc_face.name));
             hc_face.face = *face;
             rc = hc_face_create(data->s, &hc_face);
             if (rc < 0) {
@@ -415,7 +416,7 @@ int hl_on_event(interface_t * interface, const facelet_t * facelet)
             break;
 
         case FACELET_EVENT_UPDATE:
-            /* Currently, only admin_state is supported */
+            /* Currently, only admin_state & priority are supported */
             if (facelet_get_admin_state_status(facelet) == FACELET_ATTR_STATUS_DIRTY) {
                 hc_face.face = *face;
                 hc_face_t * face_found;
@@ -449,6 +450,35 @@ int hl_on_event(interface_t * interface, const facelet_t * facelet)
                 }
                 INFO("Admin state updated");
             }
+            if (facelet_get_admin_state_status(facelet) == FACELET_ATTR_STATUS_DIRTY) {
+                hc_face.face = *face;
+                hc_face_t * face_found;
+
+                rc = hc_face_get(data->s, &hc_face, &face_found);
+                if (rc < 0) {
+                    ERROR("Failed to find face\n");
+                    goto ERR;
+                }
+                if (!face_found) {
+                    ERROR("Face to update has not been found");
+                    goto ERR;
+                }
+                char conn_id_or_name[SYMBOLIC_NAME_LEN];
+                snprintf(conn_id_or_name, SYMBOLIC_NAME_LEN, "%d", face_found->id);
+                free(face_found);
+
+                uint32_t priority;
+                if (facelet_get_priority(facelet, &priority) < 0) {
+                    ERROR("Failed to retrieve facelet priority");
+                    goto ERR;
+                }
+
+                if (hc_connection_set_priority(data->s, conn_id_or_name, priority) < 0) {
+                    ERROR("Failed to update priority");
+                    goto ERR;
+                }
+                INFO("Priority updated");
+            }
             break;
 
         default: