Yang mgmt - libyang python APIs

rules/libyang.mk

@@ -1,23 +1,32 @@
 # libyang
 
-LIBYANG_VERSION_BASE = 0.16
-LIBYANG_VERSION = $(LIBYANG_VERSION_BASE).105
+LIBYANG_VERSION_BASE = 1.0
+LIBYANG_VERSION = $(LIBYANG_VERSION_BASE).73
 LIBYANG_SUBVERSION = 1
 
 export LIBYANG_VERSION_BASE
 export LIBYANG_VERSION
 export LIBYANG_SUBVERSION
 
-LIBYANG = libyang$(LIBYANG_VERSION_BASE)_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_$(CONFIGURED_ARCH).deb
+LIBYANG = libyang_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb
 $(LIBYANG)_SRC_PATH = $(SRC_PATH)/libyang
 $(LIBYANG)_DEPENDS += $(SWIG_BASE) $(SWIG)
 SONIC_MAKE_DEBS += $(LIBYANG)
 SONIC_STRETCH_DEBS += $(LIBYANG)
 
-LIBYANG_DEV = libyang-dev_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_$(CONFIGURED_ARCH).deb
+LIBYANG_DEV = libyang-dev_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_DEV)))
 
-LIBYANG_DBG = libyang$(LIBYANG_VERSION_BASE)-dbgsym_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION)_$(CONFIGURED_ARCH).deb
+LIBYANG_DBG = libyang-dbg_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb
 $(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_DBG)))
 
-export LIBYANG LIBYANG_DEV LIBYANG_DBG
+LIBYANG_CPP = libyang-cpp_$(LIBYANG_VERSION)_$(CONFIGURED_ARCH).deb
+$(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_CPP)))
+
+LIBYANG_PY3 = python3-yang_$(LIBYANG_VERSION)_amd64.deb
+$(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_PY3)))
+
+LIBYANG_PY2 = python2-yang_$(LIBYANG_VERSION)_amd64.deb
+$(eval $(call add_derived_package,$(LIBYANG),$(LIBYANG_PY2)))
+
+export LIBYANG LIBYANG_DBG LIBYANG_DEV LIBYANG_CPP LIBYANG_PY3 LIBYANG_PY2

src/libyang/Makefile

@@ -2,20 +2,27 @@
 SHELL = /bin/bash
 .SHELLFLAGS += -e
 
+
 MAIN_TARGET = $(LIBYANG)
-DERIVED_TARGETS = $(LIBYANG_DEV) $(LIBYANG_DBG)
+DERIVED_TARGETS = $(LIBYANG_DEV) $(LIBYANG_DBG) $(LIBYANG_PY2) $(LIBYANG_PY3) $(LIBYANG_CPP)
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+        # Obtaining the libyang
 	rm -fr ./libyang-$(LIBYANG_VERSION)
-	wget -O libyang_$(LIBYANG_VERSION).orig.tar.gz                         'https://sonicstorage.blob.core.windows.net/packages/libyang_0.16.105.orig.tar.gz?sv=2015-04-05&sr=b&sig=yTWDhl6B9TTXWAQ46zpLiNxUib61W7U0%2F%2FGvhRibKOc%3D&se=2046-09-30T22%3A10%3A27Z&sp=r'
-	wget -O libyang_$(LIBYANG_VERSION).dsc                                 'https://sonicstorage.blob.core.windows.net/packages/libyang_0.16.105-1.dsc?sv=2015-04-05&sr=b&sig=eLkO5wzB1C5oKNIaUPro4gwrgEC3EygIO6eCyTzHmeI%3D&se=2046-09-30T22%3A10%3A12Z&sp=r'
-	wget -O libyang_$(LIBYANG_VERSION)-$(LIBYANG_SUBVERSION).debian.tar.xz 'https://sonicstorage.blob.core.windows.net/packages/libyang_0.16.105-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=AH18p7pKK0xIBVxZuA8EMv9%2FhXbCFKmbWAn7Za8%2BZW4%3D&se=2046-09-30T22%3A09%3A36Z&sp=r'
-	dpkg-source -x libyang_$(LIBYANG_VERSION).dsc
+	git clone https://github.com/CESNET/libyang.git libyang-$(LIBYANG_VERSION)
+	pushd libyang-$(LIBYANG_VERSION)
+	git checkout tags/v1.0-r4 -b libyang
+	# Apply patch series
+	stg init
+	stg import -s ../patch/series
+	mkdir build
+	pushd build
+	cmake ..
+	make build-deb
 
-	pushd ./libyang-$(LIBYANG_VERSION)
-	dpkg-buildpackage -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)
+	pushd debs
+	mv $* $(DEST)/
+	mv $(DERIVED_TARGETS) $(DEST)/
 	popd
 
-	mv $(DERIVED_TARGETS) $* $(DEST)/
-
 $(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)

src/libyang/patch/libyang.patch

@@ -0,0 +1,136 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa562dd3..8635ba15 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,6 +33,7 @@ set(LIBYANG_MICRO_SOVERSION 2)
+ set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION})
+ set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION})
+
++set(CMAKE_INSTALL_PREFIX /usr)
+ # set default build type if not specified by user
+ if(NOT CMAKE_BUILD_TYPE)
+     set(CMAKE_BUILD_TYPE debug)
+diff --git a/packages/debian.control.in b/packages/debian.control.in
+index da6588b9..fb3ede48 100644
+--- a/packages/debian.control.in
++++ b/packages/debian.control.in
+@@ -53,3 +53,15 @@ Depends: python3-yang@PACKAGE_PART_NAME@ (=@LIBYANG_VERSION@)
+ Section: debug
+ Architecture: any
+ Description: Debug symbols of python3 bidings of libyang library.
++
++Package: python2-yang@PACKAGE_PART_NAME@
++Depends: @PACKAGE_NAME@ (=@LIBYANG_VERSION@), libyang-cpp@PACKAGE_PART_NAME@ (=@LIBYANG_VERSION@)
++Section: libs
++Architecture: any
++Description: Bindings of libyang library to python2 language.
++
++Package: python2-yang@PACKAGE_PART_NAME@-dbg
++Depends: python2-yang@PACKAGE_PART_NAME@ (=@LIBYANG_VERSION@)
++Section: debug
++Architecture: any
++Description: Debug symbols of python2 bidings of libyang library.
+diff --git a/packages/debian.python2-yang.install b/packages/debian.python2-yang.install
+new file mode 100644
+index 00000000..14ce2f3c
+--- /dev/null
++++ b/packages/debian.python2-yang.install
+@@ -0,0 +1 @@
++usr/lib/python2.7/dist-packages/*
+diff --git a/packages/debian.rules.in b/packages/debian.rules.in
+index d565819e..0dff057b 100644
+--- a/packages/debian.rules.in
++++ b/packages/debian.rules.in
+@@ -12,7 +12,10 @@ override_dh_strip:
+ 	dh_strip -ppython3-yang@PACKAGE_PART_NAME@ --dbg-package=python3-yang@PACKAGE_PART_NAME@-dbg
+
+ override_dh_auto_configure:
+-	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String="@BUILD_TYPE@" -DGEN_LANGUAGE_BINDINGS=ON .
++	cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE:String="@BUILD_TYPE@" -DENABLE_LYD_PRIV=ON -DGEN_LANGUAGE_BINDINGS=ON -DGEN_PYTHON_VERSION=2 .
++
++override_dh_makeshlibs:
++	dh_makeshlibs -Xextensions -Xuser_types
+
+ override_dh_auto_test:
+ 	ctest --output-on-failure
+diff --git a/packages/libyang.dsc.in b/packages/libyang.dsc.in
+index fdfa402b..f75ba184 100644
+--- a/packages/libyang.dsc.in
++++ b/packages/libyang.dsc.in
+@@ -1,10 +1,10 @@
+ Format: 3.0 (quilt)
+ Source: @PACKAGE_NAME@
+-Binary: @PACKAGE_NAME@, @PACKAGE_NAME@-dbg, @PACKAGE_NAME@-dev, libyang-cpp@PACKAGE_PART_NAME@, libyang-cpp@PACKAGE_PART_NAME@-dev, libyang-cpp@PACKAGE_PART_NAME@-dbg, python3-yang@PACKAGE_PART_NAME@, python3-yang@PACKAGE_PART_NAME@-dbg
++Binary: @PACKAGE_NAME@, @PACKAGE_NAME@-dbg, @PACKAGE_NAME@-dev, libyang-cpp@PACKAGE_PART_NAME@, libyang-cpp@PACKAGE_PART_NAME@-dev, libyang-cpp@PACKAGE_PART_NAME@-dbg, python3-yang@PACKAGE_PART_NAME@, python3-yang@PACKAGE_PART_NAME@-dbg python2-yang@PACKAGE_PART_NAME@, python2-yang@PACKAGE_PART_NAME@-dbg
+ Maintainer: CESNET <[email protected]>
+ Version: @LIBYANG_VERSION@
+ Architecture: any
+ Standards-Version: 3.8.2
+ Homepage: https://github.com/CESNET/libyang
+ Vcs-Git: https://github.com/CESNET/libyang
+-Build-Depends: debhelper (>= 9), make, gcc, doxygen, cmake, pkg-config, libpcre3-dev, libcmocka-dev, python3-dev, g++, swig (>= 3.0.12)
++Build-Depends: debhelper (>= 9), make, gcc, doxygen, cmake, pkg-config, libpcre3-dev, libcmocka-dev, python3-dev, python2-dev, g++, swig (>= 3.0.12)
+diff --git a/packages/libyang.spec.in b/packages/libyang.spec.in
+index 6a4ac615..24431f1e 100644
+--- a/packages/libyang.spec.in
++++ b/packages/libyang.spec.in
+@@ -48,6 +48,13 @@ BuildRequires:  python34-devel
+ %endif
+ %endif
+
++%if 0%{?suse_version} + 0%{?fedora} > 0
++BuildRequires:  python2-devel
++%else
++BuildRequires:  python2-devel
++%endif
++%endif
++
+ Conflicts: @CONFLICT_PACKAGE_NAME@ = @LIBYANG_MAJOR_VERSION@.@LIBYANG_MINOR_VERSION@
+
+ %package devel
+@@ -70,6 +77,11 @@ Summary:    Binding to python
+ Requires:   libyang-cpp@PACKAGE_PART_NAME@ = %{version}-%{release}
+ Requires:   %{name} = %{version}-%{release}
+
++%package -n python2-yang@PACKAGE_PART_NAME@
++Summary:    Binding to python
++Requires:   libyang-cpp@PACKAGE_PART_NAME@ = %{version}-%{release}
++Requires:   %{name} = %{version}-%{release}
++
+ %description -n libyang-cpp@PACKAGE_PART_NAME@
+ Bindings of libyang library to C++ language.
+
+@@ -80,6 +92,10 @@ Headers of bindings to c++ language.
+ Bindings of libyang library to python language.
+ %endif
+
++%description -n python2-yang@PACKAGE_PART_NAME@
++Bindings of libyang library to python language.
++%endif
++
+ %description devel
+ Headers of libyang library.
+
+@@ -167,4 +183,9 @@ make DESTDIR=%{buildroot} install
+ %{_libdir}/python*
+ %endif
+
++%files -n python2-yang@PACKAGE_PART_NAME@
++%defattr(-,root,root)
++%{_libdir}/python*
++%endif
++
+ %changelog
+diff --git a/packages/local-deb.sh.in b/packages/local-deb.sh.in
+index 057bbc67..61570a46 100755
+--- a/packages/local-deb.sh.in
++++ b/packages/local-deb.sh.in
+@@ -18,7 +18,7 @@ fi
+ cp "@PROJECT_SOURCE_DIR@/packages/debian.libyang-dev.install" debian/@[email protected]
+ cp "@PROJECT_SOURCE_DIR@/packages/debian.libyang-cpp.install" debian/libyang-cpp@[email protected]
+ cp "@PROJECT_SOURCE_DIR@/packages/debian.libyang-cpp-dev.install" debian/libyang-cpp@[email protected]
+-cp "@PROJECT_SOURCE_DIR@/packages/debian.python3-yang.install" debian/python3-yang@[email protected]
++cp "@PROJECT_SOURCE_DIR@/packages/debian.python2-yang.install" debian/python2-yang@[email protected]
+ echo -e "@PACKAGE_NAME@ (@LIBYANG_VERSION@) stable; urgency=low\n" >debian/changelog
+ git log -10 --pretty=format:'  * %s (%aN)%n' 2>/dev/null >>debian/changelog || echo -e "  * unknown changes \n" >>debian/changelog
+ git log -1 --pretty=format:'%n -- %aN <%aE>  %aD%n' >>debian/changelog 2>/dev/null || echo " -- ${USER} <${USER}@`hostname`>  `date -R`" >>debian/changelog

src/libyang/patch/series

@@ -0,0 +1 @@
+libyang.patch

src/sonic-yang-mgmt/yang-models/sonic-acl.yang

@@ -1,4 +1,5 @@
 module sonic-acl {
+        yang-version 1.1;
 
 	namespace "http://github.com/Azure/sonic-acl";
 	prefix acl;