Skip to content

Modify hello to be an enumration and add a backend #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cminyard wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Modify hello to be an enumration and add a backend #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2febe43
hello: Add a backend file that prints out info
cminyard May 22, 2024
aec77c2
hello: Extend the backend
cminyard May 24, 2024
4e02a4c
hello: use a file for the backend
cminyard May 24, 2024
a70a092
hello: Change the value to an enumeration
cminyard May 24, 2024
20473c9
hello: Update the version of the hello yang file
cminyard May 25, 2024
ebc97d6
hello: Fix the yang filename
cminyard May 28, 2024
6f5f5a2
hello: Add printing of the full xml source and target trees
cminyard May 28, 2024
a998b43
hello: Clean up xml print
cminyard May 28, 2024
6fc2d80
hello: Clean up the hello world example changes
cminyard Jun 5, 2024
90964a5
Fix the revision of the yang module
cminyard Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions hello/src/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,21 @@ CPPFLAGS = @CPPFLAGS@ -fPIC
YANG_INSTALLDIR = $(datadir)/clixon/$(APPNAME)

# Local yang files to install
YANGSPECS = clixon-hello@2019-04-17.yang
YANGSPECS = clixon-hello@2024-05-25.yang

.PHONY: all clean depend install

all:
# Example backend plugin
# There may also be restconf/cli/netconf plugins which are not covered here, see
# eg clixon main example
PLUGIN = $(APPNAME)_backend_plugin.so
PLUGIN_SRC = $(APPNAME)_backend_plugin.c
PLUGIN_OBJ = $(PLUGIN_SRC:%.c=%.o)

all: $(PLUGIN)

$(PLUGIN): $(PLUGIN_OBJ)
$(CC) -Wall -shared $(LDFLAGS) -o $@ -lc $< -lclixon -lclixon_backend

.SUFFIXES: .c .o

Expand All @@ -70,23 +80,26 @@ all:
CLISPECS = $(APPNAME)_cli.cli

clean:
rm -f $(PLUGIN) $(PLUGIN_OBJ)

distclean: clean
rm -f Makefile *~ .depend

install: $(CLISPECS) $(APPNAME).xml autocli.xml
install: $(CLISPECS) $(APPNAME).xml autocli.xml $(PLUGIN)
install -d -m 0755 $(DESTDIR)$(sysconfdir)/clixon
install -d -m 0755 $(DESTDIR)$(sysconfdir)/clixon/$(APPNAME)
install -m 0644 $(APPNAME).xml $(DESTDIR)$(sysconfdir)/clixon
install -m 0644 autocli.xml $(DESTDIR)$(sysconfdir)/clixon/$(APPNAME)
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/clispec
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/backend
install -m 0644 $(CLISPECS) $(DESTDIR)$(libdir)/$(APPNAME)/clispec
install -d -m 0755 $(DESTDIR)$(localstatedir)
install -d -m 0755 $(DESTDIR)$(localstatedir)/$(APPNAME)
install -m 0644 startup_db $(DESTDIR)$(localstatedir)/$(APPNAME)/
install -d -m 0755 $(DESTDIR)$(YANG_INSTALLDIR)
install -m 0644 $(YANGSPECS) $(DESTDIR)$(YANG_INSTALLDIR)
install -m 0644 $(INSTALLFLAGS) $(PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/backend

uninstall:
rm -f $(DESTDIR)$(sysconfdir)/clixon/$(APPNAME).xml
Expand Down
14 changes: 0 additions & 14 deletions hello/src/clixon-hello@2019-04-17.yang
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions hello/src/clixon-hello@2024-05-25.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module clixon-hello {
yang-version 1.1;
namespace "urn:example:hello";
prefix he;
revision 2024-05-25 {
description
"Converted to an enumeration";
}
revision 2019-04-17 {
description
"Clixon hello world example";
}
container hello {
leaf to {
type enumeration {
enum city;
enum state;
enum country;
enum world;
}
description "To whom are we saying hello?";
}
}
}
1 change: 1 addition & 0 deletions hello/src/hello.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<CLICON_YANG_MODULE_MAIN>clixon-hello</CLICON_YANG_MODULE_MAIN>
<CLICON_CLI_MODE>hello</CLICON_CLI_MODE>
<CLICON_CLISPEC_DIR>@LIBDIR@/hello/clispec</CLICON_CLISPEC_DIR>
<CLICON_BACKEND_DIR>@LIBDIR@/hello/backend</CLICON_BACKEND_DIR>
<CLICON_SOCK>@LOCALSTATEDIR@/hello/hello.sock</CLICON_SOCK>
<CLICON_BACKEND_PIDFILE>@LOCALSTATEDIR@/hello/hello.pidfile</CLICON_BACKEND_PIDFILE>
<!-- true here means restconf config is in datastore -->
Expand Down
Loading