From 2dd48e6f86ab7760f8fa5a2241fbd28c7d35d49d Mon Sep 17 00:00:00 2001 From: Simon Hunt Date: Thu, 21 May 2015 08:50:08 -0700 Subject: [PATCH] CORD Subscriber GUI -- Additional examples of responses from XOS. Change-Id: I98d283a9eb009956c0188d94410f5798e69cdadd --- .../org/onosproject/cord/gui/XosManager.java | 25 +++ .../cord/gui/xos/subscriber-92-services.json | 5 + ...ubscriber-92-users-2-url_filtering-PG.json | 4 + .../cord/gui/xos/subscriber-92-users-MOD.json | 25 +++ .../cord/gui/xos/subscriber-92-users.json | 24 +++ .../cord/gui/xos/subscriber-92.json | 23 +++ .../onosproject/cord/gui/xos/subscriber.json | 156 ++++++++++++++---- 7 files changed, 234 insertions(+), 28 deletions(-) create mode 100644 apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/XosManager.java create mode 100644 apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-services.json create mode 100644 apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users-2-url_filtering-PG.json create mode 100644 apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users-MOD.json create mode 100644 apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users.json create mode 100644 apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92.json diff --git a/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/XosManager.java b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/XosManager.java new file mode 100644 index 0000000000..4ae42ba327 --- /dev/null +++ b/apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/XosManager.java @@ -0,0 +1,25 @@ +/* + * Copyright 2015 Open Networking Laboratory + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.onosproject.cord.gui; + +/** + * Encapsulation of interactions with XOS. + */ +public class XosManager { + +} diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-services.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-services.json new file mode 100644 index 0000000000..c528aedaa3 --- /dev/null +++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-services.json @@ -0,0 +1,5 @@ +{ + "firewall": false, + "cdn": false, + "url_filter": false +} diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users-2-url_filtering-PG.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users-2-url_filtering-PG.json new file mode 100644 index 0000000000..f9ea56da04 --- /dev/null +++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users-2-url_filtering-PG.json @@ -0,0 +1,4 @@ +{ + "id": "2", + "level": "PG" +} diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users-MOD.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users-MOD.json new file mode 100644 index 0000000000..ae716bd71d --- /dev/null +++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users-MOD.json @@ -0,0 +1,25 @@ +{ + "users": [ + { + "mac": "010203040506", + "name": "Moms laptop", + "id": 0 + }, + { + "mac": "010203040507", + "name": "Dads desktop", + "id": 1 + }, + { + "id": 2, + "mac": "010203040507", + "name": "Jacks iPad", + "level": "PG" + }, + { + "mac": "010203040508", + "name": "Jills iPad", + "id": 3 + } + ] +} diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users.json new file mode 100644 index 0000000000..692e1da5c3 --- /dev/null +++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92-users.json @@ -0,0 +1,24 @@ +{ + "users": [ + { + "mac": "010203040506", + "name": "Moms laptop", + "id": 0 + }, + { + "mac": "010203040507", + "name": "Dads desktop", + "id": 1 + }, + { + "mac": "010203040507", + "name": "Jacks iPad", + "id": 2 + }, + { + "mac": "010203040508", + "name": "Jills iPad", + "id": 3 + } + ] +} diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92.json new file mode 100644 index 0000000000..ef880b3d2d --- /dev/null +++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber-92.json @@ -0,0 +1,23 @@ +{ + "humanReadableName": "vOLT on service 1", + "id": 92, + "service_specific_id": "33445573", + "vlan_id": "77889908", + "vcpe_id": 93, + "sliver": 108, + "sliver_name": "mysite_vcpe", + "image": 1, + "image_name": "Ubuntu-14.04-LTS", + "firewall_enable": false, + "firewall_rules": "accept all anywhere anywhere", + "url_filter_enable": false, + "url_filter_rules": "allow all", + "url_filter_level": "R", + "cdn_enable": false, + "vbng_id": 94, + "routeable_subnet": "", + "nat_ip": "172.16.0.106", + "lan_ip": "12.0.0.16", + "wan_ip": "11.0.0.16", + "private_ip": "10.0.6.43" +} diff --git a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber.json b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber.json index 3892c87f58..a68196b2a8 100644 --- a/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber.json +++ b/apps/demo/cord-gui/src/main/resources/org/onosproject/cord/gui/xos/subscriber.json @@ -1,42 +1,142 @@ { "subscribers": [ { - "humanReadableName": "vOLT on service 16", - "id": 8, - "service_specific_id": "9999", - "vlan_id": 8888, - "vcpe_id": 9, - "sliver": 379, - "sliver_name": "onlab_test405", - "image": 29, - "image_name": "Ubuntu 14.04 LTS", - "firewall_enable": true, - "firewall_rules": "accept tcp anywhere anywhere dpt 80\naccept tcp anywhere anywhere dpt 443\naccept tcp anywhere anywhere dpt 22", - "url_filter_enable": true, + "humanReadableName": "vOLT on service 1", + "id": 92, + "service_specific_id": "33445573", + "vlan_id": "77889908", + "vcpe_id": 93, + "sliver": 108, + "sliver_name": "mysite_vcpe", + "image": 1, + "image_name": "Ubuntu-14.04-LTS", + "firewall_enable": false, + "firewall_rules": "accept all anywhere anywhere", + "url_filter_enable": false, + "url_filter_rules": "allow all", + "url_filter_level": "R", + "cdn_enable": false, + "vbng_id": 94, + "routeable_subnet": "", + "nat_ip": "172.16.0.106", + "lan_ip": "12.0.0.16", + "wan_ip": "11.0.0.16", + "private_ip": "10.0.6.43" + }, + { + "humanReadableName": "vOLT on service 1", + "id": 138, + "service_specific_id": "", + "vlan_id": "100", + "vcpe_id": 139, + "sliver": 106, + "sliver_name": "mysite_vcpe", + "image": 1, + "image_name": "Ubuntu-14.04-LTS", + "firewall_enable": false, + "firewall_rules": "accept all anywhere anywhere", + "url_filter_enable": false, "url_filter_rules": "allow all", "url_filter_level": "PG", "cdn_enable": false, - "vbng_id": 10, - "routeable_subnet": "placeholder-from-observer" + "vbng_id": 140, + "routeable_subnet": "", + "nat_ip": "172.16.0.104", + "lan_ip": "12.0.0.14", + "wan_ip": "11.0.0.14", + "private_ip": "10.0.6.41" }, { - "humanReadableName": "vOLT on service 16", - "id": 1, - "service_specific_id": "", - "vlan_id": null, - "vcpe_id": 2, - "sliver": 384, - "sliver_name": "onlab_vcpe", - "image": 29, - "image_name": "Ubuntu 14.04 LTS", - "firewall_enable": true, + "humanReadableName": "vOLT on service 1", + "id": 154, + "service_specific_id": "98765", + "vlan_id": "99", + "vcpe_id": 155, + "sliver": 117, + "sliver_name": "mysite_vcpe", + "image": 1, + "image_name": "Ubuntu-14.04-LTS", + "firewall_enable": false, "firewall_rules": "accept all anywhere anywhere", - "url_filter_enable": true, + "url_filter_enable": false, "url_filter_rules": "allow all", "url_filter_level": "PG", - "cdn_enable": true, - "vbng_id": 4, - "routeable_subnet": "1.1.1.1/4" + "cdn_enable": false, + "vbng_id": 156, + "routeable_subnet": "", + "nat_ip": "172.16.0.114", + "lan_ip": "12.0.0.24", + "wan_ip": "11.0.0.24", + "private_ip": "10.0.6.48" + }, + { + "humanReadableName": "vOLT on service 1", + "id": 157, + "service_specific_id": "5678", + "vlan_id": "999", + "vcpe_id": 158, + "sliver": 118, + "sliver_name": "mysite_vcpe", + "image": 1, + "image_name": "Ubuntu-14.04-LTS", + "firewall_enable": false, + "firewall_rules": "accept all anywhere anywhere", + "url_filter_enable": false, + "url_filter_rules": "allow all", + "url_filter_level": "PG", + "cdn_enable": false, + "vbng_id": 159, + "routeable_subnet": "", + "nat_ip": "172.16.0.119", + "lan_ip": "12.0.0.29", + "wan_ip": "11.0.0.29", + "private_ip": "10.0.6.53" + }, + { + "humanReadableName": "vOLT on service 1", + "id": 160, + "service_specific_id": "1", + "vlan_id": "100", + "vcpe_id": 161, + "sliver": 119, + "sliver_name": "mysite_vcpe", + "image": 1, + "image_name": "Ubuntu-14.04-LTS", + "firewall_enable": false, + "firewall_rules": "accept all anywhere anywhere", + "url_filter_enable": false, + "url_filter_rules": "allow all", + "url_filter_level": "PG", + "cdn_enable": false, + "vbng_id": 162, + "routeable_subnet": "", + "nat_ip": "172.16.0.120", + "lan_ip": "12.0.0.30", + "wan_ip": "11.0.0.30", + "private_ip": "10.0.6.54" + }, + { + "humanReadableName": "vOLT on service 1", + "id": 163, + "service_specific_id": "101", + "vlan_id": "101", + "vcpe_id": 164, + "sliver": 120, + "sliver_name": "mysite_vcpe", + "image": 1, + "image_name": "Ubuntu-14.04-LTS", + "firewall_enable": false, + "firewall_rules": "accept all anywhere anywhere", + "url_filter_enable": false, + "url_filter_rules": "allow all", + "url_filter_level": "PG", + "cdn_enable": false, + "vbng_id": 165, + "routeable_subnet": "", + "nat_ip": "172.16.0.121", + "lan_ip": "12.0.0.31", + "wan_ip": "11.0.0.31", + "private_ip": "10.0.6.55" } ] }