Update naming following flexgrid specification

- set EFFECTIVE_BITS_VALUE to 768
- update data file samples, unit tests and functional tests
with this new value
- rename NB_CHANNELS to NB_OCTECTS as it's relevant in flexgrid
- remove FixedFridConstant as there is no more specific value

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: Ib6ad813fd8d3efbbba5b9c65aca6c1455081c573

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedGridConstant.java b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedGridConstant.java
deleted file mode 100644 (file)
index b93553d..0000000
--- a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/FixedGridConstant.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright © 2020 Orange, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.transportpce.common.fixedflex;
-
-/**
- * Constant class related to fixed grid.
- * @author Orange
- *
- */
-public final class FixedGridConstant {
-
-    private FixedGridConstant() {
-    }
-
-    public static final double GRANULARITY = 6.25;
-    public static final int EFFECTIVE_BITS = 8;
-    public static final double START_EDGE_FREQUENCY = 191.325;
-    public static final int NB_CHANNELS = 96;
-
-}

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
index b8366d7759e8ab450424d0be1e618c4c62ae7dbf..d3f98f5d75f9bca80f90ea33a5f20db2321f69c7 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridConstant.java
@@ -17,6 +17,10 @@ public final class GridConstant {
     public static final String C_BAND = "cband";
     public static final int AVAILABLE_SLOT_VALUE = 255;
     public static final int USED_SLOT_VALUE = 0;
+    public static final double GRANULARITY = 6.25;
+    public static final int EFFECTIVE_BITS = 768;
+    public static final double START_EDGE_FREQUENCY = 191.325;
+    public static final int NB_OCTECTS = 96;
 
     private GridConstant() {
     }

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java
index ca3d09548449d659f605f16e373325cd74cb57b4..9c150f24520669991aa22d34731aa85729b0f5cd 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/fixedflex/GridUtils.java
@@ -29,13 +29,13 @@ public final class GridUtils {
     }
 
     public static Map<AvailFreqMapsKey, AvailFreqMaps> initFreqMaps4FixedGrid2Available() {
-        byte[] byteArray = new byte[FixedGridConstant.NB_CHANNELS];
+        byte[] byteArray = new byte[GridConstant.NB_OCTECTS];
         Arrays.fill(byteArray, (byte) GridConstant.AVAILABLE_SLOT_VALUE);
         Map<AvailFreqMapsKey, AvailFreqMaps> waveMap = new HashMap<>();
         AvailFreqMaps availFreqMaps = new AvailFreqMapsBuilder().setMapName(GridConstant.C_BAND)
-                .setFreqMapGranularity(new FrequencyGHz(BigDecimal.valueOf(FixedGridConstant.GRANULARITY)))
-                .setStartEdgeFreq(new FrequencyTHz(BigDecimal.valueOf(FixedGridConstant.START_EDGE_FREQUENCY)))
-                .setEffectiveBits(Uint16.valueOf(FixedGridConstant.EFFECTIVE_BITS))
+                .setFreqMapGranularity(new FrequencyGHz(BigDecimal.valueOf(GridConstant.GRANULARITY)))
+                .setStartEdgeFreq(new FrequencyTHz(BigDecimal.valueOf(GridConstant.START_EDGE_FREQUENCY)))
+                .setEffectiveBits(Uint16.valueOf(GridConstant.EFFECTIVE_BITS))
                 .setFreqMap(byteArray)
                 .build();
         waveMap.put(availFreqMaps.key(), availFreqMaps);

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWaveLengthServiceFreeTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWaveLengthServiceFreeTest.java
index 16bc041068af5ba57ab617b929f2279065991b82..86a45818b9b28f16174a0c217a596f390aa471ea 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWaveLengthServiceFreeTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWaveLengthServiceFreeTest.java
@@ -25,7 +25,6 @@ import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
 import org.opendaylight.transportpce.common.fixedflex.FixedFlexImpl;
-import org.opendaylight.transportpce.common.fixedflex.FixedGridConstant;
 import org.opendaylight.transportpce.common.fixedflex.GridConstant;
 import org.opendaylight.transportpce.networkmodel.util.WaveLengthServiceUtils;
 import org.opendaylight.transportpce.networkmodel.util.test.PathDescriptionUtils;
@@ -94,16 +93,14 @@ public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest {
         FixedFlexImpl fixedFlex = new FixedFlexImpl();
         fixedFlex = fixedFlex.getFixedFlexWaveMapping(WAVE_LENGTH);
 
-        byte[] byteArray = new byte[FixedGridConstant.NB_CHANNELS * FixedGridConstant.EFFECTIVE_BITS];
+        byte[] byteArray = new byte[GridConstant.NB_OCTECTS];
         Arrays.fill(byteArray, (byte) GridConstant.USED_SLOT_VALUE);
-        for (int i = 152;i <= 159;i++) {
-            byteArray[i] = (byte) GridConstant.AVAILABLE_SLOT_VALUE;
-        }
+        byteArray[19] = (byte) GridConstant.AVAILABLE_SLOT_VALUE;
         Map<AvailFreqMapsKey, AvailFreqMaps> waveMap = new HashMap<>();
         AvailFreqMaps availFreqMaps = new AvailFreqMapsBuilder().setMapName(GridConstant.C_BAND)
-                .setFreqMapGranularity(new FrequencyGHz(BigDecimal.valueOf(FixedGridConstant.GRANULARITY)))
-                .setStartEdgeFreq(new FrequencyTHz(BigDecimal.valueOf(FixedGridConstant.START_EDGE_FREQUENCY)))
-                .setEffectiveBits(Uint16.valueOf(FixedGridConstant.EFFECTIVE_BITS))
+                .setFreqMapGranularity(new FrequencyGHz(BigDecimal.valueOf(GridConstant.GRANULARITY)))
+                .setStartEdgeFreq(new FrequencyTHz(BigDecimal.valueOf(GridConstant.START_EDGE_FREQUENCY)))
+                .setEffectiveBits(Uint16.valueOf(GridConstant.EFFECTIVE_BITS))
                 .setFreqMap(byteArray)
                 .build();
         waveMap.put(availFreqMaps.key(), availFreqMaps);

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWaveLengthServiceUseTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWaveLengthServiceUseTest.java
index 0b7e2bae335335f2b96700c5307d0661cfc771a4..23e35fe16aee75516e347ac4234bd738508afa82 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWaveLengthServiceUseTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelWaveLengthServiceUseTest.java
@@ -24,7 +24,6 @@ import org.junit.runners.Parameterized;
 import org.opendaylight.transportpce.common.StringConstants;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
-import org.opendaylight.transportpce.common.fixedflex.FixedGridConstant;
 import org.opendaylight.transportpce.common.fixedflex.GridConstant;
 import org.opendaylight.transportpce.networkmodel.util.WaveLengthServiceUtils;
 import org.opendaylight.transportpce.networkmodel.util.test.PathDescriptionUtils;
@@ -103,16 +102,14 @@ public class NetworkModelWaveLengthServiceUseTest extends AbstractTest {
             .setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder()).build())
             .setXpdrPortAttributes((new XpdrPortAttributesBuilder()).build());
 
-        byte[] byteArray = new byte[FixedGridConstant.NB_CHANNELS * FixedGridConstant.EFFECTIVE_BITS];
+        byte[] byteArray = new byte[GridConstant.NB_OCTECTS];
         Arrays.fill(byteArray, (byte) GridConstant.USED_SLOT_VALUE);
-        for (int i = 152;i <= 159;i++) {
-            byteArray[i] = (byte) GridConstant.AVAILABLE_SLOT_VALUE;
-        }
+        byteArray[19] = (byte) GridConstant.AVAILABLE_SLOT_VALUE;
         Map<AvailFreqMapsKey, AvailFreqMaps> waveMap = new HashMap<>();
         AvailFreqMaps availFreqMaps = new AvailFreqMapsBuilder().setMapName(GridConstant.C_BAND)
-                .setFreqMapGranularity(new FrequencyGHz(BigDecimal.valueOf(FixedGridConstant.GRANULARITY)))
-                .setStartEdgeFreq(new FrequencyTHz(BigDecimal.valueOf(FixedGridConstant.START_EDGE_FREQUENCY)))
-                .setEffectiveBits(Uint16.valueOf(FixedGridConstant.EFFECTIVE_BITS))
+                .setFreqMapGranularity(new FrequencyGHz(BigDecimal.valueOf(GridConstant.GRANULARITY)))
+                .setStartEdgeFreq(new FrequencyTHz(BigDecimal.valueOf(GridConstant.START_EDGE_FREQUENCY)))
+                .setEffectiveBits(Uint16.valueOf(GridConstant.EFFECTIVE_BITS))
                 .setFreqMap(byteArray)
                 .build();
         waveMap.put(availFreqMaps.key(), availFreqMaps);

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java
index 28bcb263df936ac6274c741290b15d9a2b31934c..9ca2a5d9ad7ad9a95c4fdf85e97a29bec65c7c1e 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopologyTest.java
@@ -38,7 +38,6 @@ import org.mockito.stubbing.Answer;
 import org.opendaylight.mdsal.common.api.CommitInfo;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.transportpce.common.fixedflex.FixedGridConstant;
 import org.opendaylight.transportpce.common.fixedflex.GridConstant;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
@@ -277,8 +276,8 @@ public class OpenRoadmTopologyTest {
         List<AvailFreqMaps> availFreqMapsValues = new ArrayList<>(node.augmentation(
             org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Node1.class)
             .getDegreeAttributes().getAvailFreqMaps().values());
-        assertEquals(FixedGridConstant.NB_CHANNELS, availFreqMapsValues.get(0).getFreqMap().length);
-        byte[] byteArray = new byte[FixedGridConstant.NB_CHANNELS];
+        assertEquals(GridConstant.NB_OCTECTS, availFreqMapsValues.get(0).getFreqMap().length);
+        byte[] byteArray = new byte[GridConstant.NB_OCTECTS];
         Arrays.fill(byteArray, (byte) GridConstant.AVAILABLE_SLOT_VALUE);
         assertEquals(Arrays.toString(byteArray), Arrays.toString(availFreqMapsValues.get(0).getFreqMap()));
         List<TerminationPoint> tps = node.augmentation(
@@ -307,8 +306,8 @@ public class OpenRoadmTopologyTest {
         List<AvailFreqMaps> availFreqMapsValues = new ArrayList<>(node.augmentation(
                 org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev200529.Node1.class)
                 .getSrgAttributes().getAvailFreqMaps().values());
-        assertEquals(FixedGridConstant.NB_CHANNELS, availFreqMapsValues.get(0).getFreqMap().length);
-        byte[] byteArray = new byte[FixedGridConstant.NB_CHANNELS];
+        assertEquals(GridConstant.NB_OCTECTS, availFreqMapsValues.get(0).getFreqMap().length);
+        byte[] byteArray = new byte[GridConstant.NB_OCTECTS];
         Arrays.fill(byteArray, (byte) GridConstant.AVAILABLE_SLOT_VALUE);
         assertEquals(Arrays.toString(byteArray), Arrays.toString(availFreqMapsValues.get(0).getFreqMap()));
         List<TerminationPoint> tps = node.augmentation(

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
index f753196dad65148c99059f69c3d189385f7edc7c..ebb8767481499bc45ff11dfc5468ca099a60ce43 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNode.java
@@ -14,7 +14,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.TreeMap;
-import org.opendaylight.transportpce.common.fixedflex.FixedGridConstant;
 import org.opendaylight.transportpce.common.fixedflex.GridConstant;
 import org.opendaylight.transportpce.pce.SortPortsByName;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1;
@@ -146,7 +145,7 @@ public class PceOpticalNode implements PceNode {
                 break;
             case XPONDER :
                 // HARD CODED 96
-                for (long i = 1; i <= FixedGridConstant.NB_CHANNELS; i++) {
+                for (long i = 1; i <= GridConstant.NB_OCTECTS; i++) {
                     this.availableWLindex.add(i);
                 }
                 break;

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
index c4c10386aa90e9dfc9f727df8e776dd5489ec3f2..a9b7d007eed05ac72ce64456f5c811c6763007da 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOpticalNodeTest.java
@@ -16,7 +16,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.transportpce.common.fixedflex.FixedGridConstant;
 import org.opendaylight.transportpce.common.fixedflex.GridConstant;
 import org.opendaylight.transportpce.common.fixedflex.GridUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
@@ -277,14 +276,14 @@ public class PceOpticalNodeTest extends AbstractTest {
     }
 
     private DegreeAttributes getDegAttributes() {
-        byte[] byteArray = new byte[FixedGridConstant.NB_CHANNELS];
+        byte[] byteArray = new byte[GridConstant.NB_OCTECTS];
         Arrays.fill(byteArray, (byte) GridConstant.USED_SLOT_VALUE);
         byteArray[7] = (byte) GridConstant.AVAILABLE_SLOT_VALUE;
         Map<AvailFreqMapsKey, AvailFreqMaps> waveMap = new HashMap<>();
         AvailFreqMaps availFreqMaps = new AvailFreqMapsBuilder().setMapName(GridConstant.C_BAND)
-                .setFreqMapGranularity(new FrequencyGHz(BigDecimal.valueOf(FixedGridConstant.GRANULARITY)))
-                .setStartEdgeFreq(new FrequencyTHz(BigDecimal.valueOf(FixedGridConstant.START_EDGE_FREQUENCY)))
-                .setEffectiveBits(Uint16.valueOf(FixedGridConstant.EFFECTIVE_BITS))
+                .setFreqMapGranularity(new FrequencyGHz(BigDecimal.valueOf(GridConstant.GRANULARITY)))
+                .setStartEdgeFreq(new FrequencyTHz(BigDecimal.valueOf(GridConstant.START_EDGE_FREQUENCY)))
+                .setEffectiveBits(Uint16.valueOf(GridConstant.EFFECTIVE_BITS))
                 .setFreqMap(byteArray)
                 .build();
         waveMap.put(availFreqMaps.key(), availFreqMaps);

diff --git a/tests/sample_configs/NW-for-test-5-4.xml b/tests/sample_configs/NW-for-test-5-4.xml
index a6da041d619ee688f314e3d8f147f157146a1f22..1a1f1086aae892af20e71f3f14a2375b329708fc 100644 (file)
--- a/tests/sample_configs/NW-for-test-5-4.xml
+++ b/tests/sample_configs/NW-for-test-5-4.xml
@@ -11,7 +11,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>s>
@@ -29,7 +29,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -47,7 +47,7 @@
         <map-name>cband</map-name>
         <start-edge-freq>191.325</start-edge-freq>
         <freq-map-granularity>6.25</freq-map-granularity>
-        <effective-bits>8</effective-bits>
+        <effective-bits>768</effective-bits>
         <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         </freq-map>
       </avail-freq-maps>
@@ -62,7 +62,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -165,7 +165,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -183,7 +183,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -201,7 +201,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -216,7 +216,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -319,7 +319,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -337,7 +337,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -355,7 +355,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -370,7 +370,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -473,7 +473,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -491,7 +491,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -509,7 +509,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -524,7 +524,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -627,7 +627,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -645,7 +645,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -663,7 +663,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -678,7 +678,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -781,7 +781,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -799,7 +799,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -817,7 +817,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -832,7 +832,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -935,7 +935,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -953,7 +953,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -971,7 +971,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>>
@@ -986,7 +986,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>>
@@ -1089,7 +1089,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1107,7 +1107,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1125,7 +1125,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1140,7 +1140,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AP////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1243,7 +1243,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1261,7 +1261,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1279,7 +1279,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1294,7 +1294,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1397,7 +1397,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1415,7 +1415,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1433,7 +1433,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1448,7 +1448,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>>
@@ -1551,7 +1551,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1569,7 +1569,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1587,7 +1587,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1602,7 +1602,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1705,7 +1705,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1723,7 +1723,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1741,7 +1741,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1756,7 +1756,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1859,7 +1859,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1877,7 +1877,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1895,7 +1895,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1910,7 +1910,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>>
@@ -2013,7 +2013,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2031,7 +2031,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2049,7 +2049,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2064,7 +2064,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2167,7 +2167,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2185,7 +2185,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>>
@@ -2203,7 +2203,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2218,7 +2218,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2321,7 +2321,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2339,7 +2339,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>s>
@@ -2357,7 +2357,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2372,7 +2372,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2475,7 +2475,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2493,7 +2493,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2511,7 +2511,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2526,7 +2526,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2629,7 +2629,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2647,7 +2647,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2665,7 +2665,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2680,7 +2680,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2783,7 +2783,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2801,7 +2801,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2819,7 +2819,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2834,7 +2834,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2937,7 +2937,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2955,7 +2955,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2973,7 +2973,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -2988,7 +2988,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>

diff --git a/tests/sample_configs/NW-simple-topology.xml b/tests/sample_configs/NW-simple-topology.xml
index 2149db018d7c5d857042f6a9ee74cc8df72e8ad2..39f777b42a5490980b0fee4be135cc8620847851 100644 (file)
--- a/tests/sample_configs/NW-simple-topology.xml
+++ b/tests/sample_configs/NW-simple-topology.xml
@@ -15,7 +15,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -37,7 +37,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -59,7 +59,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -74,7 +74,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -206,7 +206,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -228,7 +228,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -250,7 +250,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -265,7 +265,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -390,7 +390,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -412,7 +412,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -434,7 +434,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -449,7 +449,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -574,7 +574,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -596,7 +596,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -618,7 +618,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -633,7 +633,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -758,7 +758,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -780,7 +780,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -802,7 +802,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -817,7 +817,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -942,7 +942,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -964,7 +964,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -986,7 +986,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1001,7 +1001,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1126,7 +1126,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1148,7 +1148,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1170,7 +1170,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1185,7 +1185,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1310,7 +1310,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>s>
@@ -1332,7 +1332,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1354,7 +1354,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1369,7 +1369,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAA/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1494,7 +1494,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1516,7 +1516,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1538,7 +1538,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1553,7 +1553,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1678,7 +1678,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1700,7 +1700,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1722,7 +1722,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>
@@ -1737,7 +1737,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>AAAAAAAAAAD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
                 </freq-map>
             </avail-freq-maps>

diff --git a/tests/sample_configs/gnpy/openroadmTopology.json b/tests/sample_configs/gnpy/openroadmTopology.json
index d5bbc405a786a166888073e44aaff9a7a2aefd3b..47835d8a4d275c068e7826d2edb60abfd7441dda 100644 (file)
--- a/tests/sample_configs/gnpy/openroadmTopology.json
+++ b/tests/sample_configs/gnpy/openroadmTopology.json
@@ -1327,7 +1327,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1371,7 +1371,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1415,7 +1415,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1490,7 +1490,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1534,7 +1534,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1578,7 +1578,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1622,7 +1622,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1697,7 +1697,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1741,7 +1741,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1785,7 +1785,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1829,7 +1829,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1873,7 +1873,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1948,7 +1948,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -1992,7 +1992,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -2036,7 +2036,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -2111,7 +2111,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -2155,7 +2155,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -2199,7 +2199,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]
@@ -2243,7 +2243,7 @@
                                 "map-name": "cband",
                                 "start-edge-freq": 191.325,
                                 "freq-map-granularity": 6.25,
-                                "effective-bits": 8,
+                                "effective-bits": 768,
                                 "freq-map":"/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                             }
                         ]

diff --git a/tests/sample_configs/honeynode-topo.xml b/tests/sample_configs/honeynode-topo.xml
index d17ae48ace377b2115cfe53f53cc2b89fd5b0f28..5d8c513f6ccc42984164131fad1055e72aa6ba25 100644 (file)
--- a/tests/sample_configs/honeynode-topo.xml
+++ b/tests/sample_configs/honeynode-topo.xml
@@ -354,7 +354,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 </freq-map>
             </avail-freq-maps>s>
@@ -386,7 +386,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 </freq-map>
             </avail-freq-maps>s>
@@ -417,7 +417,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 </freq-map>
             </avail-freq-maps>s>
@@ -506,7 +506,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 </freq-map>
             </avail-freq-maps>s>
@@ -570,7 +570,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 </freq-map>
             </avail-freq-maps>s>
@@ -633,7 +633,7 @@
                 <map-name>cband</map-name>
                 <start-edge-freq>191.325</start-edge-freq>
                 <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>8</effective-bits>
+                <effective-bits>768</effective-bits>
                 <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                 </freq-map>
             </avail-freq-maps>s>

diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py
index 759fdbaa0f2161ac30dbf795281586adcb787904..42bb94e5580a7cb6423133aa9eb00a29d2713071 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test_end2end.py
@@ -339,7 +339,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         for ele in liste_tp:
             if ele['tp-id'] == 'DEG1-CTP-TXRX':
                 self.assertIn({u'map-name': 'cband', u'freq-map-granularity': 6.25, u'start-edge-freq': 191.325,
-                               u'effective-bits': 8, u'freq-map': INDEX_1_USED_FREQ_MAP},
+                               u'effective-bits': 768, u'freq-map': INDEX_1_USED_FREQ_MAP},
                               ele['org-openroadm-network-topology:'
                                   'ctp-attributes'][
                                   'avail-freq-maps'])
@@ -499,7 +499,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         for ele in liste_tp:
             if ele['tp-id'] == 'DEG1-CTP-TXRX':
                 self.assertIn({u'map-name': 'cband', u'freq-map-granularity': 6.25, u'start-edge-freq': 191.325,
-                               u'effective-bits': 8, u'freq-map': INDEX_1_2_USED_FREQ_MAP},
+                               u'effective-bits': 768, u'freq-map': INDEX_1_2_USED_FREQ_MAP},
                               ele['org-openroadm-network-topology:'
                                   'ctp-attributes'][
                                   'avail-freq-maps'])

diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py
index 56f1e36324fc437c27ea7cdf4f7bc4c4d2ad2124..a0a2f2b373265e4456e57ebc06d7799124b221db 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_end2end.py
@@ -317,7 +317,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         for ele in liste_tp:
             if ele['tp-id'] == 'DEG2-CTP-TXRX':
                 self.assertIn({u'map-name': 'cband', u'freq-map-granularity': 6.25, u'start-edge-freq': 191.325,
-                               u'effective-bits': 8, u'freq-map': INDEX_1_USED_FREQ_MAP},
+                               u'effective-bits': 768, u'freq-map': INDEX_1_USED_FREQ_MAP},
                               ele['org-openroadm-network-topology:'
                                   'ctp-attributes'][
                                   'avail-freq-maps'])
@@ -461,7 +461,7 @@ class TransportPCEFulltesting(unittest.TestCase):
         for ele in liste_tp:
             if ele['tp-id'] == 'DEG2-CTP-TXRX':
                 self.assertIn({u'map-name': 'cband', u'freq-map-granularity': 6.25, u'start-edge-freq': 191.325,
-                               u'effective-bits': 8, u'freq-map': INDEX_1_2_USED_FREQ_MAP},
+                               u'effective-bits': 768, u'freq-map': INDEX_1_2_USED_FREQ_MAP},
                               ele['org-openroadm-network-topology:'
                                   'ctp-attributes'][
                                   'avail-freq-maps'])

diff --git a/tests/transportpce_tests/2.2.1/test_otn_end2end.py b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
index 71091d284962864f47c74506d1016766f8cf2ac1..b6b6533a7646e13a26f2ab0ac5e00247559e05fc 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test_otn_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test_otn_end2end.py
@@ -402,7 +402,7 @@ class TransportPCEtesting(unittest.TestCase):
         for ele in liste_tp:
             if ele['tp-id'] == 'DEG2-CTP-TXRX':
                 self.assertIn({u'map-name': 'cband', u'freq-map-granularity': 6.25, u'start-edge-freq': 191.325,
-                               u'effective-bits': 8, u'freq-map': INDEX_1_USED_FREQ_MAP},
+                               u'effective-bits': 768, u'freq-map': INDEX_1_USED_FREQ_MAP},
                               ele['org-openroadm-network-topology:ctp-attributes']['avail-freq-maps'])
             if ele['tp-id'] == 'DEG2-TTP-TXRX':
                 self.assertIn({u'index': 1, u'frequency': 196.1,