From 3c046acae77d4a09ec109ae5ea6f27dbdbb26c21 Mon Sep 17 00:00:00 2001
From: "Francois @fanf42 Armand" <francois.armand@normation.com>
Date: Wed, 9 Oct 2019 16:06:47 +0200
Subject: [PATCH] fixup! Fixes #15903: Impossible to save virtuozzo inventory
 (missing LDAP object)

Fixes #15903: Impossible to save virtuozzo inventory (missing LDAP object)
---
 .../ldap-data/schema/099-0-inventory.ldif     | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/webapp/sources/ldap-inventory/inventory-repository/src/test/resources/ldap-data/schema/099-0-inventory.ldif b/webapp/sources/ldap-inventory/inventory-repository/src/test/resources/ldap-data/schema/099-0-inventory.ldif
index cfc91fe23d8..e651a7d5861 100644
--- a/webapp/sources/ldap-inventory/inventory-repository/src/test/resources/ldap-data/schema/099-0-inventory.ldif
+++ b/webapp/sources/ldap-inventory/inventory-repository/src/test/resources/ldap-data/schema/099-0-inventory.ldif
@@ -323,6 +323,12 @@ attributeTypes: ( 1.3.6.1.4.1.35061.1.1.400.3
   EQUALITY caseIgnoreMatch
   SUBSTR caseIgnoreSubstringsMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
+attributeTypes: ( 1.3.6.1.4.1.35061.1.1.400.3.1
+  NAME 'networkSubnet'
+  DESC 'Network interface subnet'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
 attributeTypes: ( 1.3.6.1.4.1.35061.1.1.400.4
   NAME 'networkInterfaceMacAddress'
   DESC 'Network interface MAC address'
@@ -723,14 +729,29 @@ objectClasses: ( 1.3.6.1.4.1.35061.1.2.80.6
   DESC 'An LPAR partition on AIX'
   SUP VirtualMachine
   AUXILIARY )
-objectClasses: ( 1.3.6.1.4.1.35061.1.2.80
+objectClasses: ( 1.3.6.1.4.1.35061.1.2.80.7
+  NAME 'BSDJail'
+  DESC 'A BSD Jail'
+  SUP VirtualMachine
+  AUXILIARY )
+objectClasses: ( 1.3.6.1.4.1.35061.1.2.80.8
   NAME 'hyperV'
   DESC 'A Hyper-V VM'
   SUP VirtualMachine
   AUXILIARY )
-objectClasses: ( 1.3.6.1.4.1.35061.1.2.80.7
-  NAME 'BSDJail'
-  DESC 'A BSD Jail'
+objectClasses: ( 1.3.6.1.4.1.35061.1.2.80.9
+  NAME 'lxc'
+  DESC 'LXC container'
+  SUP VirtualMachine
+  AUXILIARY )
+objectClasses: ( 1.3.6.1.4.1.35061.1.2.80.10
+  NAME 'virtuozzo'
+  DESC 'Virtuozzo container'
+  SUP VirtualMachine
+  AUXILIARY )
+objectClasses: ( 1.3.6.1.4.1.35061.1.2.80.11
+  NAME 'openvz'
+  DESC 'OpenVZ container'
   SUP VirtualMachine
   AUXILIARY )
 objectClasses: ( 1.3.6.1.4.1.35061.1.2.4
@@ -865,7 +886,7 @@ objectClasses: ( 1.3.6.1.4.1.35061.1.2.20
   STRUCTURAL
   MUST ( networkInterface )
   MAY ( status $ speed $ ipHostNumber $ networkInterfaceMacAddress $
-  networkInterfaceGateway $ ipNetworkNumber $ networkInterfaceDhcpServer $
+  networkInterfaceGateway $ ipNetworkNumber $ networkSubnet $ networkInterfaceDhcpServer $
   networkInterfaceMask $ networkInterfaceType $ networkInterfaceTypeMib) )
 objectClasses: ( 1.3.6.1.4.1.35061.1.2.21
   NAME 'software'