Merge "Fix syntax errors in JSON examples"

This commit is contained in:
Jenkins 2013-11-28 19:19:51 +00:00 committed by Gerrit Code Review
commit ad3ae26883
20 changed files with 67 additions and 67 deletions

View File

@ -5,15 +5,15 @@
"namespace": "http://docs.ciscocloud.com/api/ext/portprofile/v1.0", "namespace": "http://docs.ciscocloud.com/api/ext/portprofile/v1.0",
"alias": "Cisco Port Profile", "alias": "Cisco Port Profile",
"updated": "2011-07-23T13:25:27-06:00", "updated": "2011-07-23T13:25:27-06:00",
"description": "Portprofile include QoS information", "description": "Portprofile include QoS information"
}, },
{ {
"name": "Cisco qos", "name": "Cisco qos",
"namespace": "http://docs.ciscocloud.com/api/ext/qos/v1.0", "namespace": "http://docs.ciscocloud.com/api/ext/qos/v1.0",
"alias": "Cisco qos", "alias": "Cisco qos",
"updated": "2011-07-25T13:25:27-06:00", "updated": "2011-07-25T13:25:27-06:00",
"description": "qos include qos_name and qos_desc", "description": "qos include qos_name and qos_desc"
}, }
] ]
} }

View File

@ -2,7 +2,7 @@
"network": "network":
{ {
"id": "8bec1293-16bd-4568-ba75-1f58bec0b4c3", "id": "8bec1293-16bd-4568-ba75-1f58bec0b4c3",
"name": "test_network" "name": "test_network",
"ports": "ports":
[ [
{ {
@ -10,7 +10,7 @@
"state": "DOWN" "state": "DOWN"
}, },
{ {
"id": b832be00-6553-4f69-af33-acd554e36d08", "id": "b832be00-6553-4f69-af33-acd554e36d08",
"state": "ACTIVE", "state": "ACTIVE",
"attachment": "attachment":
{ {

View File

@ -1,6 +1,6 @@
{ {
"network": "network":
{ {
"id": "158233b0-ca9a-40b4-8614-54a4a99d47d1", "id": "158233b0-ca9a-40b4-8614-54a4a99d47d1"
} }
} }

View File

@ -2,7 +2,7 @@
"port": "port":
{ {
"state": "DOWN", "state": "DOWN",
"id": "98017ddc-efc8-4c25-a915-774b2a633855" "id": "98017ddc-efc8-4c25-a915-774b2a633855",
"attachment": "attachment":
{ {
"id": "test_interface_identifier" "id": "test_interface_identifier"

View File

@ -2,11 +2,11 @@
"ports": [ "ports": [
{ {
"id": "98017ddc-efc8-4c25-a915-774b2a633855", "id": "98017ddc-efc8-4c25-a915-774b2a633855",
"state": "ACTIVE", "state": "ACTIVE"
}, },
{ {
"id": "b832be00-6553-4f69-af33-acd554e36d08", "id": "b832be00-6553-4f69-af33-acd554e36d08",
"state": "ACTIVE", "state": "ACTIVE"
} }
] ]
} }

View File

@ -1,5 +1,5 @@
{ {
"network" { "network": {
"id" : "private", "id" : "private",
"ip" : [ "ip" : [
{"version" : 4, "addr" : "10.176.42.16"}, {"version" : 4, "addr" : "10.176.42.16"},

View File

@ -1,5 +1,5 @@
{ {
"network" { "network": {
"id" : "public", "id" : "public",
"ip" : [ "ip" : [
{"version" : 4, "addr" : "67.23.10.132"}, {"version" : 4, "addr" : "67.23.10.132"},

View File

@ -5,15 +5,15 @@
"namespace": "http://docs.ciscocloud.com/api/ext/portprofile/v1.0", "namespace": "http://docs.ciscocloud.com/api/ext/portprofile/v1.0",
"alias": "Cisco Port Profile", "alias": "Cisco Port Profile",
"updated": "2011-07-23T13:25:27-06:00", "updated": "2011-07-23T13:25:27-06:00",
"description": "Portprofile include QoS information", "description": "Portprofile include QoS information"
}, },
{ {
"name": "Cisco qos", "name": "Cisco qos",
"namespace": "http://docs.ciscocloud.com/api/ext/qos/v1.0", "namespace": "http://docs.ciscocloud.com/api/ext/qos/v1.0",
"alias": "Cisco qos", "alias": "Cisco qos",
"updated": "2011-07-25T13:25:27-06:00", "updated": "2011-07-25T13:25:27-06:00",
"description": "qos include qos_name and qos_desc", "description": "qos include qos_name and qos_desc"
}, }
] ]
} }

View File

@ -2,6 +2,6 @@
"floatingip": "floatingip":
{ {
"fixed_ip_address": "10.0.0.3", "fixed_ip_address": "10.0.0.3",
"floating_ip_address": "172.24.4.228", "floating_ip_address": "172.24.4.228"
} }
} }

View File

@ -2,7 +2,7 @@
"network": "network":
{ {
"id": "8bec1293-16bd-4568-ba75-1f58bec0b4c3", "id": "8bec1293-16bd-4568-ba75-1f58bec0b4c3",
"name": "test_network" "name": "test_network",
"ports": "ports":
[ [
{ {
@ -10,7 +10,7 @@
"state": "DOWN" "state": "DOWN"
}, },
{ {
"id": b832be00-6553-4f69-af33-acd554e36d08", "id": "b832be00-6553-4f69-af33-acd554e36d08",
"state": "ACTIVE", "state": "ACTIVE",
"attachment": "attachment":
{ {

View File

@ -2,7 +2,7 @@
"port": "port":
{ {
"state": "DOWN", "state": "DOWN",
"id": "98017ddc-efc8-4c25-a915-774b2a633855" "id": "98017ddc-efc8-4c25-a915-774b2a633855",
"attachment": "attachment":
{ {
"id": "test_interface_identifier" "id": "test_interface_identifier"

View File

@ -2,11 +2,11 @@
"ports": [ "ports": [
{ {
"id": "98017ddc-efc8-4c25-a915-774b2a633855", "id": "98017ddc-efc8-4c25-a915-774b2a633855",
"state": "ACTIVE", "state": "ACTIVE"
}, },
{ {
"id": "b832be00-6553-4f69-af33-acd554e36d08", "id": "b832be00-6553-4f69-af33-acd554e36d08",
"state": "ACTIVE", "state": "ACTIVE"
} }
] ]
} }

View File

@ -1,33 +1,33 @@
{ {
'ports':[ "ports":[
{ {
'admin_state_up': True, "admin_state_up": true,
'allowed_address_pairs': [{'ip_address': '23.23.23.1', "allowed_address_pairs": [{"ip_address": "23.23.23.1",
'mac_address': 'fa:16:3e:c4:cd:3f'}], "mac_address": "fa:16:3e:c4:cd:3f"}],
'device_id': '', "device_id": "",
'device_owner': '', "device_owner": "",
'fixed_ips': [{'ip_address': '10.0.0.2', "fixed_ips": [{"ip_address": "10.0.0.2",
'subnet_id': 'f4145134-b99b-4b18-9940-47239f071923'}], "subnet_id": "f4145134-b99b-4b18-9940-47239f071923"}],
'id': '191f5290-3a5a-40ff-b0cb-cd4b115b400e', "id": "191f5290-3a5a-40ff-b0cb-cd4b115b400e",
'mac_address': 'fa:16:3e:c4:cd:3f', "mac_address": "fa:16:3e:c4:cd:3f",
'name': '', "name": "",
'network_id': '327f2a2f-9d70-417f-ac3a-d3155e25cf25', "network_id": "327f2a2f-9d70-417f-ac3a-d3155e25cf25",
'status': 'DOWN', "status": "DOWN",
'tenant_id': '8462a4d167f84256b7035f4c408c1185' "tenant_id": "8462a4d167f84256b7035f4c408c1185"
}, },
{ {
'admin_state_up': True, "admin_state_up": true,
'allowed_address_pairs': [], "allowed_address_pairs": [],
'device_id': '', "device_id": "",
'device_owner': '', "device_owner": "",
'fixed_ips': [{'ip_address': '10.0.0.3', "fixed_ips": [{"ip_address": "10.0.0.3",
'subnet_id': 'f4145134-b99b-4b18-9940-47239f071923'}], "subnet_id": "f4145134-b99b-4b18-9940-47239f071923"}],
'id': 'ec2fb9f9-a11b-4791-852d-eb1ab9b27a0e', "id": "ec2fb9f9-a11b-4791-852d-eb1ab9b27a0e",
'mac_address': 'fa:16:3e:a9:3e:1a', "mac_address": "fa:16:3e:a9:3e:1a",
'name': '', "name": "",
'network_id': '327f2a2f-9d70-417f-ac3a-d3155e25cf25', "network_id": "327f2a2f-9d70-417f-ac3a-d3155e25cf25",
'status': 'DOWN', "status": "DOWN",
'tenant_id': '8462a4d167f84256b7035f4c408c1185' "tenant_id": "8462a4d167f84256b7035f4c408c1185"
}, }
] ]
} }

View File

@ -23,6 +23,6 @@
"provider:network_type": "local", "provider:network_type": "local",
"provider:physical_network": null, "provider:physical_network": null,
"provider:segmentation_id": null "provider:segmentation_id": null
}, }
] ]
} }

View File

@ -2,7 +2,7 @@
"port": "port":
{ {
"network_id": "3537e809-8bec-4ae4-a5ab-2c6477760195", "network_id": "3537e809-8bec-4ae4-a5ab-2c6477760195",
"allowed_address_pairs": [{"ip_address": "10.3.3.3"}], "allowed_address_pairs": [{"ip_address": "10.3.3.3"}]
} }
} }

View File

@ -1,18 +1,18 @@
{ {
'port': "port":
{ {
'admin_state_up': True, "admin_state_up": true,
'allowed_address_pairs': [{'ip_address': '23.23.23.1', "allowed_address_pairs": [{"ip_address": "23.23.23.1",
'mac_address': 'fa:16:3e:c4:cd:3f'}], "mac_address": "fa:16:3e:c4:cd:3f"}],
'device_id': '', "device_id": "",
'device_owner': '', "device_owner": "",
'fixed_ips': [{'ip_address': '10.0.0.2', "fixed_ips": [{"ip_address": "10.0.0.2",
'subnet_id': 'f4145134-b99b-4b18-9940-47239f071923'}], "subnet_id": "f4145134-b99b-4b18-9940-47239f071923"}],
'id': '191f5290-3a5a-40ff-b0cb-cd4b115b400e', "id": "191f5290-3a5a-40ff-b0cb-cd4b115b400e",
'mac_address': 'fa:16:3e:c4:cd:3f', "mac_address": "fa:16:3e:c4:cd:3f",
'name': '', "name": "",
'network_id': '327f2a2f-9d70-417f-ac3a-d3155e25cf25', "network_id": "327f2a2f-9d70-417f-ac3a-d3155e25cf25",
'status': 'DOWN', "status": "DOWN",
'tenant_id': '8462a4d167f84256b7035f4c408c1185' "tenant_id": "8462a4d167f84256b7035f4c408c1185"
} }
} }

View File

@ -1,5 +1,5 @@
{ {
"network" { "network": {
"id" : "private", "id" : "private",
"ip" : [ "ip" : [
{"version" : 4, "addr" : "10.176.42.16"}, {"version" : 4, "addr" : "10.176.42.16"},

View File

@ -1,5 +1,5 @@
{ {
"network" { "network": {
"id" : "public", "id" : "public",
"ip" : [ "ip" : [
{"version" : 4, "addr" : "67.23.10.132"}, {"version" : 4, "addr" : "67.23.10.132"},

View File

@ -13,6 +13,6 @@ content-type: application/json
"ip_version": 4, "ip_version": 4,
"cidr": "10.10.0.0/24", "cidr": "10.10.0.0/24",
"id": "4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861", "id": "4156c7a5-e8c4-4aff-a6e1-8f3c7bc83861",
"enable_dhcp": false, "enable_dhcp": false
} }
} }

View File

@ -5,7 +5,7 @@
"auth_algorithm": "sha1", "auth_algorithm": "sha1",
"encapsulation_mode": "tunnel", "encapsulation_mode": "tunnel",
"encryption_algorithm": "aes-128", "encryption_algorithm": "aes-128",
"pfs": "group5" "pfs": "group5",
"lifetime": { "lifetime": {
"units": "seconds", "units": "seconds",
"value": 7200 "value": 7200