From 06be6b35525e843e4d8ff48a31d968c5df7afb4a Mon Sep 17 00:00:00 2001 From: ladquin Date: Fri, 4 Jan 2013 17:46:47 -0300 Subject: [PATCH] Modified sample links in os-keypairs.wadl Modified: api-ref/src/wadls/compute-api/src/ext/os-keypairs.wadl to point to samples in ../api_samples/os-keypairs Deleted the following files from api-site/api-ref/src/wadls/compute-api/src/ext (no longer needed): keypair_create_response.json keypair_create_response.xml keypair_list.json Keypair_publickey_create_request.json keypair_publickey_create_request.xml Build Successful Patchset just rebases against master to pick up 1.5.2 in the pom.xml. Fixes: bug 1095720 Change-Id: Ie326532763734bd9ea5edcd68580f8634c198ecd --- .../compute-api/src/ext/os-keypairs.wadl | 15 ++++++--- .../ext/samples/keypair_create_response.json | 9 ----- .../ext/samples/keypair_create_response.xml | 33 ------------------- .../src/ext/samples/keypair_list.json | 23 ------------- .../keypair_publickey_create_request.json | 5 --- .../keypair_publickey_create_request.xml | 5 --- 6 files changed, 10 insertions(+), 80 deletions(-) delete mode 100644 api-ref/src/wadls/compute-api/src/ext/samples/keypair_create_response.json delete mode 100644 api-ref/src/wadls/compute-api/src/ext/samples/keypair_create_response.xml delete mode 100644 api-ref/src/wadls/compute-api/src/ext/samples/keypair_list.json delete mode 100644 api-ref/src/wadls/compute-api/src/ext/samples/keypair_publickey_create_request.json delete mode 100644 api-ref/src/wadls/compute-api/src/ext/samples/keypair_publickey_create_request.xml diff --git a/api-ref/src/wadls/compute-api/src/ext/os-keypairs.wadl b/api-ref/src/wadls/compute-api/src/ext/os-keypairs.wadl index 57fc1303d..a3ccdfd81 100644 --- a/api-ref/src/wadls/compute-api/src/ext/os-keypairs.wadl +++ b/api-ref/src/wadls/compute-api/src/ext/os-keypairs.wadl @@ -43,7 +43,12 @@ - + + + + + + @@ -91,24 +96,24 @@ - + - + - + - + diff --git a/api-ref/src/wadls/compute-api/src/ext/samples/keypair_create_response.json b/api-ref/src/wadls/compute-api/src/ext/samples/keypair_create_response.json deleted file mode 100644 index 0d048fac9..000000000 --- a/api-ref/src/wadls/compute-api/src/ext/samples/keypair_create_response.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "keypair": { - "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDgGhDH3z9uMAvPV8ziE9BCEjHCPXGufy5bOgY5mY5jOSfdmKspdbl0z/LimHVKRDNX6HoL5qRg5V/tGH/NYP5sX2zF/XRKz16lfBxiUL1EONXA9fsTEBR3FGp8NcA7hW2+YiUxWafms4If3NFqttTQ11XqTU8JCMvms4D81lhbiQ== nova@use03147k5-eth0\n", - "private_key": "-----BEGIN RSA PRIVATE KEY-----\nMIICXwIBAAKBgQDgGhDH3z9uMAvPV8ziE9BCEjHCPXGufy5bOgY5mY5jOSfdmKsp\ndbl0z/LimHVKRDNX6HoL5qRg5V/tGH/NYP5sX2zF/XRKz16lfBxiUL1EONXA9fsT\nEBR3FGp8NcA7hW2+YiUxWafms4If3NFqttTQ11XqTU8JCMvms4D81lhbiQIDAQAB\nAoGBAJ1akAfXwNEc2V4IV2sy4FtULS4nOKh+0szpjC9rm+gd3Nki9qQQ7lyQGwpy\nZID2LFsAeJnco/UJefaf6jUKcvnS7tlxMuQB8DBlepiDqnnec0EiEAVmmt9GWlYZ\nJgfGWqDzI1WtouDCIsOhx1Vq7Foue6pgOnibktg2kfYnH9IRAkEA9tKzhlr9rFui\nbVDkiRJK3VTIhKyk4davDjqPJFLJ+4+77wRW164sGxwReD7HtW6qVtJd1MFvqLDO\nqJJEsqDvXQJBAOhvGaWiAPSuP+/z6GE6VXB1pADQFTYIp2DXUa5DcStTGe7hGF1b\nDeAxpDNBbLO3YKYqi2L9vJcIsp5PkHlEVh0CQQCVLIkWBb5VQliryv0knuqiVFCQ\nZyuL1s2cQuYqZOLwaFGERtIZrom3pMImM4NN82F98cyF/pb2lE2CckyUzVF9AkEA\nqhwFjS9Pu8N7j8XWoLHsre2rJd0kaPNUbI+pe/xn6ula5XVgO5LUSOyL2+daAv2G\ngpZIhR5m07LN5wccGWRmEQJBALZRenXaSyX2R2C9ag9r2gaU8/h+aU9he5kjXIt8\n+B8wvpvfOkpOAVCQEMxtsDkEixUtI98YKZP60uw+Xzh40YU=\n-----END RSA PRIVATE KEY-----\n", - "user_id": "dev_41247879706381", - "name": "testkeypair", - "fingerprint": "f1:f3:a2:d3:ca:75:da:f1:06:f4:f7:dc:cc:7d:e1:ca" - } -} diff --git a/api-ref/src/wadls/compute-api/src/ext/samples/keypair_create_response.xml b/api-ref/src/wadls/compute-api/src/ext/samples/keypair_create_response.xml deleted file mode 100644 index 36a358305..000000000 --- a/api-ref/src/wadls/compute-api/src/ext/samples/keypair_create_response.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC0JMVm7BxwdGnywr94IeoHun7A8t0mE5vWPKdJbCl1h7s28B0RV0MteJ2IpNFImoeWGim+Rs5s4RHtYeX9AlJgqwLXUfBuGW2rsQKVwtoKkL3JmosgxUkcD3PyxGiAr7AaXYn5Cf90sa/mWldkcL8w/iwgyhhzsv9Sj0nUTnF//Q== nova@az1-nv-schedule-0000 - - - - -----BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQC0JMVm7BxwdGnywr94IeoHun7A8t0mE5vWPKdJbCl1h7s28B0R -V0MteJ2IpNFImoeWGim+Rs5s4RHtYeX9AlJgqwLXUfBuGW2rsQKVwtoKkL3Jmosg -xUkcD3PyxGiAr7AaXYn5Cf90sa/mWldkcL8w/iwgyhhzsv9Sj0nUTnF//QIDAQAB -AoGAC8O7AJW65b00jh4Z0waj+g076e3yc2Ikc0FSy4C81Ggg2d2kiFVilb2izCG3 -aT5uTGc5AqwtHv8z5ITYOEXGi111GFmEqk7VhvD6YMSq8qW+VrYhFYIhNwVXIyd7 -kd81oy22QcMre5GcifQq5VUfWS4ZhfjY7zrqqw5/mmKLdgECQQDrSt2Cr15Z5qpK -cwMHSvYIVvNlMHIOr8X/oLSEGM8WyoBXqS1+SaqU3HK73kNKQGY2/3qGhHMCFjn0 -kvoduIPNAkEAw/9neFhHhh3eFKhZ2QEBWe2CM+5Spe178zmdE+L9/eQF9vVm+XPU -0EJAYHS7tM9ITIP450rJbsNqW97+bZ8c8QJBAJafzIH2he4DTgxu6AdpI2tfTlz+ -0GU6fQQR+r19rESoydRURv1LZ1n4bbJ6rJUB+O1IS0WF0KILXHqHBHq2PhkCQQC4 -HzCWj2fxiBFemqB9CUK5tjNAkbw2gBiW7yKu0ekFH7ayvuqToMrlMbfEZSUIwEkN -CFVFAq6kTROXZq7hUD4hAkEAsNrne2ODGqIvIjuBSMz+b3Z9rQcuLVJ88eN3Sc8i -7b+bdy9bNUKQDeIW+IdeMhauvodLcBS8UaJLS0aJxtHYwQ== ------END RSA PRIVATE KEY----- - - - - rupak2_mgr - - - ytestkeypair - - - 2d:67:be:41:05:a7:b0:6d:3b:eb:ee:97:9b:b7:29:df - - \ No newline at end of file diff --git a/api-ref/src/wadls/compute-api/src/ext/samples/keypair_list.json b/api-ref/src/wadls/compute-api/src/ext/samples/keypair_list.json deleted file mode 100644 index c6eb62737..000000000 --- a/api-ref/src/wadls/compute-api/src/ext/samples/keypair_list.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "keypairs": [{ - "keypair": { - "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCSLxfzqB+e5yHdUSXvbxKkajjlfuhV+GArdseqPjfkKJ6no5echpin7dJp0FLXMJKxJZE3WWIRu25CQrJntmi7no27RkDfAGaTFbjz3DWY4A1HLeKAB5tFTwYQlr7CjMdoC/DY7UvKaatwLhH4Wvh5vMmXgF7AFzdkI28urwo+Q== nova@use03147k5-eth0\n", - "name": "hpdefault", - "fingerprint": "8b:2f:aa:b0:b8:97:dc:c8:50:aa:d4:8e:d0:34:61:d9" - } - }, - { - "keypair": { - "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCzYa6mM2ZuRYd18pJrdGZdJHXC51VReQRQANwviK7FX7VPyn0anXLW5LXfNabS2zGi8ZhH9nfBw4kG6ZVfxbB1+38sU8KOZlsMLNXY2eT71YFIKhRjpOTs3nypG9KZRqZ9V+zwn6CJGGr2wWlWwc/FIQh+ebdl3bthr/qctHCkYw== nova@use03147k5-eth0\n", - "name": "rgkey2", - "fingerprint": "6c:57:46:0d:24:0f:51:af:51:36:8c:a0:92:cf:3d:5e" - } - }, - { - "keypair": { - "public_key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCnMJOrYe+vRDylFYkIuXA0Ew6EBbe0VV+O+xvg5LtFI5QywcAe75L5y857FIbA5OGfFKi9DVfhJbn7PMxkRsnyyvg1Q1tKMZAi/JQjJCOyF6e9bm42mg8IM+4rM5/MrlzBZ800uWT5GJdY9ouOyzjm52HGbeucQxPzzh4V9eum2Q== nova@use03147k5-eth0\n", - "name": "fog_hprgmac.local_1322518814_key_pair", - "fingerprint": "4e:3a:96:b0:c9:d1:4e:7f:b5:bd:13:91:36:9f:98:72" - } - }] -} \ No newline at end of file diff --git a/api-ref/src/wadls/compute-api/src/ext/samples/keypair_publickey_create_request.json b/api-ref/src/wadls/compute-api/src/ext/samples/keypair_publickey_create_request.json deleted file mode 100644 index 6bf054f7e..000000000 --- a/api-ref/src/wadls/compute-api/src/ext/samples/keypair_publickey_create_request.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "keypair": { - "name": "testkeypair", - } -} diff --git a/api-ref/src/wadls/compute-api/src/ext/samples/keypair_publickey_create_request.xml b/api-ref/src/wadls/compute-api/src/ext/samples/keypair_publickey_create_request.xml deleted file mode 100644 index bd2b50388..000000000 --- a/api-ref/src/wadls/compute-api/src/ext/samples/keypair_publickey_create_request.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - testkeypair - -