renaming and adding more scripts
diff --git a/scripts/addDPN.sh b/scripts/addDPN.sh
index 18e5e42..8a1d141 100755
--- a/scripts/addDPN.sh
+++ b/scripts/addDPN.sh
@@ -12,7 +12,8 @@
],
"node-id": "node'$1'",
"network-id": "network'$1'",
- "control-protocol": "zmq-dpn-control-protocol"
+ "control-protocol": "zmq-dpn-control-protocol",
+ "abstract": false
}
]
}' 'http://localhost:8181/onos/restconf/data/ietf-dmm-fpcagent:tenants/tenant=default/fpc-topology'
@@ -30,7 +31,8 @@
],
"node-id": "node'$1'",
"network-id": "network'$1'",
- "control-protocol": "zmq-dpn-control-protocol"
+ "control-protocol": "zmq-dpn-control-protocol",
+ "abstract": false
}
]
}' 'http://localhost:8181/onos/restconf/data/ietf-dmm-fpcagent:tenants/tenant='$2'/fpc-topology'
diff --git a/scripts/benchmark.sh b/scripts/benchmark.sh
index 08e90c5..0e2bbc5 100755
--- a/scripts/benchmark.sh
+++ b/scripts/benchmark.sh
@@ -1,10 +1,11 @@
#!/bin/sh
-rm -rf create.log delete.log
-
-./registerClient.sh 1 default &> /dev/null
+echo "Register Client.."
+./registerClient.sh 1 &> /dev/null
+echo "Add DPN.."
./addDPN.sh 1 &> /dev/null
+echo "Running 100 configure create.."
for (( i=1; i<=100; i++)); do
./configure.sh create $i 1 &> /dev/null &
if ! (($i % 10)); then
@@ -14,6 +15,7 @@
wait
+echo "Running 100 configure delete.."
for (( i=1; i<=100; i++)); do
./configure.sh delete $i &> /dev/null &
if ! (($i % 10)); then
@@ -21,5 +23,7 @@
fi
done
+echo "Delete DPN.."
./deleteDPN.sh 1 &> /dev/null
+echo "Deregister Client.."
./deregisterClient.sh 1 &> /dev/null
diff --git a/scripts/forwarder_device.py b/scripts/forwarder_controller.py
similarity index 91%
copy from scripts/forwarder_device.py
copy to scripts/forwarder_controller.py
index 04f2a18..e7231ec 100755
--- a/scripts/forwarder_device.py
+++ b/scripts/forwarder_controller.py
@@ -15,13 +15,13 @@
# Socket facing clients
frontend = context.socket(zmq.SUB)
- frontend.bind("tcp://*:5559")
+ frontend.bind("tcp://*:5555")
frontend.setsockopt(zmq.SUBSCRIBE, "")
# Socket facing services
backend = context.socket(zmq.PUB)
- backend.bind("tcp://*:5560")
+ backend.bind("tcp://*:5556")
zmq.device(zmq.FORWARDER, frontend, backend)
diff --git a/scripts/forwarder_device.py b/scripts/forwarder_dp.py
similarity index 91%
rename from scripts/forwarder_device.py
rename to scripts/forwarder_dp.py
index 04f2a18..e8ea572 100755
--- a/scripts/forwarder_device.py
+++ b/scripts/forwarder_dp.py
@@ -15,13 +15,13 @@
# Socket facing clients
frontend = context.socket(zmq.SUB)
- frontend.bind("tcp://*:5559")
+ frontend.bind("tcp://*:5565")
frontend.setsockopt(zmq.SUBSCRIBE, "")
# Socket facing services
backend = context.socket(zmq.PUB)
- backend.bind("tcp://*:5560")
+ backend.bind("tcp://*:5566")
zmq.device(zmq.FORWARDER, frontend, backend)
diff --git a/scripts/forwarder_subscriber_with_ACK.py b/scripts/forwarder_subscriber_with_ACK.py
index fbc5088..9bf086b 100755
--- a/scripts/forwarder_subscriber_with_ACK.py
+++ b/scripts/forwarder_subscriber_with_ACK.py
@@ -62,8 +62,8 @@
print "Ready to receive messages. Press Ctrl+C when ready to exit."
-subscriber_uri = "tcp://localhost:5560"
-publisher_uri = "tcp://localhost:5559"
+subscriber_uri = "tcp://localhost:5556"
+publisher_uri = "tcp://localhost:5565"
# Socket to talk to server
context = zmq.Context()
sub_socket = context.socket(zmq.SUB)
diff --git a/scripts/registerClient.sh b/scripts/registerClient.sh
index 36d108a..a7cd5c4 100755
--- a/scripts/registerClient.sh
+++ b/scripts/registerClient.sh
@@ -20,6 +20,26 @@
}
}' 'http://localhost:8181/onos/restconf/operations/fpc:register-client'
echo ""
+elif [ "$#" -eq 1 ]; then
+ echo ""
+ curl -i -s \
+ --header "Content-type: application/json" \
+ --request POST \
+ -u onos:rocks \
+ --data '{
+ "input": {
+ "client-id": "'$1'",
+ "tenant-id": "default",
+ "supported-features": [
+ "urn:ietf:params:xml:ns:yang:fpcagent:fpc-bundles",
+ "urn:ietf:params:xml:ns:yang:fpcagent:operation-ref-scope",
+ "urn:ietf:params:xml:ns:yang:fpcagent:fpc-agent-assignments",
+ "urn:ietf:params:xml:ns:yang:fpcagent:instruction-bitset"
+ ],
+ "endpoint-uri": "http://127.0.0.1:9997/"
+ }
+ }' 'http://localhost:8181/onos/restconf/operations/fpc:register-client'
+ echo ""
else
echo "usage: "$0" clientId tenantId"
fi