new channel size with 800Gbps and 150GHz spacing

my_deploy.sh

@@ -20,7 +20,7 @@
 export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
 
 # Set the list of components, separated by spaces, you want to build images for, and deploy.
-export TFS_COMPONENTS="context device pathcomp opticalcontroller service slice  webui"
+export TFS_COMPONENTS="context device pathcomp opticalcontroller service slice  webui nbi"
 
 # Uncomment to activate Monitoring (old)
 #export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"

src/opticalcontroller/tools.py

@@ -24,13 +24,18 @@ def common_slots(a, b):
     return list(np.intersect1d(a, b))
 
 
-def map_modulation_to_op(mod):
+def map_modulation_to_op(mod, rate):
     if mod == "DP-QPSK":
         return 1
     elif mod == "DP-8QAM":
-        return 4
+        return 2
     elif mod == "DP-16QAM":
-        return 8
+        if rate == 400:
+            return 4
+        elif rate == 800:
+            return 8
+        else:
+            return 18
     elif mod == "DP-32QAM":
         return 10
 
@@ -43,23 +48,23 @@ def map_rate_to_slot(rate):
     if rate == 100:
         mod = "DP-QPSK"
         slots = 4
-        op = map_modulation_to_op(mod)
+        op = map_modulation_to_op(mod, rate)
         return op, slots
     elif rate == 400:
         mod = "DP-8QAM"
-        slots = 4
-        op = map_modulation_to_op(mod)
+        slots = 8 #100GHz
+        op = map_modulation_to_op(mod, rate)
         return op, slots
     elif rate == 800:
         mod = "DP-16QAM"
         #todo: check slot width
-        slots = 8#12 (150GHz)
-        op = map_modulation_to_op(mod)
+        slots = 12 #150GHz
+        op = map_modulation_to_op(mod, rate)
         return op, slots
     elif rate == 1000:
         mod = "DP-32QAM"
         slots = 18
-        op = map_modulation_to_op(mod)
+        op = map_modulation_to_op(mod, rate)
         return op, slots
     else:
         return 2, 5