added multi-tenant support
diff --git a/scripts/addDPN.sh b/scripts/addDPN.sh
index b1d04d2..f108595 100755
--- a/scripts/addDPN.sh
+++ b/scripts/addDPN.sh
@@ -17,6 +17,23 @@
}' 'http://localhost:8181/onos/restconf/data/ietf-dmm-fpcagent:tenants/tenant=default/fpc-topology'
./getTenants.sh
echo ""
+elif [ "$#" -eq 2 ]; then
+ echo ""
+ curl -i --header "Content-type: application/json" --request POST -u onos:rocks --data '{
+ "dpns": [
+ {
+ "dpn-id": '$1',
+ "dpn-name": "site1-anchor1",
+ "dpn-groups": [
+ "foo"
+ ],
+ "node-id": "node'$1'",
+ "network-id": "network'$1'"
+ }
+ ]
+ }' 'http://localhost:8181/onos/restconf/data/ietf-dmm-fpcagent:tenants/tenant='$2'/fpc-topology'
+ ./getTenants.sh
+ echo ""
else
- echo "usage: "$0" dpnId"
-fi
\ No newline at end of file
+ echo "usage: "$0" dpnId (tenantId)"
+fi
diff --git a/scripts/addTenant.sh b/scripts/addTenant.sh
new file mode 100755
index 0000000..ecc4f18
--- /dev/null
+++ b/scripts/addTenant.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ "$#" -eq 1 ]; then
+ echo ""
+ curl -i --header "Content-type: application/json" --request POST -u onos:rocks --data '{
+ "tenants": [
+ {
+ "fpc-mobility": {},
+ "fpc-policy": {},
+ "fpc-topology": {},
+ "tenant-id": "'$1'"
+ }
+ ]
+ }' 'http://localhost:8181/onos/restconf/data/ietf-dmm-fpcagent'
+ echo ""
+else
+ echo "usage: "$0" tenantId"
+fi
diff --git a/scripts/benchmark.sh b/scripts/benchmark.sh
index 1d3a6ac..08e90c5 100755
--- a/scripts/benchmark.sh
+++ b/scripts/benchmark.sh
@@ -2,10 +2,11 @@
rm -rf create.log delete.log
+./registerClient.sh 1 default &> /dev/null
./addDPN.sh 1 &> /dev/null
for (( i=1; i<=100; i++)); do
- ./configure.sh create $i 1 >> create.log 2> /dev/null &
+ ./configure.sh create $i 1 &> /dev/null &
if ! (($i % 10)); then
wait
fi
@@ -14,10 +15,11 @@
wait
for (( i=1; i<=100; i++)); do
- ./configure.sh delete $i >> delete.log 2> /dev/null &
+ ./configure.sh delete $i &> /dev/null &
if ! (($i % 10)); then
wait
fi
done
-./deleteDPN.sh 1 &> /dev/null
+./deleteDPN.sh 1 &> /dev/null
+./deregisterClient.sh 1 &> /dev/null
diff --git a/scripts/configure.sh b/scripts/configure.sh
index a77d853..b5a351a 100755
--- a/scripts/configure.sh
+++ b/scripts/configure.sh
@@ -85,5 +85,5 @@
'http://localhost:8181/onos/restconf/operations/ietf-dmm-fpcagent:configure' | python -m json.tool
echo ""
else
- echo "usage: "$0" type contextId"
+ echo "usage: "$0" type (create/delete) contextId (dpnId)"
fi
\ No newline at end of file
diff --git a/scripts/deleteDPN.sh b/scripts/deleteDPN.sh
index 6633e47..41b7c7f 100755
--- a/scripts/deleteDPN.sh
+++ b/scripts/deleteDPN.sh
@@ -3,6 +3,10 @@
echo ""
curl -X DELETE -u onos:rocks 'http://localhost:8181/onos/restconf/data/ietf-dmm-fpcagent:tenants/tenant=default/fpc-topology/dpns='$1
./getTenants.sh
+elif [ "$#" -eq 2 ]; then
+ echo ""
+ curl -X DELETE -u onos:rocks 'http://localhost:8181/onos/restconf/data/ietf-dmm-fpcagent:tenants/tenant='$2'/fpc-topology/dpns='$1
+ ./getTenants.sh
else
- echo "usage: "$0" dpnId"
+ echo "usage: "$0" dpnId (tenantId)"
fi
\ No newline at end of file
diff --git a/scripts/deregisterClient.sh b/scripts/deregisterClient.sh
new file mode 100755
index 0000000..a8ba7ce
--- /dev/null
+++ b/scripts/deregisterClient.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ "$#" -eq 1 ]; then
+ echo ""
+ curl -i -s \
+ --header "Content-type: application/json" \
+ --request POST \
+ -u onos:rocks \
+ --data '{
+ "input": {
+ "client-id": "'$1'"
+ }
+ }' 'http://localhost:8181/onos/restconf/operations/fpc:deregister-client'
+ echo ""
+else
+ echo "usage: "$0" clientId"
+fi
diff --git a/scripts/getClients.sh b/scripts/getClients.sh
new file mode 100755
index 0000000..214803e
--- /dev/null
+++ b/scripts/getClients.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+curl -u onos:rocks http://localhost:8181/onos/restconf/data/fpc:connection-info | python -m json.tool
diff --git a/scripts/registerClient.sh b/scripts/registerClient.sh
new file mode 100755
index 0000000..36d108a
--- /dev/null
+++ b/scripts/registerClient.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+if [ "$#" -eq 2 ]; then
+ echo ""
+ curl -i -s \
+ --header "Content-type: application/json" \
+ --request POST \
+ -u onos:rocks \
+ --data '{
+ "input": {
+ "client-id": "'$1'",
+ "tenant-id": "'$2'",
+ "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