From 44f220a3b8fb6617345901da9a2d7f822b726572 Mon Sep 17 00:00:00 2001
From: Erich Cordoba <erich.cordoba.malibran@intel.com>
Date: Thu, 26 Sep 2019 11:20:00 -0500
Subject: [PATCH] Remove version from sm-common folder

The sm-common component had the 1.0.0 version in the folder name, this
change removes that version and updates the centos_pkg_dirs.

Story: 2006623
Task: 36828

Change-Id: I0e998a3e2482bc06f3a91f9494a3e5d21faa28e7
Signed-off-by: Erich Cordoba <erich.cordoba.malibran@intel.com>
---
 centos_pkg_dirs                                  |  2 +-
 devstack/lib/ha                                  | 16 ++++++++--------
 .../{sm-common-1.0.0 => sm-common}/LICENSE       |  0
 .../{sm-common-1.0.0 => sm-common}/Makefile      |  0
 .../centos/build_srpm.data                       |  0
 .../centos/sm-common.spec                        |  0
 .../scripts/Makefile                             |  0
 .../scripts/sm-eru                               |  0
 .../scripts/sm-eru.conf                          |  0
 .../scripts/sm-eru.service                       |  0
 .../scripts/sm-watchdog                          |  0
 .../scripts/sm-watchdog.conf                     |  0
 .../scripts/sm-watchdog.service                  |  0
 .../{sm-common-1.0.0 => sm-common}/src/Makefile  |  0
 .../src/sm_debug.c                               |  0
 .../src/sm_debug.h                               |  0
 .../src/sm_debug_thread.c                        |  0
 .../src/sm_debug_thread.h                        |  0
 .../src/sm_eru_db.c                              |  0
 .../src/sm_eru_db.h                              |  0
 .../src/sm_eru_dump.c                            |  0
 .../src/sm_eru_main.c                            |  0
 .../src/sm_eru_process.c                         |  0
 .../src/sm_eru_process.h                         |  0
 .../{sm-common-1.0.0 => sm-common}/src/sm_hw.c   |  0
 .../{sm-common-1.0.0 => sm-common}/src/sm_hw.h   |  0
 .../src/sm_limits.h                              |  0
 .../{sm-common-1.0.0 => sm-common}/src/sm_list.h |  0
 .../src/sm_netlink.c                             |  0
 .../src/sm_netlink.h                             |  0
 .../src/sm_node_stats.c                          |  0
 .../src/sm_node_stats.h                          |  0
 .../src/sm_node_utils.c                          |  0
 .../src/sm_node_utils.h                          |  0
 .../src/sm_selobj.c                              |  0
 .../src/sm_selobj.h                              |  0
 .../src/sm_sha512.c                              |  0
 .../src/sm_sha512.h                              |  0
 .../src/sm_thread_health.c                       |  0
 .../src/sm_thread_health.h                       |  0
 .../{sm-common-1.0.0 => sm-common}/src/sm_time.c |  0
 .../{sm-common-1.0.0 => sm-common}/src/sm_time.h |  0
 .../src/sm_timer.c                               |  0
 .../src/sm_timer.h                               |  0
 .../{sm-common-1.0.0 => sm-common}/src/sm_trap.c |  0
 .../{sm-common-1.0.0 => sm-common}/src/sm_trap.h |  0
 .../src/sm_trap_thread.c                         |  0
 .../src/sm_trap_thread.h                         |  0
 .../src/sm_types.c                               |  0
 .../src/sm_types.h                               |  0
 .../src/sm_util_types.c                          |  0
 .../src/sm_util_types.h                          |  0
 .../src/sm_utils.c                               |  0
 .../src/sm_utils.h                               |  0
 .../{sm-common-1.0.0 => sm-common}/src/sm_uuid.c |  0
 .../{sm-common-1.0.0 => sm-common}/src/sm_uuid.h |  0
 .../src/sm_watchdog_main.c                       |  0
 .../src/sm_watchdog_module.c                     |  0
 .../src/sm_watchdog_module.h                     |  0
 .../src/sm_watchdog_nfs.c                        |  0
 .../src/sm_watchdog_nfs.h                        |  0
 .../src/sm_watchdog_process.c                    |  0
 .../src/sm_watchdog_process.h                    |  0
 63 files changed, 9 insertions(+), 9 deletions(-)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/LICENSE (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/Makefile (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/centos/build_srpm.data (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/centos/sm-common.spec (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/scripts/Makefile (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/scripts/sm-eru (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/scripts/sm-eru.conf (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/scripts/sm-eru.service (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/scripts/sm-watchdog (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/scripts/sm-watchdog.conf (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/scripts/sm-watchdog.service (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/Makefile (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_debug.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_debug.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_debug_thread.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_debug_thread.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_eru_db.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_eru_db.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_eru_dump.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_eru_main.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_eru_process.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_eru_process.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_hw.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_hw.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_limits.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_list.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_netlink.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_netlink.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_node_stats.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_node_stats.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_node_utils.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_node_utils.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_selobj.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_selobj.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_sha512.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_sha512.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_thread_health.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_thread_health.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_time.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_time.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_timer.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_timer.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_trap.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_trap.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_trap_thread.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_trap_thread.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_types.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_types.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_util_types.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_util_types.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_utils.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_utils.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_uuid.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_uuid.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_watchdog_main.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_watchdog_module.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_watchdog_module.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_watchdog_nfs.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_watchdog_nfs.h (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_watchdog_process.c (100%)
 rename service-mgmt/{sm-common-1.0.0 => sm-common}/src/sm_watchdog_process.h (100%)

diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index 05abb005..863dfe5f 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,4 +1,4 @@
-service-mgmt/sm-common-1.0.0
+service-mgmt/sm-common
 service-mgmt/sm-db-1.0.0
 service-mgmt/sm-1.0.0
 service-mgmt-api
diff --git a/devstack/lib/ha b/devstack/lib/ha
index 0b8dd7c4..6f003e61 100644
--- a/devstack/lib/ha
+++ b/devstack/lib/ha
@@ -52,8 +52,8 @@ function build_sm {
     # CCFLAGS= -g -O2 -Wall -Werror -Wformat  -std=c++11
     make \
         CCFLAGS="-g -O2 -Wall -Wformat -Wunused-result -std=c++11" \
-        INCLUDES="-I$STX_HA_DIR/service-mgmt/sm-common-${STX_SM_COMMON_VERSION}/src -I$STX_HA_DIR/service-mgmt/sm-db-${STX_SM_DB_VERSION}/src -I/usr/lib64/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$/usr/local/include" \
-        LDLIBS="-L $STX_HA_DIR/service-mgmt/sm-common-${STX_SM_COMMON_VERSION}/src -L $STX_HA_DIR/service-mgmt/sm-db-${STX_SM_DB_VERSION}/src  -lsqlite3 -lglib-2.0 -luuid -lpthread -lrt -lsm_common -lsm_db -lfmcommon -ljson-c -lcrypto -lssl" \
+        INCLUDES="-I$STX_HA_DIR/service-mgmt/sm-common/src -I$STX_HA_DIR/service-mgmt/sm-db-${STX_SM_DB_VERSION}/src -I/usr/lib64/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$/usr/local/include" \
+        LDLIBS="-L $STX_HA_DIR/service-mgmt/sm-common/src -L $STX_HA_DIR/service-mgmt/sm-db-${STX_SM_DB_VERSION}/src  -lsqlite3 -lglib-2.0 -luuid -lpthread -lrt -lsm_common -lsm_db -lfmcommon -ljson-c -lcrypto -lssl" \
         build
 
     popd
@@ -68,7 +68,7 @@ function build_sm_api {
 }
 
 function build_sm_common {
-    pushd $STX_HA_DIR/service-mgmt/sm-common-${STX_SM_COMMON_VERSION}
+    pushd $STX_HA_DIR/service-mgmt/sm-common
 
     # On Xenial needed to remove -O2
     # CCFLAGS= -fPIC -g -O2 -Wall -Werror
@@ -89,8 +89,8 @@ function build_sm_db {
     make \
         VER=$STX_SM_DB_VERSION \
         VER_MJR=${STX_SM_DB_VERSION%%.*} \
-        INCLUDES="-I$STX_HA_DIR/service-mgmt/sm-common-${STX_SM_COMMON_VERSION}/src -I/usr/lib64/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include" \
-        LDLIBS="-L $STX_HA_DIR/service-mgmt/sm-common-${STX_SM_COMMON_VERSION}/src -lsqlite3 -lglib-2.0 -lrt -lsm_common -luuid" \
+        INCLUDES="-I$STX_HA_DIR/service-mgmt/sm-common/src -I/usr/lib64/glib-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include" \
+        LDLIBS="-L $STX_HA_DIR/service-mgmt/sm-common/src -lsqlite3 -lglib-2.0 -lrt -lsm_common -luuid" \
         EXTRACCFLAGS="-D__STDC_FORMAT_MACROS -fpermissive" \
         build
 
@@ -147,7 +147,7 @@ function cleanup_sm_api {
 }
 
 function cleanup_sm_common {
-    pushd $STX_HA_DIR/service-mgmt/sm-common-${STX_SM_COMMON_VERSION}
+    pushd $STX_HA_DIR/service-mgmt/sm-common
 
     make clean
 
@@ -307,7 +307,7 @@ function install_sm_client {
 
 # This should only be things needed to build other things (libs, headers, etc)
 function install_sm_common_libs {
-    pushd $STX_HA_DIR/service-mgmt/sm-common-${STX_SM_COMMON_VERSION}
+    pushd $STX_HA_DIR/service-mgmt/sm-common
 
     build_sm_common
 
@@ -336,7 +336,7 @@ function install_sm_common_libs {
 }
 
 function install_sm_common {
-    pushd $STX_HA_DIR/service-mgmt/sm-common-${STX_SM_COMMON_VERSION}
+    pushd $STX_HA_DIR/service-mgmt/sm-common
 
     install_sm_common_libs
 
diff --git a/service-mgmt/sm-common-1.0.0/LICENSE b/service-mgmt/sm-common/LICENSE
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/LICENSE
rename to service-mgmt/sm-common/LICENSE
diff --git a/service-mgmt/sm-common-1.0.0/Makefile b/service-mgmt/sm-common/Makefile
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/Makefile
rename to service-mgmt/sm-common/Makefile
diff --git a/service-mgmt/sm-common-1.0.0/centos/build_srpm.data b/service-mgmt/sm-common/centos/build_srpm.data
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/centos/build_srpm.data
rename to service-mgmt/sm-common/centos/build_srpm.data
diff --git a/service-mgmt/sm-common-1.0.0/centos/sm-common.spec b/service-mgmt/sm-common/centos/sm-common.spec
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/centos/sm-common.spec
rename to service-mgmt/sm-common/centos/sm-common.spec
diff --git a/service-mgmt/sm-common-1.0.0/scripts/Makefile b/service-mgmt/sm-common/scripts/Makefile
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/scripts/Makefile
rename to service-mgmt/sm-common/scripts/Makefile
diff --git a/service-mgmt/sm-common-1.0.0/scripts/sm-eru b/service-mgmt/sm-common/scripts/sm-eru
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/scripts/sm-eru
rename to service-mgmt/sm-common/scripts/sm-eru
diff --git a/service-mgmt/sm-common-1.0.0/scripts/sm-eru.conf b/service-mgmt/sm-common/scripts/sm-eru.conf
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/scripts/sm-eru.conf
rename to service-mgmt/sm-common/scripts/sm-eru.conf
diff --git a/service-mgmt/sm-common-1.0.0/scripts/sm-eru.service b/service-mgmt/sm-common/scripts/sm-eru.service
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/scripts/sm-eru.service
rename to service-mgmt/sm-common/scripts/sm-eru.service
diff --git a/service-mgmt/sm-common-1.0.0/scripts/sm-watchdog b/service-mgmt/sm-common/scripts/sm-watchdog
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/scripts/sm-watchdog
rename to service-mgmt/sm-common/scripts/sm-watchdog
diff --git a/service-mgmt/sm-common-1.0.0/scripts/sm-watchdog.conf b/service-mgmt/sm-common/scripts/sm-watchdog.conf
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/scripts/sm-watchdog.conf
rename to service-mgmt/sm-common/scripts/sm-watchdog.conf
diff --git a/service-mgmt/sm-common-1.0.0/scripts/sm-watchdog.service b/service-mgmt/sm-common/scripts/sm-watchdog.service
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/scripts/sm-watchdog.service
rename to service-mgmt/sm-common/scripts/sm-watchdog.service
diff --git a/service-mgmt/sm-common-1.0.0/src/Makefile b/service-mgmt/sm-common/src/Makefile
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/Makefile
rename to service-mgmt/sm-common/src/Makefile
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_debug.c b/service-mgmt/sm-common/src/sm_debug.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_debug.c
rename to service-mgmt/sm-common/src/sm_debug.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_debug.h b/service-mgmt/sm-common/src/sm_debug.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_debug.h
rename to service-mgmt/sm-common/src/sm_debug.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_debug_thread.c b/service-mgmt/sm-common/src/sm_debug_thread.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_debug_thread.c
rename to service-mgmt/sm-common/src/sm_debug_thread.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_debug_thread.h b/service-mgmt/sm-common/src/sm_debug_thread.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_debug_thread.h
rename to service-mgmt/sm-common/src/sm_debug_thread.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_eru_db.c b/service-mgmt/sm-common/src/sm_eru_db.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_eru_db.c
rename to service-mgmt/sm-common/src/sm_eru_db.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_eru_db.h b/service-mgmt/sm-common/src/sm_eru_db.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_eru_db.h
rename to service-mgmt/sm-common/src/sm_eru_db.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_eru_dump.c b/service-mgmt/sm-common/src/sm_eru_dump.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_eru_dump.c
rename to service-mgmt/sm-common/src/sm_eru_dump.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_eru_main.c b/service-mgmt/sm-common/src/sm_eru_main.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_eru_main.c
rename to service-mgmt/sm-common/src/sm_eru_main.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_eru_process.c b/service-mgmt/sm-common/src/sm_eru_process.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_eru_process.c
rename to service-mgmt/sm-common/src/sm_eru_process.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_eru_process.h b/service-mgmt/sm-common/src/sm_eru_process.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_eru_process.h
rename to service-mgmt/sm-common/src/sm_eru_process.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_hw.c b/service-mgmt/sm-common/src/sm_hw.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_hw.c
rename to service-mgmt/sm-common/src/sm_hw.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_hw.h b/service-mgmt/sm-common/src/sm_hw.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_hw.h
rename to service-mgmt/sm-common/src/sm_hw.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_limits.h b/service-mgmt/sm-common/src/sm_limits.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_limits.h
rename to service-mgmt/sm-common/src/sm_limits.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_list.h b/service-mgmt/sm-common/src/sm_list.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_list.h
rename to service-mgmt/sm-common/src/sm_list.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_netlink.c b/service-mgmt/sm-common/src/sm_netlink.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_netlink.c
rename to service-mgmt/sm-common/src/sm_netlink.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_netlink.h b/service-mgmt/sm-common/src/sm_netlink.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_netlink.h
rename to service-mgmt/sm-common/src/sm_netlink.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_node_stats.c b/service-mgmt/sm-common/src/sm_node_stats.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_node_stats.c
rename to service-mgmt/sm-common/src/sm_node_stats.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_node_stats.h b/service-mgmt/sm-common/src/sm_node_stats.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_node_stats.h
rename to service-mgmt/sm-common/src/sm_node_stats.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_node_utils.c b/service-mgmt/sm-common/src/sm_node_utils.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_node_utils.c
rename to service-mgmt/sm-common/src/sm_node_utils.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_node_utils.h b/service-mgmt/sm-common/src/sm_node_utils.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_node_utils.h
rename to service-mgmt/sm-common/src/sm_node_utils.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_selobj.c b/service-mgmt/sm-common/src/sm_selobj.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_selobj.c
rename to service-mgmt/sm-common/src/sm_selobj.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_selobj.h b/service-mgmt/sm-common/src/sm_selobj.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_selobj.h
rename to service-mgmt/sm-common/src/sm_selobj.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_sha512.c b/service-mgmt/sm-common/src/sm_sha512.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_sha512.c
rename to service-mgmt/sm-common/src/sm_sha512.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_sha512.h b/service-mgmt/sm-common/src/sm_sha512.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_sha512.h
rename to service-mgmt/sm-common/src/sm_sha512.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_thread_health.c b/service-mgmt/sm-common/src/sm_thread_health.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_thread_health.c
rename to service-mgmt/sm-common/src/sm_thread_health.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_thread_health.h b/service-mgmt/sm-common/src/sm_thread_health.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_thread_health.h
rename to service-mgmt/sm-common/src/sm_thread_health.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_time.c b/service-mgmt/sm-common/src/sm_time.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_time.c
rename to service-mgmt/sm-common/src/sm_time.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_time.h b/service-mgmt/sm-common/src/sm_time.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_time.h
rename to service-mgmt/sm-common/src/sm_time.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_timer.c b/service-mgmt/sm-common/src/sm_timer.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_timer.c
rename to service-mgmt/sm-common/src/sm_timer.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_timer.h b/service-mgmt/sm-common/src/sm_timer.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_timer.h
rename to service-mgmt/sm-common/src/sm_timer.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_trap.c b/service-mgmt/sm-common/src/sm_trap.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_trap.c
rename to service-mgmt/sm-common/src/sm_trap.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_trap.h b/service-mgmt/sm-common/src/sm_trap.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_trap.h
rename to service-mgmt/sm-common/src/sm_trap.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_trap_thread.c b/service-mgmt/sm-common/src/sm_trap_thread.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_trap_thread.c
rename to service-mgmt/sm-common/src/sm_trap_thread.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_trap_thread.h b/service-mgmt/sm-common/src/sm_trap_thread.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_trap_thread.h
rename to service-mgmt/sm-common/src/sm_trap_thread.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_types.c b/service-mgmt/sm-common/src/sm_types.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_types.c
rename to service-mgmt/sm-common/src/sm_types.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_types.h b/service-mgmt/sm-common/src/sm_types.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_types.h
rename to service-mgmt/sm-common/src/sm_types.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_util_types.c b/service-mgmt/sm-common/src/sm_util_types.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_util_types.c
rename to service-mgmt/sm-common/src/sm_util_types.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_util_types.h b/service-mgmt/sm-common/src/sm_util_types.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_util_types.h
rename to service-mgmt/sm-common/src/sm_util_types.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_utils.c b/service-mgmt/sm-common/src/sm_utils.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_utils.c
rename to service-mgmt/sm-common/src/sm_utils.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_utils.h b/service-mgmt/sm-common/src/sm_utils.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_utils.h
rename to service-mgmt/sm-common/src/sm_utils.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_uuid.c b/service-mgmt/sm-common/src/sm_uuid.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_uuid.c
rename to service-mgmt/sm-common/src/sm_uuid.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_uuid.h b/service-mgmt/sm-common/src/sm_uuid.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_uuid.h
rename to service-mgmt/sm-common/src/sm_uuid.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_watchdog_main.c b/service-mgmt/sm-common/src/sm_watchdog_main.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_watchdog_main.c
rename to service-mgmt/sm-common/src/sm_watchdog_main.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_watchdog_module.c b/service-mgmt/sm-common/src/sm_watchdog_module.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_watchdog_module.c
rename to service-mgmt/sm-common/src/sm_watchdog_module.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_watchdog_module.h b/service-mgmt/sm-common/src/sm_watchdog_module.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_watchdog_module.h
rename to service-mgmt/sm-common/src/sm_watchdog_module.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_watchdog_nfs.c b/service-mgmt/sm-common/src/sm_watchdog_nfs.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_watchdog_nfs.c
rename to service-mgmt/sm-common/src/sm_watchdog_nfs.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_watchdog_nfs.h b/service-mgmt/sm-common/src/sm_watchdog_nfs.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_watchdog_nfs.h
rename to service-mgmt/sm-common/src/sm_watchdog_nfs.h
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_watchdog_process.c b/service-mgmt/sm-common/src/sm_watchdog_process.c
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_watchdog_process.c
rename to service-mgmt/sm-common/src/sm_watchdog_process.c
diff --git a/service-mgmt/sm-common-1.0.0/src/sm_watchdog_process.h b/service-mgmt/sm-common/src/sm_watchdog_process.h
similarity index 100%
rename from service-mgmt/sm-common-1.0.0/src/sm_watchdog_process.h
rename to service-mgmt/sm-common/src/sm_watchdog_process.h