projects
/
osm
/
vim-emu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #89 from mpeuster/master
[osm/vim-emu.git]
/
src
/
emuvim
/
examples
/
resource_model_demo_topology.py
diff --git
a/src/emuvim/examples/resource_model_demo_topology.py
b/src/emuvim/examples/resource_model_demo_topology.py
index
7a39b00
..
2dd58ea
100644
(file)
--- a/
src/emuvim/examples/resource_model_demo_topology.py
+++ b/
src/emuvim/examples/resource_model_demo_topology.py
@@
-10,7
+10,7
@@
from mininet.node import Controller
from emuvim.dcemulator.net import DCNetwork
from emuvim.api.zerorpc.compute import ZeroRpcApiEndpoint
from emuvim.api.sonata import SonataDummyGatekeeperEndpoint
from emuvim.dcemulator.net import DCNetwork
from emuvim.api.zerorpc.compute import ZeroRpcApiEndpoint
from emuvim.api.sonata import SonataDummyGatekeeperEndpoint
-from emuvim.dcemulator.resourcemodel.upb.simple import UpbSimpleCloudDcRM
+from emuvim.dcemulator.resourcemodel.upb.simple import UpbSimpleCloudDcRM
, UpbOverprovisioningCloudDcRM
logging.basicConfig(level=logging.INFO)
logging.basicConfig(level=logging.INFO)
@@
-32,7
+32,7
@@
def create_topology1():
# create and assign resource models for each DC
rm1 = UpbSimpleCloudDcRM(max_cu=4, max_mu=1024)
# create and assign resource models for each DC
rm1 = UpbSimpleCloudDcRM(max_cu=4, max_mu=1024)
- rm2 = Upb
SimpleCloudDcRM(max_cu=6
)
+ rm2 = Upb
OverprovisioningCloudDcRM(max_cu=4
)
dc1.assignResourceModel(rm1)
dc2.assignResourceModel(rm2)
dc1.assignResourceModel(rm1)
dc2.assignResourceModel(rm2)
@@
-43,13
+43,6
@@
def create_topology1():
# run API endpoint server (in another thread, don't block)
zapi1.start()
# run API endpoint server (in another thread, don't block)
zapi1.start()
- # add the SONATA dummy gatekeeper to each DC
- sdkg1 = SonataDummyGatekeeperEndpoint("0.0.0.0", 8000)
- sdkg1.connectDatacenter(dc1)
- sdkg1.connectDatacenter(dc2)
- # run the dummy gatekeeper (in another thread, don't block)
- sdkg1.start()
-
# start the emulation platform
net.start()
print "Wait a moment and allocate some compute start some compute resources..."
# start the emulation platform
net.start()
print "Wait a moment and allocate some compute start some compute resources..."
@@
-58,6
+51,8
@@
def create_topology1():
dc1.startCompute("vnf2", flavor_name="tiny")
dc1.startCompute("vnf3", flavor_name="small")
dc2.startCompute("vnf4", flavor_name="medium")
dc1.startCompute("vnf2", flavor_name="tiny")
dc1.startCompute("vnf3", flavor_name="small")
dc2.startCompute("vnf4", flavor_name="medium")
+ dc2.startCompute("vnf5", flavor_name="medium")
+ dc2.startCompute("vnf6", flavor_name="medium")
print "... done."
time.sleep(5)
print "Removing instances ..."
print "... done."
time.sleep(5)
print "Removing instances ..."