Set the WiFi uplink/LAN to 10Gb/s by default.

profile/profile.py

@@ -299,7 +299,7 @@ pc.defineParameter(
     [(0,"Default"),(100000,"100Mb/s"),(1000000,"1Gb/s"),(10000000,"10Gb/s")],
     longDescription="A specific link speed to use for the high-bandwidth paths (mboss<>fw, fw<>con.  Other fixed node links are 1Gbps.  If you force all fixed nodes to be VMs, the default value for this is 1Gbps; else, 10Gbps.")
 pc.defineParameter(
-    "wifiLinkSpeed","WiFi Uplink Speed",portal.ParameterType.INTEGER,1000000,
+    "wifiLinkSpeed","WiFi Uplink Speed",portal.ParameterType.INTEGER,10000000,
     [(0,"Any"),(100000,"100Mb/s"),(1000000,"1Gb/s"),(10000000,"10Gb/s")],
     longDescription="A specific link speed to use for the wifi uplink.  This value defaults to 1Gbps.")
 pc.defineParameter(
@@ -563,7 +563,8 @@ for aggName in sorted(aggNodes.keys()):
 # these links are from the wifi and mobile routers to the ctlnuc vhosts
 # that host each aggregate.
 #
-for uplink in ["wifi","mobile"]:
+for (uplink,shaping) in [("wifi",[params.wifiLinkSpeed,params.wifiLinkLatency]),
+                         ("mobile",[params.mobileLinkSpeed,params.mobileLinkLatency])]:
     upnode = nodes[uplink]
     upname = upnode.client_id
     if params.aggUplinksAreLANs:
@@ -573,7 +574,7 @@ for uplink in ["wifi","mobile"]:
         for (vhostname,vhost) in agghosts.iteritems():
             viface = vhost.addInterface("if%d" % (nextIfaceNum(vhostname)))
             lanlink.addInterface(viface)
-        applyGenericNetworkSettings(lanlink)
+        applyGenericNetworkSettings(lanlink,*shaping)
         privlinks.append(lanlink)
         ipaPrivate.request_network(lanlink.client_id,len(lanlink.interfaces))
     else:
@@ -583,7 +584,7 @@ for uplink in ["wifi","mobile"]:
             viface = vhost.addInterface("if%d" % (nextIfaceNum(vhostname)))
             lanlink.addInterface(uiface)
             lanlink.addInterface(viface)
-            applyGenericNetworkSettings(lanlink)
+            applyGenericNetworkSettings(lanlink,*shaping)
             privlinks.append(lanlink)
             ipaPrivate.request_network(lanlink.client_id,2)
     pass