Merge pull request #533 from tasleson/led_slots_api_add

Led slots API add
libstorage · May 7, 2024 · 5b1d9da · 5b1d9da
2 parents f53d135 + b46f8a7
commit 5b1d9da
Show file tree

Hide file tree

Showing 34 changed files with 1,787 additions and 1,013 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,34 +3,59 @@ jobs:
   fedora:
     docker:
       - image: fedora
+    environment:
+      GHURL: << pipeline.project.git_url >>
+      GHBR: << pipeline.git.branch >>
     steps:
-      - checkout
       - run:
-         command: ./test/docker_ci_test.sh
+         command:  dnf install -y git dnf-plugins-core
+         no_output_timeout: 5m
+      - run:
+         command:  dnf copr enable -y tasleson/ledmon-upstream
+         no_output_timeout: 5m
+      - run:
+         command: git clone $GHURL
+         no_output_timeout: 5m
+      - run:
+         command: cd libstoragemgmt && git checkout $GHBR && ./test/docker_ci_test.sh
          no_output_timeout: 20m
   el7:
     docker:
       - image: centos:7
+    environment:
+      GHURL: << pipeline.project.git_url >>
+      GHBR: << pipeline.git.branch >>
     steps:
-      - checkout
       - run:
-         command: ./test/docker_ci_test.sh
+         command:  yum install -y git  yum-plugin-copr
+         no_output_timeout: 20m
+      - run:
+         command:  yum copr enable -y tasleson/ledmon-upstream
+         no_output_timeout: 20m
+      - run:
+         command: git clone $GHURL
+         no_output_timeout: 5m
+      - run:
+         command: cd libstoragemgmt && git checkout $GHBR && ./test/docker_ci_test.sh
          no_output_timeout: 20m
   el8:
     docker:
       - image: oraclelinux:8
+    environment:
+      GHURL: << pipeline.project.git_url >>
+      GHBR: << pipeline.git.branch >>
     steps:
-      - checkout
       - run:
-         command: ./test/docker_ci_test.sh
-         no_output_timeout: 20m
-  ubuntu:
-    docker:
-      - image: ubuntu:22.04
-    steps:
-      - checkout
+         command:  dnf install -y git dnf-plugins-core
+         no_output_timeout: 5m
+      - run:
+         command:  dnf copr enable -y tasleson/ledmon-upstream
+         no_output_timeout: 5m
+      - run:
+         command: git clone $GHURL
+         no_output_timeout: 5m
       - run:
-         command: ./test/docker_ci_test.sh
+         command: cd libstoragemgmt && git checkout $GHBR && ./test/docker_ci_test.sh
          no_output_timeout: 20m
 
 workflows:
@@ -40,4 +65,3 @@ workflows:
     - fedora
     - el7
     - el8
-    - ubuntu
diff --git a/.packit.yaml → .disable.packit.yaml b/.packit.yaml → .disable.packit.yaml
@@ -28,6 +28,9 @@ jobs:
   - centos-stream-8-x86_64
   - rhel-8-x86_64
   - rhel-9-x86_64
+  additional_repos:
+    - copr://tasleson/ledmon-upstream
+
 
 srpm_build_deps:
 - wget
@@ -49,3 +52,4 @@ srpm_build_deps:
 - sqlite-devel
 - glib2-devel
 - valgrind
+- ledmon-devel
diff --git a/c_binding/Makefile.am b/c_binding/Makefile.am
@@ -3,18 +3,19 @@ SUBDIRS = include
 AM_CPPFLAGS = 	-I$(top_srcdir)/c_binding/include \
 				-I$(top_builddir)/c_binding/include \
 				$(LIBGLIB_CFLAGS) \
-				$(LIBUDEV_CFLAGS)
+				$(LIBUDEV_CFLAGS) \
+				$(LIBLED_CFLAGS)
 
 lib_LTLIBRARIES = libstoragemgmt.la
 
-libstoragemgmt_la_LIBADD=$(LIBXML_LIBS) $(LIBGLIB_LIBS) $(LIBUDEV_LIBS)
+libstoragemgmt_la_LIBADD=$(LIBXML_LIBS) $(LIBGLIB_LIBS) $(LIBUDEV_LIBS) $(LIBLED_LIBS)
 
 libstoragemgmt_la_LDFLAGS= -version-info $(LIBSM_LIBTOOL_VERSION)
 libstoragemgmt_la_SOURCES= \
 	lsm_mgmt.cpp lsm_datatypes.hpp lsm_datatypes.cpp lsm_convert.hpp \
 	lsm_convert.cpp lsm_ipc.hpp lsm_ipc.cpp lsm_plugin_ipc.hpp \
 	lsm_plugin_ipc.cpp uri_parser.hpp \
-	utils.c utils.h libsg.c libsg.h lsm_local_disk.c libses.c libses.h \
+	utils.c utils.h libsg.c libsg.h lsm_local_disk.cpp \
 	libata.c libata.h libsas.c libsas.h libfc.c libfc.h \
 	libiscsi.c libiscsi.h libnvme.c libnvme.h
 

diff --git a/c_binding/include/libstoragemgmt/libstoragemgmt_error.h b/c_binding/include/libstoragemgmt/libstoragemgmt_error.h
@@ -81,6 +81,9 @@ typedef enum {
     /** NFS export not found */
     LSM_ERR_NOT_FOUND_NFS_EXPORT = 206,
 
+    /** Some resource not found, non-specific, added in 1.10 */
+    LSM_ERR_NOT_FOUND_GENERIC = 207,
+
     /** System not found */
     LSM_ERR_NOT_FOUND_SYSTEM = 208,
     /** Disk not found */
@@ -109,7 +112,7 @@ typedef enum {
     /** Insufficient space */
     LSM_ERR_NOT_ENOUGH_SPACE = 350,
 
-    /** Error comunicating with plug-in */
+    /** Error communicating with plug-in */
     LSM_ERR_TRANSPORT_COMMUNICATION = 400,
     /** Transport serialization error */
     LSM_ERR_TRANSPORT_SERIALIZATION = 401,
@@ -118,7 +121,7 @@ typedef enum {
 
     LSM_ERR_LAST_INIT_IN_ACCESS_GROUP = 502,
 
-    /** Unsupport search key */
+    /** Unsupported search key */
     LSM_ERR_UNSUPPORTED_SEARCH_KEY = 510,
 
     LSM_ERR_EMPTY_ACCESS_GROUP = 511,