chabisik/icds
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mise a jour

Browse source
This commit is contained in:
Abdel Kader Chabi Sika Boni 2021-01-02 01:17:09 +01:00
parent 943fcddb4b
commit 1cb3e33f14
3 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Dockerfiles/forContainerNet/bootserver/bootstrap_server.py
View file

@ -36,8 +36,8 @@ DEV = "--local_ip 127.0.0.1​ --local_port 9001 --local_name %s --remote_
''' '''
@app.route("/getmyconfig/<string:my_ip>") @app.route("/getmyconfig/<string:my_ip>")
def configurations_giver(my_ip): def configurations_giver(my_ip="127.0.0.1"):
configs = {"local_ip":"127.0.0.1", "verdict":"oops"} configs = {"local_ip":my_ip, "verdict":"oops"}
if my_ip==SVR_IP: if my_ip==SVR_IP:
configs["local_port"] = 8080 configs["local_port"] = 8080
configs["local_name"] = "srv" configs["local_name"] = "srv"
@ -146,7 +146,7 @@ def configurations_giver(my_ip):
@app.route("/getmyconfig/") @app.route("/getmyconfig/")
def configurations_giver_to_dc(): def configurations_giver_to_dc():
configs = {"local_ip":"127.0.0.1", "verdict":"yes"} configs = {"local_ip":GWI2_IP, "verdict":"yes"}
configs["local_port"] = 8181 configs["local_port"] = 8181
configs["local_name"] = "gwi2" configs["local_name"] = "gwi2"
configs["remote_ip"] = SVR_IP configs["remote_ip"] = SVR_IP

3
topologie/topology.py
View file

@ -144,6 +144,9 @@ def create_topology():
s2 = net.addSwitch('s2') s2 = net.addSwitch('s2')
s3 = net.addSwitch('s3') s3 = net.addSwitch('s3')
s4 = net.addSwitch('s4') s4 = net.addSwitch('s4')
s5 = net.addSwitch('s5')
s6 = net.addSwitch('s6')
s7 = net.addSwitch('s7')
info('*** Creating links\n') info('*** Creating links\n')
net.addLink(btrap, s2) net.addLink(btrap, s2)

23
topologie/topology_test.py
View file

@ -117,17 +117,17 @@ def create_topology():
srv = net.addDocker('srv', ip=SVR_IP, dimage="server:topo", environment={'MY_IP':SVR_IP}) srv = net.addDocker('srv', ip=SVR_IP, dimage="server:topo", environment={'MY_IP':SVR_IP})
info('*** Adding topology intermediary gateway\n') info('*** Adding topology intermediary gateway\n')
#gwi1 = net.addDocker('gwi1', ip=GWI1_IP, dimage="gateway:topo", environment={'MY_IP':GWI1_IP}) gwi1 = net.addDocker('gwi1', ip=GWI1_IP, dimage="gateway:topo", environment={'MY_IP':GWI1_IP})
info('*** Adding topology final gateways\n') info('*** Adding topology final gateways\n')
#gwf1 = net.addDocker('gwf1', ip=GWF1_IP, dimage="gateway:topo", environment={'MY_IP':GWF1_IP}) gwf1 = net.addDocker('gwf1', ip=GWF1_IP, dimage="gateway:topo", environment={'MY_IP':GWF1_IP})
#gwf2 = net.addDocker('gwf2', ip=GWF2_IP, dimage="gateway:topo", environment={'MY_IP':GWF2_IP}) #gwf2 = net.addDocker('gwf2', ip=GWF2_IP, dimage="gateway:topo", environment={'MY_IP':GWF2_IP})
#gwf3 = net.addDocker('gwf3', ip=GWF3_IP, dimage="gateway:topo", environment={'MY_IP':GWF3_IP}) #gwf3 = net.addDocker('gwf3', ip=GWF3_IP, dimage="gateway:topo", environment={'MY_IP':GWF3_IP})
info('*** Adding 1st final gateway devices\n') info('*** Adding 1st final gateway devices\n')
#dev1gwf1 = net.addDocker('dev1gwf1', ip=DEV1_GWF1_IP, dimage="device:topo", environment={'MY_IP':DEV1_GWF1_IP}) dev1gwf1 = net.addDocker('dev1gwf1', ip=DEV1_GWF1_IP, dimage="device:topo", environment={'MY_IP':DEV1_GWF1_IP})
#dev2gwf1 = net.addDocker('dev2gwf1', ip=DEV2_GWF1_IP, dimage="device:topo", environment={'MY_IP':DEV2_GWF1_IP}) dev2gwf1 = net.addDocker('dev2gwf1', ip=DEV2_GWF1_IP, dimage="device:topo", environment={'MY_IP':DEV2_GWF1_IP})
#dev3gwf1 = net.addDocker('dev3gwf1', ip=DEV3_GWF1_IP, dimage="device:topo", environment={'MY_IP':DEV3_GWF1_IP}) dev3gwf1 = net.addDocker('dev3gwf1', ip=DEV3_GWF1_IP, dimage="device:topo", environment={'MY_IP':DEV3_GWF1_IP})
info('*** Adding 2nd final gateway devices\n') info('*** Adding 2nd final gateway devices\n')
#dev1gwf2 = net.addDocker('dev1gwf2', ip=DEV1_GWF2_IP, dimage="device:topo", environment={'MY_IP':DEV1_GWF2_IP}) #dev1gwf2 = net.addDocker('dev1gwf2', ip=DEV1_GWF2_IP, dimage="device:topo", environment={'MY_IP':DEV1_GWF2_IP})
@ -144,20 +144,21 @@ def create_topology():
s2 = net.addSwitch('s2') s2 = net.addSwitch('s2')
s3 = net.addSwitch('s3') s3 = net.addSwitch('s3')
s4 = net.addSwitch('s4') s4 = net.addSwitch('s4')
s5 = net.addSwitch('s5')
info('*** Creating links\n') info('*** Creating links\n')
net.addLink(btrap, s2) net.addLink(btrap, s2)
net.addLink(s1, s2) net.addLink(s1, s2)
net.addLink(s1, srv) net.addLink(s1, srv)
#net.addLink(gwi1, s2) net.addLink(gwi1, s2)
#net.addLink(s2, s3) net.addLink(s2, s3)
net.addLink(s2, s4) net.addLink(s2, s4)
#net.addLink(s3, s4) #net.addLink(s3, s4)
net.addLink(dc1, s4) net.addLink(dc1, s4)
#net.addLink(gwf1, s3) net.addLink(gwf1, s3)
#net.addLink(dev1gwf1, gwf1) net.addLink(dev1gwf1, gwf1)
#net.addLink(dev2gwf1, gwf1) net.addLink(dev2gwf1, gwf1)
#net.addLink(dev3gwf1, gwf1) net.addLink(dev3gwf1, gwf1)
#net.addLink(gwf2, s3) #net.addLink(gwf2, s3)
#net.addLink(dev1gwf2, gwf2) #net.addLink(dev1gwf2, gwf2)
#net.addLink(dev2gwf2, gwf2) #net.addLink(dev2gwf2, gwf2)