Permalink
Browse files

wizards: updated wizards so generated code is up to date now.

  • Loading branch information...
1 parent d95ae26 commit c55b625116192deae7411772c4d1249070f3bdd7 @rhornig rhornig committed Aug 7, 2012
@@ -7,9 +7,9 @@ ${bannerComment}
// parametric: ${parametric?string}
// static: ${static?string}
-import inet.networklayer.autorouting.FlatNetworkConfigurator;
-import inet.nodes.adhoc.MobileHost;
-import inet.world.ChannelControl;
+import inet.networklayer.autorouting.ipv4.IPv4NetworkConfigurator;
+import inet.nodes.inet.AdhocHost;
+import inet.world.radio.ChannelControl;
network ${targetTypeName}
@@ -18,35 +18,30 @@ network ${targetTypeName}
<#if parametric>
int numHosts;
</#if>
- double playgroundSizeX;
- double playgroundSizeY;
-
submodules:
<#if parametric>
- host[numHosts]: MobileHost
+ host[numHosts]: AdhocHost
{
parameters:
@display("r=,,#707070");
}
<#else>
<#list 0..numOfHosts?number-1 as i>
- host${i}: MobileHost
+ host${i}: AdhocHost
{
parameters:
@display("r=,,#707070");
}
</#list>
</#if>
- channelcontrol: ChannelControl
+ channelControl: ChannelControl
{
parameters:
- playgroundSizeX = playgroundSizeX;
- playgroundSizeY = playgroundSizeY;
@display("p=60,50");
}
- configurator: FlatNetworkConfigurator
+ configurator: IPv4NetworkConfigurator
{
@display("p=140,50");
}
@@ -14,53 +14,54 @@ network = ${targetTypeName}
num-rngs = 3
**.mobility.rng-0 = 1
-**.wlan.mac.rng-0 = 2
+**.wlan[*].mac.rng-0 = 2
#debug-on-errors = true
tkenv-plugin-path = ../../../etc/plugins
-*.playgroundSizeX = 600
-*.playgroundSizeY = 400
-**.debug = true
-**.coreDebug = false
-**.${host_all}.**.channelNumber = 0
+**.channelNumber = 0
# channel physical parameters
-*.channelcontrol.carrierFrequency = 2.4GHz
-*.channelcontrol.pMax = 2.0mW
-*.channelcontrol.sat = -110dBm
-*.channelcontrol.alpha = 2
-*.channelcontrol.numChannels = 1
+*.channelControl.carrierFrequency = 2.4GHz
+*.channelControl.pMax = 2.0mW
+*.channelControl.sat = -110dBm
+*.channelControl.alpha = 2
+*.channelControl.numChannels = 1
# mobility
-**.${host_all}.mobility.x = -1
-**.${host_all}.mobility.y = -1
-
-**.${host_all}.mobilityType = "inet.mobility.MassMobility"
-**.${host_all}.mobility.changeInterval = truncnormal(2s, 0.5s)
-**.${host_all}.mobility.changeAngleBy = normal(0deg, 30deg)
-**.${host_all}.mobility.speed = truncnormal(20mps, 8mps)
-**.${host_all}.mobility.updateInterval = 100ms
+**.${host_all}.mobilityType = "MassMobility"
+**.mobility.constraintAreaMinZ = 0m
+**.mobility.constraintAreaMaxZ = 0m
+**.mobility.constraintAreaMinX = 0m
+**.mobility.constraintAreaMinY = 0m
+**.mobility.constraintAreaMaxX = 600m
+**.mobility.constraintAreaMaxY = 400m
+**.mobility.changeInterval = truncnormal(2s, 0.5s)
+**.mobility.changeAngleBy = normal(0deg, 30deg)
+**.mobility.speed = truncnormal(20mps, 8mps)
+**.mobility.updateInterval = 100ms
# ping app (${host_0} pinged by others)
-*.${host_0}.pingApp.destAddr = ""
-*.${host_all}.pingApp.destAddr = "${host_0}"
-**.pingApp.startTime = uniform(1s,5s)
+*.${host_0}.pingApp[0].destAddr = ""
+*.${host_all}.numPingApps = 1
+*.${host_all}.pingApp[0].destAddr = "${host_0}"
+*.${host_all}.pingApp[0].startTime = uniform(1s,5s)
+*.${host_all}.pingApp[0].printPing = true
# nic settings
-**.wlan.mgmt.frameCapacity = 10
-**.wlan.mac.address = "auto"
-**.wlan.mac.maxQueueSize = 14
-**.wlan.mac.rtsThresholdBytes = 3000B
-**.wlan.mac.bitrate = 2Mbps
-**.wlan.mac.retryLimit = 7
-**.wlan.mac.cwMinData = 7
-**.wlan.mac.cwMinBroadcast = 31
+**.wlan[*].bitrate = 2Mbps
+
+**.wlan[*].mgmt.frameCapacity = 10
+**.wlan[*].mac.address = "auto"
+**.wlan[*].mac.maxQueueSize = 14
+**.wlan[*].mac.rtsThresholdBytes = 3000B
+**.wlan[*].mac.retryLimit = 7
+**.wlan[*].mac.cwMinData = 7
+**.wlan[*].mac.cwMinMulticast = 31
-**.wlan.radio.bitrate = 2Mbps
-**.wlan.radio.transmitterPower = 2mW
-**.wlan.radio.thermalNoise = -110dBm
-**.wlan.radio.sensitivity = -85mW
-**.wlan.radio.pathLossAlpha = 2
-**.wlan.radio.snirThreshold = 4dB
+**.wlan[*].radio.transmitterPower = 2mW
+**.wlan[*].radio.thermalNoise = -110dBm
+**.wlan[*].radio.sensitivity = -85dBm
+**.wlan[*].radio.pathLossAlpha = 2
+**.wlan[*].radio.snirThreshold = 4dB
@@ -9,14 +9,16 @@ package ${nedPackageName};
<#assign inetX = "inet">
<#assign hostModule = "StandardHost">
<#assign routerModule = "Router">
- <#assign configuratorModule = "FlatNetworkConfigurator">
+ <#assign configuratorModule = "IPv4NetworkConfigurator">
+import inet.networklayer.autorouting.ipv4.${configuratorModule};
</#if>
<#if ipv6Layer>
<#assign inetX = "ipv6">
<#assign hostModule = "StandardHost6">
<#assign routerModule = "Router6">
<#assign configuratorModule = "FlatNetworkConfigurator6">
+import inet.networklayer.autorouting.ipv6.${configuratorModule};
</#if>
<#if (numClients?number <= 3) >
@@ -25,7 +27,6 @@ package ${nedPackageName};
<#assign srvXpos = 10+numClients?number*30>
</#if>
-import inet.networklayer.autorouting.${configuratorModule};
import inet.nodes.${inetX}.${routerModule};
import inet.nodes.${inetX}.${hostModule};
import ned.DatarateChannel;
@@ -35,9 +36,7 @@ network ${targetTypeName}
types:
channel Channel extends DatarateChannel
{
-<#if ipv4Layer>
datarate = 100Mbps;
-</#if>
delay = 0.1us;
}
@@ -68,19 +67,9 @@ network ${targetTypeName}
}
</#list>
-<#if ipv4Layer>
- connections:
- server.pppg++ <--> Channel <--> router.pppg++;
- <#list 1..numClients?number as i>
- client${i}.pppg++ <--> Channel <--> router.pppg++;
- </#list>
-</#if>
-
-<#if ipv6Layer>
connections:
server.ethg++ <--> Channel <--> router.ethg++;
<#list 1..numClients?number as i>
client${i}.ethg++ <--> Channel <--> router.ethg++;
</#list>
-</#if>
}
@@ -1,13 +1,8 @@
-<#if ipv4Layer>
- <#assign startTime = 0.1>
-</#if>
-<#if ipv6Layer>
- <#assign startTime = 3>
-</#if>
+<#assign startTime = 0.1>
[General]
network = ${targetTypeName}
-total-stack = 7MB
+total-stack = 7MiB
tkenv-plugin-path = ../../../etc/plugins
#debug-on-errors = true
#record-eventlog = true
@@ -17,36 +12,36 @@ tkenv-plugin-path = ../../../etc/plugins
<#if tcpTraffic>
# TCP Traffic Configuration:
-**.server*.tcpType = "${serverTcpLayer}" # TCP/TCP_old/TCP_NSC
-**.client*.tcpType = "${clientTcpLayer}" # TCP/TCP_old/TCP_NSC
+**.server*.tcpType = "${serverTcpLayer}" # "TCP", "TCP_lwIP", "TCP_NSC"
+**.client*.tcpType = "${clientTcpLayer}" # "TCP", "TCP_lwIP", "TCP_NSC"
<#assign appIdx = 0 >
<#if tcpDataTraffic>
-**.server*.tcpAppType = "TCPEchoApp" #//TODO must set only tcpApp[${appIdx}]
+**.server*.tcpApp[${appIdx}].typename = "TCPEchoApp" #//TODO must set only tcpApp[${appIdx}]
**.server*.tcpApp[${appIdx}].address = ""
-**.server*.tcpApp[${appIdx}].port = 1000
+**.server*.tcpApp[${appIdx}].localPort = 1000
**.server*.tcpApp[${appIdx}].echoFactor = 2.0
**.server*.tcpApp[${appIdx}].echoDelay = 0
-**.client*.tcpAppType = "TCPSessionApp" #//TODO must set only tcpApp[${appIdx}]
+**.client*.tcpApp[${appIdx}].typename = "TCPSessionApp" #//TODO must set only tcpApp[${appIdx}]
**.client*.tcpApp[${appIdx}].active = true
**.client*.tcpApp[${appIdx}].address = ""
-**.client*.tcpApp[${appIdx}].port = -1
+**.client*.tcpApp[${appIdx}].localPort = -1
**.client*.tcpApp[${appIdx}].connectAddress = "server"
**.client*.tcpApp[${appIdx}].connectPort = 1000
**.client*.tcpApp[${appIdx}].tOpen = ${startTime}s
**.client*.tcpApp[${appIdx}].tSend = ${startTime+0.1}s
-**.client*.tcpApp[${appIdx}].sendBytes = 100MB
+**.client*.tcpApp[${appIdx}].sendBytes = 100MiB
**.client*.tcpApp[${appIdx}].sendScript = ""
**.client*.tcpApp[${appIdx}].tClose = 0
<#assign appIdx = appIdx + 1 >
</#if>
<#if telnetTraffic>
# tcp apps
-**.client*.tcpAppType = "TelnetApp" #//TODO must set only tcpApp[${appIdx}]
+**.client*.tcpApp[${appIdx}].typename = "TelnetApp" #//TODO must set only tcpApp[${appIdx}]
**.client*.tcpApp[${appIdx}].address = ""
-**.client*.tcpApp[${appIdx}].port = 23
+**.client*.tcpApp[${appIdx}].localPort = 23
#IP address intentionally set incorrectly
**.client*.tcpApp[${appIdx}].connectAddress = "server"
**.client*.tcpApp[${appIdx}].connectPort = 1000
@@ -59,34 +54,13 @@ tkenv-plugin-path = ../../../etc/plugins
**.client*.tcpApp[${appIdx}].idleInterval = truncnormal(3600s,1200s)
**.client*.tcpApp[${appIdx}].reconnectInterval = 30s
-**.server*.tcpAppType = "TCPGenericSrvApp" #//TODO must set only tcpApp[${appIdx}]
+**.server*.tcpApp[${appIdx}].typename = "TCPGenericSrvApp" #//TODO must set only tcpApp[${appIdx}]
**.server*.tcpApp[${appIdx}].address = ""
-**.server*.tcpApp[${appIdx}].port = -1
+**.server*.tcpApp[${appIdx}].localPort = 1000
**.server*.tcpApp[${appIdx}].replyDelay = 0
<#assign appIdx = appIdx + 1 >
</#if>
-# tcp settings for TCP / TCP_old
-<#if serverTcpLayer == "TCP" || serverTcpLayer == "TCP_old" >
-<#if telnetTraffic>
-**.server*.tcp.sendQueueClass = "TCPMsgBasedSendQueue"
-**.server*.tcp.receiveQueueClass = "TCPMsgBasedRcvQueue"
-<#else>
-#**.server*.tcp.sendQueueClass = "TCPVirtualDataSendQueue"
-#**.server*.tcp.receiveQueueClass = "TCPVirtualDataRcvQueue"
-</#if>
-</#if>
-
-<#if clientTcpLayer == "TCP" || clientTcpLayer == "TCP_old" >
-<#if telnetTraffic>
-**.client*.tcp.sendQueueClass = "TCPMsgBasedSendQueue"
-**.client*.tcp.receiveQueueClass = "TCPMsgBasedRcvQueue"
-<#else>
-#**.client*.tcp.sendQueueClass = "TCPVirtualDataSendQueue"
-#**.client*.tcp.receiveQueueClass = "TCPVirtualDataRcvQueue"
-</#if>
-</#if>
-
**.server*.numTcpApps = ${appIdx}
**.client*.numTcpApps = ${appIdx}
# end of TCP Traffic Configuration
@@ -96,14 +70,14 @@ tkenv-plugin-path = ../../../etc/plugins
# Video Stream UDP Traffic Configuration:
**.server*.numUdpApps = 1
-**.server*.udpAppType = "UDPVideoStreamSvr"
-**.server*.udpApp[*].videoSize = 100MB
-**.server*.udpApp[*].serverPort = 3088
-**.server*.udpApp[*].waitInterval = 10ms
+**.server*.udpApp[*].typename = "UDPVideoStreamSvr"
+**.server*.udpApp[*].videoSize = 100MiB
+**.server*.udpApp[*].localPort = 3088
+**.server*.udpApp[*].sendInterval = 10ms
**.server*.udpApp[*].packetLen = 1000B
**.client*.numUdpApps = 1
-**.client*.udpAppType = "UDPVideoStreamCli"
+**.client*.udpApp[*].typename = "UDPVideoStreamCli"
**.client*.udpApp[*].serverAddress = "server"
**.client*.udpApp[*].localPort = 9999
**.client*.udpApp[*].serverPort = 3088
@@ -114,30 +88,30 @@ tkenv-plugin-path = ../../../etc/plugins
<#if pingTraffic>
# ping app (server pinged by others)
-**.server*.pingApp.destAddr = ""
-**.client*.pingApp.destAddr = "server"
-**.client*.pingApp.interval = 50ms
-**.client*.pingApp.startTime = ${startTime}s
+**.client*.numPingApps = 1
+**.client*.pingApp[*].destAddr = "server"
+**.client*.pingApp[*].sendInterval = 50ms
+**.client*.pingApp[*].startTime = ${startTime}s
+**.client*.pingApp[*].printPing = true
</#if>
<#if sctpTraffic && ipv4Layer>
# SCTP Traffic Configuration:
**.server*.numSctpApps = 1
-**.server*.sctpAppType = "SCTPServer"
+**.server*.sctpApp[*].typename = "SCTPServer"
**.server*.sctpApp[0].address = ""
-**.server*.sctpApp[0].port = 1000
+**.server*.sctpApp[0].localPort = 1000
**.server*.sctpApp[0].numPacketsToReceivePerClient = 30
**.server*.sctpApp[0].echoFactor = 0
**.client*.numSctpApps = 1
-**.client*.sctpAppType = "SCTPClient"
+**.client*.sctpApp[*].typename = "SCTPClient"
**.client*.sctpApp[0].address = ""
**.client*.sctpApp[0].connectAddress = "server"
**.client*.sctpApp[0].primaryPath = "server"
-**.client*.sctpApp[0].port = -1
+**.client*.sctpApp[0].localPort = -1
**.client*.sctpApp[0].connectPort = 1000
-**.client*.sctpApp[0].startTime = exponential(0.1s)
**.client*.sctpApp[0].numRequestsPerSession = 30
**.client*.sctpApp[0].requestLength = 1000
**.client*.sctpApp[0].thinkTime = exponential(0.1s)
@@ -147,19 +121,7 @@ tkenv-plugin-path = ../../../etc/plugins
# end of SCTP Traffic Configuration
</#if>
-<#if ipv4Layer>
-# ppp NIC configuration
-**.ppp[*].queueType = "DropTailQueue" # in routers
-**.ppp[*].queue.frameCapacity = 10 # in routers
-</#if>
-
-<#if ipv6Layer>
# ip settings
# Ethernet NIC configuration
**.eth[*].queueType = "DropTailQueue" # in routers
-**.eth[*].queue.frameCapacity = 10 # in routers
-
-**.eth[*].mac.txrate = 10Mbps
-**.eth[*].mac.duplexEnabled = true
-</#if>
Oops, something went wrong.

0 comments on commit c55b625

Please sign in to comment.