Fix nextRange for request

nextRange has to be stored in the new ranges_v2 entries when legacy2 is
configured.

Additionally, the serialDN and requestDN are not used to identify the
entry for next range with legacy2.

Author: fmarco76

base/server/cmscore/src/com/netscape/cmscore/dbs/DBSubsystem.java

@@ -106,6 +106,7 @@ public class DBSubsystem implements IDBSubsystem {
     private static final String PROP_REQUEST_INCREMENT = "requestIncrement";
     private static final String PROP_REQUEST_BASEDN = "requestDN";
     private static final String PROP_REQUEST_RANGE_DN = "requestRangeDN";
+    private static final String PROP_REQUEST_ID_GENERATOR = "request.id.generator";
 
     private static final String PROP_MIN_REPLICA_NUMBER = "beginReplicaNumber";
     private static final String PROP_MAX_REPLICA_NUMBER = "endReplicaNumber";
@@ -497,8 +498,8 @@ public BigInteger getNextRange2(int repo, int radix) {
         try {
             Hashtable<String, String> h = mRepos[repo];
             conn = mLdapConnFactory.getConn();
-            String dn = h.get(PROP_BASEDN) + "," + mBaseDN;
             String rangeDN = h.get(PROP_RANGE_DN) + "," + mBaseDN;
+            String dn = rangeDN; 
 
             CMS.debug("DBSubsystem: retrieving " + dn);
             LDAPEntry entry = conn.read(dn);
@@ -711,6 +712,9 @@ public void init(ISubsystem owner, IConfigStore config)
             requests.put(PROP_INCREMENT, mDBConfig.getString(
                     PROP_REQUEST_INCREMENT, PROP_INFINITE_REQUEST_NUMBER));
 
+            requests.put(PROP_GENERATOR, mDBConfig.getString(
+                    PROP_REQUEST_ID_GENERATOR, "legacy"));
+
             mRepos[REQUESTS] = requests;
 
             // populate replica ID hash entry

base/server/cmscore/src/com/netscape/cmscore/dbs/Repository.java

@@ -576,7 +576,7 @@ public void checkRanges() throws EBaseException {
 
         if ((numsAvail.compareTo(mLowWaterMarkNo) < 0) && (!CMS.isPreOpMode())) {
             CMS.debug("Repository: Requesting next range");
-            if (idGenerator == IDGenerator.LEGACY_2 && mRadix == 16) {
+            if (idGenerator == IDGenerator.LEGACY_2) {
                 mNextMinSerialNo = mDB.getNextRange2(mRepo, mRadix);
                 CMS.debug("Repository: next range: " + mNextMinSerialNo.toString(mRadix));
             } else {

base/server/python/pki/server/__init__.py

@@ -1209,7 +1209,6 @@ def update_serial_number_range_generator(self, generator):
             )
 
         self.config.update({'dbs.serialRangeDN': 'ou=%s,ou=%s'%('certificateRepository', 'ranges_v2')})
-        self.config.update({'dbs.serialDN': 'ou=%s,ou=%s'%('certificateRepository', 'ranges_v2')})
         con.close()
 
     def update_request_number_range_generator(self, generator):
@@ -1259,7 +1258,6 @@ def update_request_number_range_generator(self, generator):
                 ]
             )
         self.config.update({'dbs.requestRangeDN': 'ou=%s,ou=%s'%('requests', 'ranges_v2')})
-        self.config.update({'dbs.requestDN': 'ou=%s,ou=%s'%('requests', 'ranges_v2')})
         con.close()
 
     def create_ranges_entry(self, con, base_dn, new_ranges, range_object):

base/server/python/pki/server/deployment/scriptlets/configuration.py

@@ -1062,7 +1062,6 @@ def spawn(self, deployer):
         if subsystem.name == 'ca':
             if deployer.mdict['pki_cert_id_generator'] == 'legacy2':
                 subsystem.config['dbs.cert.id.generator'] = 'legacy2'
-                subsystem.config['dbs.serialDN'] = 'ou=certificateRepository,ou=ranges_v2'
                 subsystem.config['dbs.serialRangeDN'] = 'ou=certificateRepository,ou=ranges_v2'
                 subsystem.config['dbs.cert.id.generator'] = 'legacy2'
                 subsystem.config['dbs.serialIncrement'] = '0x10000000'
@@ -1077,7 +1076,6 @@ def spawn(self, deployer):
                 subsystem.save()
             if deployer.mdict['pki_request_id_generator'] == 'legacy2':
                 subsystem.config['dbs.request.id.generator'] = 'legacy2'
-                subsystem.config['dbs.requestDN'] = 'ou=requests,ou=ranges_v2'
                 subsystem.config['dbs.requestRangeDN'] = 'ou=requests,ou=ranges_v2'
                 subsystem.save()