REST_API: rest api client implementation

JIRA: SAMPLEVNF-78

This patch implements rest api's for VNF clients. This
comprises of
        * vnf api's for common functionality
        * vnf api's for CGNAPT
        * vnf api's for VFW

Change-Id: I56d22c64bf3ee5b0a2e536da8169ac7583499041
Signed-off-by: Vishwesh M Rudramuni <vishwesh.m.rudramuni@intel.com>

8 files changed, 398 insertions, 56 deletions

diff --git a/VNFs/vCGNAPT/Makefile b/VNFs/vCGNAPT/Makefile
index a6feb730..41cacfb7 100644
--- a/VNFs/vCGNAPT/Makefile
+++ b/VNFs/vCGNAPT/Makefile
@@ -65,9 +65,16 @@ CFLAGS += -I$(VNF_CORE)/common/VIL/pipeline_txrx -I$(VNF_CORE)/common/VIL/alg
 CFLAGS += -I$(VNF_CORE)/common/VIL/pipeline_arpicmp
 CFLAGS += -I$(VNF_CORE)/common/VIL/gateway
 
+TOP = $(RTE_SDK)/../civetweb
+CFLAGS += -I$(TOP)/include $(COPT) -DUSE_WEBSOCKET -DUSE_IPV6 -DUSE_SSL_DH=1
+CFLAGS += -DREST_API_SUPPORT
+LDFLAGS +=  -ljson -lcrypto -lssl
+LDFLAGS += -L$(RTE_SDK)/../civetweb/ -lcivetweb
+
 # all source are stored in SRCS-y
 SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := main.c
 SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += config_parse.c
+SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rest_api.c
 SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += config_parse_tm.c
 SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += config_check.c
 SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += init.c
diff --git a/VNFs/vCGNAPT/init.c b/VNFs/vCGNAPT/init.c
index 76621d51..d61e419c 100644
--- a/VNFs/vCGNAPT/init.c
+++ b/VNFs/vCGNAPT/init.c
@@ -75,6 +75,7 @@ app_init_core_mask(struct app_params *app)
 			p->socket_id,
 			p->core_id,
 			p->hyper_th_id);
+		printf("lcore_id:%d\n", lcore_id);
 
 		if (lcore_id < 0)
 			rte_panic("Cannot create CPU core mask\n");
diff --git a/VNFs/vCGNAPT/main.c b/VNFs/vCGNAPT/main.c
index 9ebf6fc3..83fc37ff 100644
--- a/VNFs/vCGNAPT/main.c
+++ b/VNFs/vCGNAPT/main.c
@@ -15,12 +15,14 @@
 */
 
 #include "app.h"
+#include "pipeline_cgnapt.h"
 
 static struct app_params app;
 
 int
 main(int argc, char **argv)
 {
+	struct mg_context *ctx = NULL;
 	rte_openlog_stream(stderr);
 
 	/* Config */
@@ -28,6 +30,12 @@ main(int argc, char **argv)
 
 	app_config_args(&app, argc, argv);
 
+	/* initialize the rest api */
+	if (is_rest_support()) {
+		set_vnf_type("VCGNAPT");
+		ctx = rest_api_init(&app);
+	}
+
 	app_config_preproc(&app);
 
 	app_config_parse(&app, app.parser_file);
@@ -40,11 +48,21 @@ main(int argc, char **argv)
 	/* Init */
 	app_init(&app);
 
+	if (is_rest_support() && (ctx != NULL)) {
+		/* rest api's for cgnapt */
+		rest_api_cgnapt_init(ctx, &app);
+	}
+
 	/* Run-time */
 	rte_eal_mp_remote_launch(
 		app_thread,
 		(void *) &app,
 		CALL_MASTER);
 
+	if (is_rest_support() && (ctx != NULL)) {
+		mg_stop(ctx);
+		printf("Civet server stopped.\n");
+	}
+
 	return 0;
 }
diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.c b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.c
index fb0b95d1..0c6bf48d 100644
--- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.c
+++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.c
@@ -29,6 +29,12 @@
 #include <cmdline_parse_string.h>
 #include <cmdline_parse_ipaddr.h>
 #include <cmdline_parse_etheraddr.h>
+#include <cmdline_rdline.h>
+#include <cmdline_socket.h>
+#include <cmdline.h>
+
+#include <fcntl.h>
+#include <unistd.h>
 
 #include "app.h"
 #include "pipeline_common_fe.h"
@@ -40,6 +46,8 @@
 #include "cgnapt_pcp_fe.h"
 #endif
 
+#define MAX_BUF_SIZE	2048
+
 /**
  * A structure defining the CG-NAPT entry that is stored on
  * front end.
@@ -66,6 +74,12 @@ struct pipeline_cgnapt_t {
 
 };
 
+int nat_load_handler(struct mg_connection *conn, __rte_unused void *cbdata);
+int nat_handler(struct mg_connection *conn, __rte_unused void *cbdata);
+uint32_t rules_loaded = 0;
+extern struct cmdline *pipe_cl;
+struct app_params *myapp;
+
 /**
  * Init function for CG-NAPT FE.
  *
@@ -1405,7 +1419,8 @@ cmd_cgnapt_stats_parsed(
 	__rte_unused struct cmdline *cl,
 	__rte_unused void *data)
 {
-	all_cgnapt_stats();
+	char buf[2048];
+	all_cgnapt_stats(&buf[0]);
 }
 
 static cmdline_parse_token_string_t cmd_cgnapt_stats_p_string =
@@ -1457,7 +1472,8 @@ cmd_cgnapt_clear_stats_parsed(
 	__rte_unused struct cmdline *cl,
 	__rte_unused void *data)
 {
-	all_cgnapt_clear_stats();
+	char buf[2048];
+	all_cgnapt_clear_stats(&buf[0]);
 }
 
 static cmdline_parse_token_string_t cmd_cgnapt_clear_stats_p_string =
@@ -1475,6 +1491,212 @@ static cmdline_parse_token_string_t cmd_cgnapt_clear_stats_stats_string =
 TOKEN_STRING_INITIALIZER(struct cmd_cgnapt_clear_stats_result, stats_string,
 				"stats");
 
+int cgnapt_stats_handler(struct mg_connection *conn, void *cbdata)
+{
+	uint32_t num_links = 0, len = 0;
+	char buf[1024];
+        const struct mg_request_info *ri = mg_get_request_info(conn);
+        struct app_params *app = myapp;
+	int i;
+
+	if (!strcmp(ri->request_method, "GET")) {
+		all_cgnapt_stats(&buf[0]);
+        	mg_printf(conn, "%s\n", &buf[0]);
+                return 1; 
+        }
+
+	if (strcmp(ri->request_method, "POST")) {
+                mg_printf(conn,
+                    "HTTP/1.1 405 Method Not Allowed\r\nConnection: close\r\n");
+                mg_printf(conn, "Content-Type: text/plain\r\n\r\n");
+                mg_printf(conn,
+                          "%s method not allowed in the GET handler\n",
+                          ri->request_method);
+	}
+
+	all_cgnapt_clear_stats(&buf[0]);
+	mg_printf(conn, "%s\n", &buf[0]);
+	return 1;
+
+}
+
+int cgnapt_cmd_ver_handler(struct mg_connection *conn, void *cbdata)
+{
+        const struct mg_request_info *req_info = mg_get_request_info(conn);
+
+        mg_printf(conn,
+                  "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: "
+                  "close\r\n\r\n");
+        mg_printf(conn, "<html><body>");
+        mg_printf(conn, "<p>Command Passed</p>");
+        mg_printf(conn, "</body></html>\n");
+
+	return 1;
+}
+
+/*
+ * loadrules
+ */
+
+/**
+ * Open file and process all commands in the file.
+ *
+ * @param ctx
+ *  A pointer to the CLI context
+ * @param file_name
+ *  A pointer to the file to process.
+ *
+ */
+static void cgnapt_loadrules_file(cmdline_parse_ctx_t *ctx, const char *file_name)
+{
+       struct cmdline *file_cl;
+       int fd;
+
+       fd = open(file_name, O_RDONLY);
+       if (fd < 0) {
+              printf("Cannot open file \"%s\"\n", file_name);
+              return;
+       }
+
+       file_cl = cmdline_new(ctx, "", fd, 1);
+       cmdline_interact(file_cl);
+       close(fd);
+}
+
+
+int nat_handler(struct mg_connection *conn, __rte_unused void *cbdata)
+{
+
+	const struct mg_request_info *req_info = mg_get_request_info(conn);
+	if (strcmp(req_info->request_method, "GET")) {
+		mg_printf(conn, "Only GET method allowed");
+		return 1;
+	}
+
+	mg_printf(conn,
+		 "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nConnection: "
+		 "close\r\n\r\n");
+	mg_printf(conn, "<html><body>");
+	mg_printf(conn, "<h2> These are the methods that are supported </h2>");
+	mg_printf(conn, "<h3>     /load  </h3>");
+	mg_printf(conn, "<html><body>");
+
+	mg_printf(conn, "</body></html>\n");
+
+	return 1;
+}
+
+static int nat_field_found(const char *key,
+	const char *filename,
+	char *path,
+	size_t pathlen,
+	void *user_data)
+{
+	struct mg_connection *conn = (struct mg_connection *)user_data;
+
+	mg_printf(conn, "\r\n\r\n%s:\r\n", key);
+	mg_printf(conn, "Inside vfw_field_found %s \n", filename);
+
+	if (filename && *filename) {
+		snprintf(path, pathlen, "/tmp/%s", filename);
+		struct app_params *app = myapp;
+		int status;
+		int fd;
+
+		mg_printf(conn, "path: %s\n", path);
+
+		/* Make sure the file exists before clearing rules and actions */
+		fd = open(path, O_RDONLY);
+		if (fd < 0) {
+			mg_printf(conn, "Cannot open file \"%s\"\n", filename);
+			return FORM_FIELD_STORAGE_GET;
+		}
+
+		close(fd);
+		return FORM_FIELD_STORAGE_STORE;
+	}
+
+	return FORM_FIELD_STORAGE_GET;
+}
+
+static int nat_field_get(const char *key, const char *value, size_t valuelen,
+	void *user_data)
+{
+	struct mg_connection *conn = (struct mg_connection *)user_data;
+
+	if (key[0]) {
+		mg_printf(conn, "%s = ", key);
+	}
+	mg_write(conn, value, valuelen);
+
+	return 0;
+}
+
+static int nat_field_stored(const char *path, long long file_size,
+	void *user_data)
+{
+	struct mg_connection *conn = (struct mg_connection *)user_data;
+	int status;
+
+	mg_printf(conn,
+		  "stored as %s (%lu bytes)\r\n\r\n",
+		  path,
+		  (unsigned long)file_size);
+
+	/* Process commands in script file */
+	cgnapt_loadrules_file(pipe_cl->ctx, path);
+	rules_loaded = 1;
+
+	return 0;
+}
+
+int nat_load_handler(struct mg_connection *conn, __rte_unused void *cbdata)
+{
+	/* Handler may access the request info using mg_get_request_info */
+	int ret;
+	const struct mg_request_info *req_info = mg_get_request_info(conn);
+	struct mg_form_data_handler fdh = {nat_field_found, nat_field_get,
+				 nat_field_stored, 0};
+
+	/* It would be possible to check the request info here before calling
+	 * mg_handle_form_request. */
+	(void)req_info;
+
+	mg_printf(conn,
+		  "HTTP/1.1 200 OK\r\nContent-Type: "
+		  "text/plain\r\nConnection: close\r\n\r\n");
+
+	if (!strcmp(req_info->request_method, "GET")) {
+		mg_printf(conn, "Rule file is %s\n", rules_loaded? "LOADED":"NOT LOADED");
+	}
+
+	if (strcmp(req_info->request_method, "PUT")) {
+		mg_printf(conn, "Only PUT method allowed");
+		return 1;
+	}
+
+	fdh.user_data = (void *)conn;
+
+	/* Call the form handler */
+	mg_printf(conn, "Form data:");
+	ret = mg_handle_form_request(conn, &fdh);
+	mg_printf(conn, "\r\n%i fields found", ret);
+
+	return 1;
+}
+
+void rest_api_cgnapt_init(struct mg_context *ctx, struct app_params *app)
+{
+	myapp = app;
+
+        /* vCGNAPT commands */
+        mg_set_request_handler(ctx, "/vnf/config/nat", nat_handler, 0);
+        mg_set_request_handler(ctx, "/vnf/config/nat/load", nat_load_handler, 0);
+	mg_set_request_handler(ctx, "/vnf/status", cgnapt_cmd_ver_handler, 0);
+	mg_set_request_handler(ctx, "/vnf/stats", cgnapt_stats_handler, 0);
+
+}
+
 static cmdline_parse_inst_t cmd_clear_stats = {
 	 .f = cmd_cgnapt_clear_stats_parsed,
 	 .data = NULL,
diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h
index 5491648a..6497de27 100644
--- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h
+++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt.h
@@ -28,6 +28,8 @@
 
 #include "pipeline.h"
 #include "pipeline_cgnapt_common.h"
+#include <civetweb.h>
+#include <json/json.h>
 
 /**
  * Add NAPT rule to the NAPT rule table.
@@ -129,6 +131,12 @@ int
 app_pipeline_cgnapt_nsp_del_entry(struct app_params *app,
 					uint32_t pipeline_id,
 					struct pipeline_cgnapt_nsp_t *nsp);
+#ifdef REST_API_SUPPORT
+/* REST api's are defined here */
+int cgnapt_cmd_ver_handler(struct mg_connection *conn, void *cbdata);
+int cgnapt_stats_handler(struct mg_connection *conn, void *cbdata);
+void rest_api_cgnapt_init(struct mg_context *ctx, struct app_params *app);
+#endif
 
 /*
  * Pipeline type
diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c
index f02fd164..f578587e 100644
--- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c
+++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_be.c
@@ -10469,9 +10469,9 @@ void *pipeline_cgnapt_msg_req_ver_handler(__rte_unused struct pipeline *p,
  * Function to show CGNAPT stats
  *
  */
-void all_cgnapt_stats(void)
+void all_cgnapt_stats(char *buf)
 {
-	int i;
+	int i, len = 0;
 	struct pipeline_cgnapt *p_nat;
 	uint64_t receivedPktCount = 0;
 	uint64_t missedPktCount = 0;
@@ -10481,7 +10481,7 @@ void all_cgnapt_stats(void)
 	uint64_t enaptedPktCount = 0;
 	uint64_t arpicmpPktCount = 0;
 
-	printf("\nCG-NAPT Packet Stats:\n");
+	len += sprintf(buf + len, "\nCG-NAPT Packet Stats:\n");
 	for (i = 0; i < n_cgnapt_pipeline; i++) {
 		p_nat = all_pipeline_cgnapt[i];
 
@@ -10493,43 +10493,43 @@ void all_cgnapt_stats(void)
 		enaptedPktCount		+= p_nat->enaptedPktCount;
 		arpicmpPktCount		+= p_nat->arpicmpPktCount;
 
-		printf("pipeline %d stats:\n", p_nat->pipeline_num);
-		printf("Received %" PRIu64 ",", p_nat->receivedPktCount);
-		printf("Missed %" PRIu64 ",", p_nat->missedPktCount);
-		printf("Dropped %" PRIu64 ",",  p_nat->naptDroppedPktCount);
-		printf("Translated %" PRIu64 ",", p_nat->naptedPktCount);
-		printf("ingress %" PRIu64 ",",  p_nat->inaptedPktCount);
-		printf("egress %" PRIu64 "\n", p_nat->enaptedPktCount);
-		printf("arpicmp pkts %" PRIu64 "\n", p_nat->arpicmpPktCount);
+		len += sprintf(buf + len, "pipeline %d stats:\n", p_nat->pipeline_num);
+		len += sprintf(buf + len, "Received %" PRIu64 ",", p_nat->receivedPktCount);
+		len += sprintf(buf + len, "Missed %" PRIu64 ",", p_nat->missedPktCount);
+		len += sprintf(buf + len, "Dropped %" PRIu64 ",",  p_nat->naptDroppedPktCount);
+		len += sprintf(buf + len, "Translated %" PRIu64 ",", p_nat->naptedPktCount);
+		len += sprintf(buf + len, "ingress %" PRIu64 ",",  p_nat->inaptedPktCount);
+		len += sprintf(buf + len, "egress %" PRIu64 "\n", p_nat->enaptedPktCount);
+		len += sprintf(buf + len, "arpicmp pkts %" PRIu64 "\n", p_nat->arpicmpPktCount);
 
 
 		#ifdef CGNAPT_DEBUGGING
-		printf("\n Drop detail 1:%" PRIu64 ",",
+		len += sprintf(buf + len, "\n Drop detail 1:%" PRIu64 ",",
 				p_nat->naptDroppedPktCount1);
-		printf("\n Drop detail 2:%" PRIu64 ",",
+		len += sprintf(buf + len, "\n Drop detail 2:%" PRIu64 ",",
 				p_nat->naptDroppedPktCount2);
-		printf("\n Drop detail 3:%" PRIu64 ",",
+		len += sprintf(buf + len, "\n Drop detail 3:%" PRIu64 ",",
 				p_nat->naptDroppedPktCount3);
-		printf("\n Drop detail 4:%" PRIu64 ",",
+		len += sprintf(buf + len, "\n Drop detail 4:%" PRIu64 ",",
 				p_nat->naptDroppedPktCount4);
-		printf("\n Drop detail 5:%" PRIu64 ",",
+		len += sprintf(buf + len, "\n Drop detail 5:%" PRIu64 ",",
 				p_nat->naptDroppedPktCount5);
-		printf("\n Drop detail 6:%" PRIu64 "",
+		len += sprintf(buf + len, "\n Drop detail 6:%" PRIu64 "",
 				p_nat->naptDroppedPktCount6);
 
-		printf("\nPkt_miss: %" PRIu64 " %" PRIu64 "",
+		len += sprintf(buf + len, "\nPkt_miss: %" PRIu64 " %" PRIu64 "",
 				p_nat->missedpktcount1,
 				p_nat->missedpktcount2);
-		printf("\nPkt_miss: %" PRIu64 " %" PRIu64 "",
+		len += sprintf(buf + len, "\nPkt_miss: %" PRIu64 " %" PRIu64 "",
 				p_nat->missedpktcount3,
 				p_nat->missedpktcount4);
-		printf("\nPkt_miss: %" PRIu64 " %" PRIu64 "",
+		len += sprintf(buf + len, "\nPkt_miss: %" PRIu64 " %" PRIu64 "",
 				p_nat->missedpktcount5,
 				p_nat->missedpktcount6);
-		printf("\nPkt_miss: %" PRIu64 " %" PRIu64 "",
+		len += sprintf(buf + len, "\nPkt_miss: %" PRIu64 " %" PRIu64 "",
 				p_nat->missedpktcount7,
 				p_nat->missedpktcount8);
-		printf("\nPkt_miss: %" PRIu64 " %" PRIu64 "",
+		len += sprintf(buf + len, "\nPkt_miss: %" PRIu64 " %" PRIu64 "",
 				p_nat->missedpktcount9,
 				p_nat->missedpktcount10);
 
@@ -10537,32 +10537,35 @@ void all_cgnapt_stats(void)
 
 	}
 
-	printf("\nTotal pipeline stats:\n");
-	printf("Received %" PRIu64 ",", receivedPktCount);
-	printf("Missed %" PRIu64 ",", missedPktCount);
-	printf("Dropped %" PRIu64 ",",  naptDroppedPktCount);
-	printf("Translated %" PRIu64 ",", naptedPktCount);
-	printf("ingress %" PRIu64 ",",  inaptedPktCount);
-	printf("egress %" PRIu64 "\n", enaptedPktCount);
-	printf("arpicmp pkts %" PRIu64 "\n", arpicmpPktCount);
+	len += sprintf(buf + len, "\nTotal pipeline stats:\n");
+	len += sprintf(buf + len, "Received %" PRIu64 ",", receivedPktCount);
+	len += sprintf(buf + len, "Missed %" PRIu64 ",", missedPktCount);
+	len += sprintf(buf + len, "Dropped %" PRIu64 ",",  naptDroppedPktCount);
+	len += sprintf(buf + len, "Translated %" PRIu64 ",", naptedPktCount);
+	len += sprintf(buf + len, "ingress %" PRIu64 ",",  inaptedPktCount);
+	len += sprintf(buf + len, "egress %" PRIu64 "\n", enaptedPktCount);
+	len += sprintf(buf + len, "arpicmp pkts %" PRIu64 "\n", arpicmpPktCount);
+
+	if (!rest_api_supported())
+		printf("%s\n", buf);
 }
 
-void all_cgnapt_clear_stats(void)
+void all_cgnapt_clear_stats(char *buf)
 {
-	int i;
+	int i, len = 0;
 	struct pipeline_cgnapt *p_nat;
-		printf("\nCG-NAPT Packet Stats:\n");
+		len += sprintf(buf + len, "\nCG-NAPT Packet Stats:\n");
 	for (i = 0; i < n_cgnapt_pipeline; i++) {
 		p_nat = all_pipeline_cgnapt[i];
 
-		printf("pipeline %d stats:\n", p_nat->pipeline_num);
-		printf("Received %" PRIu64 ",", p_nat->receivedPktCount);
-		printf("Missed %" PRIu64 ",", p_nat->missedPktCount);
-		printf("Dropped %" PRIu64 ",",  p_nat->naptDroppedPktCount);
-		printf("Translated %" PRIu64 ",", p_nat->naptedPktCount);
-		printf("ingress %" PRIu64 ",",  p_nat->inaptedPktCount);
-		printf("egress %" PRIu64 "\n", p_nat->enaptedPktCount);
-		printf("arpicmp pkts %" PRIu64 "\n", p_nat->arpicmpPktCount);
+		len += sprintf(buf + len, "pipeline %d stats:\n", p_nat->pipeline_num);
+		len += sprintf(buf + len, "Received %" PRIu64 ",", p_nat->receivedPktCount);
+		len += sprintf(buf + len, "Missed %" PRIu64 ",", p_nat->missedPktCount);
+		len += sprintf(buf + len, "Dropped %" PRIu64 ",",  p_nat->naptDroppedPktCount);
+		len += sprintf(buf + len, "Translated %" PRIu64 ",", p_nat->naptedPktCount);
+		len += sprintf(buf + len, "ingress %" PRIu64 ",",  p_nat->inaptedPktCount);
+		len += sprintf(buf + len, "egress %" PRIu64 "\n", p_nat->enaptedPktCount);
+		len += sprintf(buf + len, "arpicmp pkts %" PRIu64 "\n", p_nat->arpicmpPktCount);
 
 		p_nat->receivedPktCount = 0;
 		p_nat->missedPktCount = 0;
@@ -10573,38 +10576,41 @@ void all_cgnapt_clear_stats(void)
 		p_nat->arpicmpPktCount = 0;
 
 		#ifdef CGNAPT_DEBUGGING
-		printf("\n Drop detail 1:%" PRIu64 ",",
+		len += sprintf(buf + len, "\n Drop detail 1:%" PRIu64 ",",
 				p_nat->naptDroppedPktCount1);
-		printf("\n Drop detail 2:%" PRIu64 ",",
+		len += sprintf(buf + len, "\n Drop detail 2:%" PRIu64 ",",
 				p_nat->naptDroppedPktCount2);
-		printf("\n Drop detail 3:%" PRIu64 ",",
+		len += sprintf(buf + len, "\n Drop detail 3:%" PRIu64 ",",
 				p_nat->naptDroppedPktCount3);
-		printf("\n Drop detail 4:%" PRIu64 ",",
+		len += sprintf(buf + len, "\n Drop detail 4:%" PRIu64 ",",
 				p_nat->naptDroppedPktCount4);
-		printf("\n Drop detail 5:%" PRIu64 ",",
+		len += sprintf(buf + len, "\n Drop detail 5:%" PRIu64 ",",
 				p_nat->naptDroppedPktCount5);
-		printf("\n Drop detail 6:%" PRIu64 "",
+		len += sprintf(buf + len, "\n Drop detail 6:%" PRIu64 "",
 				p_nat->naptDroppedPktCount6);
 
-		printf("\nPkt_miss: %" PRIu64 " %" PRIu64 "",
+		len += sprintf(buf + len, "\nPkt_miss: %" PRIu64 " %" PRIu64 "",
 				p_nat->missedpktcount1,
 				p_nat->missedpktcount2);
-		printf("\nPkt_miss: %" PRIu64 " %" PRIu64 "",
+		len += sprintf(buf + len, "\nPkt_miss: %" PRIu64 " %" PRIu64 "",
 				p_nat->missedpktcount3,
 				p_nat->missedpktcount4);
-		printf("\nPkt_miss: %" PRIu64 " %" PRIu64 "",
+		len += sprintf(buf + len, "\nPkt_miss: %" PRIu64 " %" PRIu64 "",
 				p_nat->missedpktcount5,
 				p_nat->missedpktcount6);
-		printf("\nPkt_miss: %" PRIu64 " %" PRIu64 "",
+		len += sprintf(buf + len, "\nPkt_miss: %" PRIu64 " %" PRIu64 "",
 				p_nat->missedpktcount7,
 				p_nat->missedpktcount8);
-		printf("\nPkt_miss: %" PRIu64 " %" PRIu64 "",
+		len += sprintf(buf + len, "\nPkt_miss: %" PRIu64 " %" PRIu64 "",
 				p_nat->missedpktcount9,
 				p_nat->missedpktcount10);
 
 		#endif
 
 	}
+
+	if (!rest_api_supported())
+		printf("%s\n", buf);
 }
 
 /**
diff --git a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_common.h b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_common.h
index 4f4253cd..a7cd88a4 100644
--- a/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_common.h
+++ b/VNFs/vCGNAPT/pipeline/pipeline_cgnapt_common.h
@@ -265,7 +265,7 @@ struct pipeline_cgnapt_entry_dbg_msg_req {
 
 extern struct pipeline_be_ops pipeline_cgnapt_be_ops;
 void print_num_ip_clients(void);
-void all_cgnapt_stats(void);
-void all_cgnapt_clear_stats(void);
+void all_cgnapt_stats(char *);
+void all_cgnapt_clear_stats(char *);
 void print_static_cgnapt_entries(void);
 #endif
diff --git a/VNFs/vCGNAPT/vnf_template.txt b/VNFs/vCGNAPT/vnf_template.txt
new file mode 100644
index 00000000..385c5312
--- /dev/null
+++ b/VNFs/vCGNAPT/vnf_template.txt
@@ -0,0 +1,80 @@
+[MASTER]
+type = MASTER
+core = 0
+
+[ARPICMP]
+type = ARPICMP
+core = 1
+pktq_in  = SWQ0
+pktq_out = TXQ0.0 TXQ1.0
+pktq_in_prv =  RXQ0.0
+prv_to_pub_map = (0,1)
+prv_que_handler = (0)
+
+[TIMER]
+type = TIMER
+core = 2
+n_flows = 1048576
+
+[TXRX-BEGIN]
+type = TXRX
+core = 2
+pktq_in  = RXQ0.0 RXQ1.0
+pktq_out = SWQ0 SWQ1 SWQ2
+pipeline_txrx_type = RXRX
+dest_if_offset=176
+
+[TXRX-END]
+type = TXRX
+core = 5
+pktq_in  = SWQ5 SWQ6
+pktq_out = TXQ0.1 TXQ1.1
+pipeline_txrx_type = TXTX
+
+[LOADB]
+type = LOADB
+core = 3
+pktq_in  = SWQ0 SWQ1
+pktq_out = SWQ3 SWQ4
+outport_offset = 136
+phyport_offset = 204
+n_vnf_threads = 1
+prv_que_handler = (0)
+
+[VACL]
+type = ACL
+core = 4
+pktq_in  = SWQ3 SWQ4
+pktq_out = SWQ5 SWQ6
+n_flows = 1000000
+pkt_type = ipv6
+traffic_type = 6
+
+[VCGNAPT]
+type = CGNAPT
+core = 3
+pktq_in = RXQ0.0 RXQ1.0
+pktq_out = TXQ0.1 TXQ1.1 SWQ0
+phyport_offset = 204
+n_flows = 1048576
+key_offset = 192;64
+key_size = 8
+hash_offset = 200;72
+timer_period = 100
+max_clients_per_ip = 65535
+max_port_per_client = 10
+pkt_type = ipv4
+cgnapt_meta_offset = 128
+prv_que_handler = (0,)
+
+[VFW]
+type = VFW
+core = s0c4
+pktq_in  = SWQ3 SWQ4
+pktq_out = SWQ7 SWQ8;TXQ0.0 TXQ1.0
+n_rules = 10000
+n_flows = 1000000
+pkt_type = ipv6
+traffic_type = 6
+tcp_time_wait = 10
+