Release 2.2.0.0

.version

@@ -1 +1 @@
-2.0.7.0
+2.2.0.0

Makefile

@@ -65,6 +65,7 @@ include build/dirs.mk
 include build/verbose.mk
 include build/version.mk
 include build/git.mk
+include build/stam.mk
 include build/unit-build.mk
 include build/tags.mk
 include build/app_install.mk
@@ -74,8 +75,9 @@ include build/schema.mk
 include build/devshell.mk
 include build/help.mk
 include build/doc.mk
+include build/fut.mk
 
-build_all: workdirs schema-check unit-install
+build_all: workdirs schema-check unit-install fut
 
 clean:
 	$(NQ) " $(call color_clean,clean)   [$(call COLOR_BOLD,workdir)] $(WORKDIR)"

build/dirs.mk

@@ -26,6 +26,7 @@ SRCDIR   = src
 OBJDIR   = $(WORKDIR)/obj
 BINDIR   = $(WORKDIR)/bin
 LIBDIR   = $(WORKDIR)/lib
+FUTDIR   = $(WORKDIR)/fut
 BUILD_ROOTFS_DIR  ?= $(WORKDIR)/rootfs
 APP_ROOTFS        ?= $(BUILD_ROOTFS_DIR)
 IMAGEDIR = images

build/fut.mk

@@ -0,0 +1,43 @@
+# Copyright (c) 2015, Plume Design Inc. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#    1. Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#    2. Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#    3. Neither the name of the Plume Design Inc. nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Plume Design Inc. BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+FUT_PACK_NAME := $(TARGET)-$(shell $(call version-gen,make))
+FUT_PACK_FILENAME := fut-$(FUT_PACK_NAME).tar.bz2
+FUT_PACK_PATHNAME ?= $(IMAGEDIR)/$(FUT_PACK_FILENAME)
+
+.PHONY: fut-store
+
+fut-clean:
+	$(NQ) "$(call color_install,clean) $(call color_profile,$(FUTDIR))"
+	$(Q)rm -rf $(FUTDIR)
+
+fut-store:
+	$(NQ) "$(call color_install, create) $(FUT_PACK_FILENAME)"
+	$(Q)$(TAR) -cjf $(FUT_PACK_PATHNAME) -C $(dir $(FUTDIR)) $(notdir $(FUTDIR))
+
+fut-make: $(UNIT_ALL_FUT_UNITS)
+
+fut: fut-clean
+	$(Q)$(MAKE) fut-make
+	$(Q)$(MAKE) fut-store

build/stam.mk

@@ -0,0 +1,69 @@
+# Copyright (c) 2015, Plume Design Inc. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#    1. Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#    2. Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#    3. Neither the name of the Plume Design Inc. nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL Plume Design Inc. BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+define _stam_generate
+	$(if $(filter "$(STAM_NAME)",""),$(error Please define STAM_NAME before using stam generator))
+	$(if $(filter "$(STAM_DOT_FILE)",""),$(error Please define STAM_DOT_FILE before using stam generator))
+	$(if $(filter "$(STAM_DEST_DIR)",""),$(error Please define STAM_DEST_DIR before using stam generator))
+
+	$(NQ) " $(call color_generate,stam)[$(call COLOR_BOLD,$(STAM_NAME))] $@"
+	$(Q) src/lib/stam/tools/libstam_gen.py $(STAM_DOT_FILE) $(1) --file --dest $(STAM_DEST_DIR) $(EXTRA_OPTS) \
+		$(if $(filter "$(STAM_DISABLE_ACTIONS_CHECKS)","y"),--disable-actions-checks) \
+		$(if $(filter "$(STAM_DISABLE_TRANSITIONS_CHECKS)","y"),--disable-transitions-checks)
+endef
+
+define stam_generate_source
+	$(call _stam_generate,--source)
+endef
+
+define stam_generate_header
+	$(call _stam_generate,--header)
+endef
+
+define stam_generate
+$(call stam_generate2,$(1),$(basename $(notdir $(1))))
+endef
+
+define stam_generate2
+
+UNIT_PRE += $(UNIT_BUILD)/$(2)_stam.h
+UNIT_PRE += $(UNIT_BUILD)/$(2)_stam.c
+UNIT_SRC_TOP += $(UNIT_BUILD)/$(2)_stam.c
+
+UNIT_CFLAGS += -I$(UNIT_BUILD)
+
+UNIT_CLEAN += $(UNIT_BUILD)/$(2)_stam.h
+UNIT_CLEAN += $(UNIT_BUILD)/$(2)_stam.c
+
+UNIT_DEPS += src/lib/stam
+
+$(UNIT_BUILD)/$(2)_stam.h: $(UNIT_PATH)/$(1)
+	$(NQ) " $(call color_generate,stam_h)  [$(call COLOR_BOLD,$(2))] $$@"
+	$(Q) src/lib/stam/tools/libstam_gen.py $(UNIT_PATH)/$(1) --file --dest "$(UNIT_BUILD)" --header
+
+$(UNIT_BUILD)/$(2)_stam.c: $(UNIT_PATH)/$(1)
+	$(NQ) " $(call color_generate,stam_c)  [$(call COLOR_BOLD,$(2))] $$@"
+	$(Q) src/lib/stam/tools/libstam_gen.py $(UNIT_PATH)/$(1) --file --dest "$(UNIT_BUILD)" --source
+
+endef

build/unit-build.mk

@@ -138,6 +138,28 @@ $(call UNIT_MAKE_CLEAN,$(TESTBINDIR)/$(UNIT_BIN))
 $(call UNIT_C_RULES)
 endef
 
+##########################################################
+# Definition of a "FUT" type unit
+##########################################################
+define UNIT_BUILD_FUT
+# Add the unit to the global list of units
+UNIT_ALL += $(UNIT_PATH)
+UNIT_ALL_INSTALL += $(UNIT_PATH)/install
+UNIT_ALL_CLEAN += $(UNIT_PATH)/clean
+UNIT_ALL_FUT_UNITS += $(UNIT_PATH)
+
+.PHONY: $(UNIT_PATH)/install
+$(UNIT_PATH) $(UNIT_PATH)/: $(UNIT_PATH)/install
+$(UNIT_PATH)/install:
+	$(NQ) " $(call color_copy,copy)    [$(call COLOR_BOLD,$(UNIT_PATH))] -> $(FUTDIR)/$(UNIT_DIR)"
+	$(Q)$(MKDIR) $(foreach SRC,$(UNIT_FILE),'$(dir $(FUTDIR)/$(UNIT_DIR)/$(SRC))')
+	$(Q)$(foreach SRC,$(UNIT_FILE),$(CP) $(UNIT_PATH)/$(SRC) $(dir $(FUTDIR)/$(UNIT_DIR)/$(SRC));)
+
+$(call UNIT_MAKE_DIRS)
+$(call UNIT_MAKE_INFO)
+$(call UNIT_MAKE_CLEAN,$(FUTDIR)/$(UNIT_DIR))
+endef
+
 ##########################################################
 # Definition of a "LIB" type unit
 ##########################################################
@@ -357,6 +379,7 @@ $(UNIT_PATH)/info:
 	$(NQ) "UNIT_OBJ:            " $(UNIT_OBJ)
 	$(NQ) "UNIT_EXPORT_CFLAGS:  " $(UNIT_EXPORT_CFLAGS)
 	$(NQ) "UNIT_EXPORT_LDFLAGS: " $(UNIT_EXPORT_LDFLAGS)
+	$(NQ) "UNIT_FILE:           " $(UNIT_FILE)
 	$(NQ) "UNIT_CLEAN:          " $(UNIT_CLEAN)
 endef
 
@@ -415,6 +438,7 @@ UNIT_PRE:=
 UNIT_DIR:=
 UNIT_POST_MACRO:=
 UNIT_INSTALL:=
+UNIT_FILE:=
 
 UNIT_MK         := $(1)
 UNIT_PATH       := $(call CANNED_PATH,$(dir $(UNIT_MK)))

doc/doxygen.conf

@@ -802,10 +802,18 @@ INPUT                  = \
                          ../src/lib/osn/inc/osn_inet6.h \
                          ../src/lib/osn/inc/osn_dhcpv6.h \
                          ../src/lib/osn/inc/osn_netif.h \
+                         ../src/lib/osn/inc/osn_pppoe.h \
+                         ../src/lib/osn/inc/osn_vlan.h \
                          ../src/lib/osp/inc/osp.h \
-                         ../src/lib/osp/inc/osp_led.h \
+                         ../src/lib/osp/inc/osp_unit.h \
                          ../src/lib/osp/inc/osp_tm.h \
-                         ../src/lib/osp/inc/osp_ps.h
+                         ../src/lib/osp/inc/osp_reboot.h \
+                         ../src/lib/osp/inc/osp_led.h \
+                         ../src/lib/osp/inc/osp_btn.h \
+                         ../src/lib/osp/inc/osp_upg.h \
+                         ../src/lib/osp/inc/osp_ps.h \
+                         ../src/lib/osp/inc/osp_dl.h \
+                         ../src/lib/osp/inc/osp_objm.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

interfaces/interface_stats.proto

@@ -0,0 +1,53 @@
+// Copyright (c) 2015, Plume Design Inc. All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//    1. Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//    2. Redistributions in binary form must reproduce the above copyright
+//       notice, this list of conditions and the following disclaimer in the
+//       documentation and/or other materials provided with the distribution.
+//    3. Neither the name of the Plume Design Inc. nor the
+//       names of its contributors may be used to endorse or promote products
+//       derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL Plume Design Inc. BE LIABLE FOR ANY
+// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto2";
+
+package intf.stats;
+
+message ObservationPoint {
+     optional string nodeId                                                 = 1;
+     optional string locationId                                             = 2;
+}
+
+message IntfStats {
+     optional string ifName                                                 = 1;
+     optional uint64 txBytes                                                = 2;
+     optional uint64 rxBytes                                                = 3;
+     optional uint64 txPackets                                              = 4;
+     optional uint64 rxPackets                                              = 5;
+     optional string role                                                   = 6;
+}
+
+message ObservationWindow {
+     optional uint64    startedAt                                           = 1;
+     optional uint64    endedAt                                             = 2;
+     repeated IntfStats intfStats                                           = 3;
+}
+
+message IntfReport {
+     optional uint64            reportedAt                                  = 1;
+     optional ObservationPoint  observationPoint                            = 2;
+     repeated ObservationWindow observationWindow                           = 3;
+}

interfaces/object_manager.proto

@@ -0,0 +1,45 @@
+// Copyright (c) 2015, Plume Design Inc. All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//    1. Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//    2. Redistributions in binary form must reproduce the above copyright
+//       notice, this list of conditions and the following disclaimer in the
+//       documentation and/or other materials provided with the distribution.
+//    3. Neither the name of the Plume Design Inc. nor the
+//       names of its contributors may be used to endorse or promote products
+//       derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL Plume Design Inc. BE LIABLE FOR ANY
+// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+syntax = "proto2";
+
+package objectManager.status;
+
+message ObservationPoint {
+     optional string nodeId                                                 = 1;
+     optional string locationId                                             = 2;
+}
+
+message ObjectStatus {
+     optional string objectName                                             = 1;
+     optional string version                                                = 2;
+     optional string status                                                 = 3;
+}
+
+
+message ObjectStatusReport {
+     optional uint64            reportedAt                                  = 1;
+     optional ObservationPoint  observationPoint                            = 2;
+     repeated ObjectStatus      objectStatus                                = 3;
+}