summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-09 15:09:35 +0000
committerGerrit Code Review <review@openstack.org>2016-11-09 15:09:35 +0000
commitf6cd6a1b2e9d5347d4484c827dbdc75fee19bfd0 (patch)
tree738c949c78402dcb344e37dfd9928677f29c664d
parent641c2774de59bcc39353b85caf03b64aa006e01a (diff)
parent0e768e9a11ed75010548a0cc93c0e5f5e5bfd1e7 (diff)
Merge "Add Floating IP get/search"
-rw-r--r--Makefile.am7
-rw-r--r--oaktreemodel/floating_ip.pb.go137
-rw-r--r--oaktreemodel/floating_ip.proto41
-rw-r--r--oaktreemodel/model.py1
-rw-r--r--oaktreemodel/oaktree.pb.go43
-rw-r--r--oaktreemodel/oaktree.proto3
6 files changed, 212 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am
index 1634088..e764703 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,6 +63,7 @@ liboaktreemodel_la_CXXFLAGS = ${AM_CXXFLAGS} ${PROTOSKIP_WARNINGS} ${NO_WERROR}
63liboaktreemodel_la_SOURCES = \ 63liboaktreemodel_la_SOURCES = \
64 oaktreemodel/common.pb.cc \ 64 oaktreemodel/common.pb.cc \
65 oaktreemodel/flavor.pb.cc \ 65 oaktreemodel/flavor.pb.cc \
66 oaktreemodel/floating_ip.pb.cc \
66 oaktreemodel/image.pb.cc \ 67 oaktreemodel/image.pb.cc \
67 oaktreemodel/security_group.pb.cc \ 68 oaktreemodel/security_group.pb.cc \
68 oaktreemodel/oaktree.pb.cc \ 69 oaktreemodel/oaktree.pb.cc \
@@ -71,6 +72,7 @@ liboaktreemodel_la_SOURCES = \
71pkginclude_HEADERS = \ 72pkginclude_HEADERS = \
72 oaktreemodel/common.pb.h \ 73 oaktreemodel/common.pb.h \
73 oaktreemodel/flavor.pb.h \ 74 oaktreemodel/flavor.pb.h \
75 oaktreemodel/floating_ip.pb.h \
74 oaktreemodel/image.pb.h \ 76 oaktreemodel/image.pb.h \
75 oaktreemodel/security_group.pb.h \ 77 oaktreemodel/security_group.pb.h \
76 oaktreemodel/oaktree.pb.h \ 78 oaktreemodel/oaktree.pb.h \
@@ -84,6 +86,9 @@ BUILT_SOURCES += \
84 oaktreemodel/flavor.pb.cc \ 86 oaktreemodel/flavor.pb.cc \
85 oaktreemodel/flavor.pb.h \ 87 oaktreemodel/flavor.pb.h \
86 oaktreemodel/flavor_pb2.py \ 88 oaktreemodel/flavor_pb2.py \
89 oaktreemodel/floating_ip.pb.cc \
90 oaktreemodel/floating_ip.pb.h \
91 oaktreemodel/floating_ip_pb2.py \
87 oaktreemodel/image.pb.cc \ 92 oaktreemodel/image.pb.cc \
88 oaktreemodel/image.pb.h \ 93 oaktreemodel/image.pb.h \
89 oaktreemodel/image_pb2.py \ 94 oaktreemodel/image_pb2.py \
@@ -100,6 +105,7 @@ if HAVE_GO_PLUGIN
100BUILT_SOURCES += \ 105BUILT_SOURCES += \
101 oaktreemodel/common.pb.go \ 106 oaktreemodel/common.pb.go \
102 oaktreemodel/flavor.pb.go \ 107 oaktreemodel/flavor.pb.go \
108 oaktreemodel/floating_ip.pb.go \
103 oaktreemodel/image.pb.go \ 109 oaktreemodel/image.pb.go \
104 oaktreemodel/oaktree.pb.go \ 110 oaktreemodel/oaktree.pb.go \
105 oaktreemodel/security_group.pb.go 111 oaktreemodel/security_group.pb.go
@@ -108,6 +114,7 @@ endif
108EXTRA_DIST += \ 114EXTRA_DIST += \
109 oaktreemodel/common.proto \ 115 oaktreemodel/common.proto \
110 oaktreemodel/flavor.proto \ 116 oaktreemodel/flavor.proto \
117 oaktreemodel/floating_ip.proto \
111 oaktreemodel/image.proto \ 118 oaktreemodel/image.proto \
112 oaktreemodel/security_group.proto \ 119 oaktreemodel/security_group.proto \
113 oaktreemodel/oaktree.proto 120 oaktreemodel/oaktree.proto
diff --git a/oaktreemodel/floating_ip.pb.go b/oaktreemodel/floating_ip.pb.go
new file mode 100644
index 0000000..7bc6f1f
--- /dev/null
+++ b/oaktreemodel/floating_ip.pb.go
@@ -0,0 +1,137 @@
1// Code generated by protoc-gen-go.
2// source: floating_ip.proto
3// DO NOT EDIT!
4
5/*
6Package oaktree is a generated protocol buffer package.
7
8It is generated from these files:
9 floating_ip.proto
10
11It has these top-level messages:
12 FloatingIP
13 FloatingIPList
14*/
15package oaktree
16
17import proto "github.com/golang/protobuf/proto"
18import fmt "fmt"
19import math "math"
20import oaktree1 "."
21
22// Reference imports to suppress errors if they are not otherwise used.
23var _ = proto.Marshal
24var _ = fmt.Errorf
25var _ = math.Inf
26
27// This is a compile-time assertion to ensure that this generated file
28// is compatible with the proto package it is being compiled against.
29// A compilation error at this line likely means your copy of the
30// proto package needs to be updated.
31const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
32
33type FloatingIP_Status int32
34
35const (
36 FloatingIP_active FloatingIP_Status = 0
37 FloatingIP_down FloatingIP_Status = 1
38 FloatingIP_error FloatingIP_Status = 2
39)
40
41var FloatingIP_Status_name = map[int32]string{
42 0: "active",
43 1: "down",
44 2: "error",
45}
46var FloatingIP_Status_value = map[string]int32{
47 "active": 0,
48 "down": 1,
49 "error": 2,
50}
51
52func (x FloatingIP_Status) String() string {
53 return proto.EnumName(FloatingIP_Status_name, int32(x))
54}
55func (FloatingIP_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
56
57type FloatingIP struct {
58 Location *oaktree1.Location `protobuf:"bytes,1,opt,name=location" json:"location,omitempty"`
59 Id string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
60 IsAttached bool `protobuf:"varint,3,opt,name=is_attached,json=isAttached" json:"is_attached,omitempty"`
61 FixedIpAddress string `protobuf:"bytes,4,opt,name=fixed_ip_address,json=fixedIpAddress" json:"fixed_ip_address,omitempty"`
62 FloatingIpAddress string `protobuf:"bytes,5,opt,name=floating_ip_address,json=floatingIpAddress" json:"floating_ip_address,omitempty"`
63 Network string `protobuf:"bytes,6,opt,name=network" json:"network,omitempty"`
64 Port string `protobuf:"bytes,7,opt,name=port" json:"port,omitempty"`
65 Status FloatingIP_Status `protobuf:"varint,8,opt,name=status,enum=oaktree.FloatingIP_Status" json:"status,omitempty"`
66 Properties map[string]string `protobuf:"bytes,99,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
67}
68
69func (m *FloatingIP) Reset() { *m = FloatingIP{} }
70func (m *FloatingIP) String() string { return proto.CompactTextString(m) }
71func (*FloatingIP) ProtoMessage() {}
72func (*FloatingIP) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
73
74func (m *FloatingIP) GetLocation() *oaktree1.Location {
75 if m != nil {
76 return m.Location
77 }
78 return nil
79}
80
81func (m *FloatingIP) GetProperties() map[string]string {
82 if m != nil {
83 return m.Properties
84 }
85 return nil
86}
87
88type FloatingIPList struct {
89 FloatingIps []*FloatingIP `protobuf:"bytes,1,rep,name=floating_ips,json=floatingIps" json:"floating_ips,omitempty"`
90}
91
92func (m *FloatingIPList) Reset() { *m = FloatingIPList{} }
93func (m *FloatingIPList) String() string { return proto.CompactTextString(m) }
94func (*FloatingIPList) ProtoMessage() {}
95func (*FloatingIPList) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
96
97func (m *FloatingIPList) GetFloatingIps() []*FloatingIP {
98 if m != nil {
99 return m.FloatingIps
100 }
101 return nil
102}
103
104func init() {
105 proto.RegisterType((*FloatingIP)(nil), "oaktree.FloatingIP")
106 proto.RegisterType((*FloatingIPList)(nil), "oaktree.FloatingIPList")
107 proto.RegisterEnum("oaktree.FloatingIP_Status", FloatingIP_Status_name, FloatingIP_Status_value)
108}
109
110func init() { proto.RegisterFile("floating_ip.proto", fileDescriptor0) }
111
112var fileDescriptor0 = []byte{
113 // 365 bytes of a gzipped FileDescriptorProto
114 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x92, 0xc1, 0x8e, 0xda, 0x30,
115 0x10, 0x86, 0x9b, 0x04, 0x42, 0x18, 0x50, 0x1a, 0x86, 0x1e, 0x2c, 0x2e, 0x45, 0xf4, 0x42, 0x0f,
116 0xcd, 0x81, 0x4a, 0x55, 0x55, 0xa9, 0x07, 0x54, 0x75, 0xb5, 0x48, 0x1c, 0x50, 0xf6, 0x01, 0x90,
117 0x37, 0x31, 0xbb, 0x16, 0x10, 0x47, 0xb6, 0x81, 0xe5, 0x49, 0xf7, 0x75, 0xd6, 0x38, 0xd9, 0x04,
118 0xad, 0xb8, 0xcd, 0xfc, 0xf3, 0x8d, 0x3c, 0xff, 0x2f, 0xc3, 0x60, 0xb3, 0x13, 0x54, 0xf3, 0xfc,
119 0x69, 0xcd, 0x8b, 0xb8, 0x90, 0x42, 0x0b, 0xec, 0x08, 0xba, 0xd5, 0x92, 0xb1, 0x51, 0x3f, 0x15,
120 0xfb, 0xbd, 0xc8, 0x4b, 0x79, 0xf2, 0xea, 0x01, 0xdc, 0x55, 0xf0, 0x62, 0x85, 0x3f, 0x20, 0xd8,
121 0x89, 0xd4, 0x74, 0x22, 0x27, 0xce, 0xd8, 0x99, 0xf6, 0x66, 0x83, 0xb8, 0x5a, 0x8c, 0x97, 0xd5,
122 0x20, 0xa9, 0x11, 0x0c, 0xc1, 0xe5, 0x19, 0x71, 0x0d, 0xd8, 0x4d, 0x4c, 0x85, 0x5f, 0xa1, 0xc7,
123 0xd5, 0x9a, 0x6a, 0x4d, 0xd3, 0x67, 0x96, 0x11, 0xcf, 0x0c, 0x82, 0x04, 0xb8, 0x9a, 0x57, 0x0a,
124 0x4e, 0x21, 0xda, 0xf0, 0x17, 0x96, 0x99, 0xbb, 0xd6, 0x34, 0xcb, 0x24, 0x53, 0x8a, 0xb4, 0xec,
125 0x7a, 0x68, 0xf5, 0x45, 0x31, 0x2f, 0x55, 0x8c, 0x61, 0x78, 0x65, 0xa2, 0x86, 0xdb, 0x16, 0xae,
126 0xfd, 0x35, 0x3c, 0x81, 0x4e, 0xce, 0xf4, 0x49, 0xc8, 0x2d, 0xf1, 0x2d, 0xf3, 0xde, 0x22, 0x42,
127 0xab, 0x10, 0x52, 0x93, 0x8e, 0x95, 0x6d, 0x8d, 0x33, 0xf0, 0x95, 0xa6, 0xfa, 0xa0, 0x48, 0x60,
128 0xd4, 0x70, 0x36, 0xaa, 0x5d, 0x36, 0x61, 0xc4, 0x0f, 0x96, 0x48, 0x2a, 0x12, 0xff, 0x01, 0x98,
129 0xcc, 0x0a, 0x26, 0x35, 0x67, 0x8a, 0xa4, 0x63, 0xcf, 0xa4, 0xf3, 0xed, 0xd6, 0xde, 0xaa, 0xa6,
130 0xfe, 0xe7, 0x5a, 0x9e, 0x93, 0xab, 0xb5, 0xd1, 0x5f, 0xf8, 0xfc, 0x61, 0x8c, 0x11, 0x78, 0x5b,
131 0x76, 0xb6, 0x71, 0x77, 0x93, 0x4b, 0x89, 0x5f, 0xa0, 0x7d, 0xa4, 0xbb, 0x03, 0xab, 0x92, 0x2d,
132 0x9b, 0x3f, 0xee, 0x6f, 0x67, 0xf2, 0x1d, 0xfc, 0xf2, 0x2a, 0x04, 0xf0, 0x69, 0xaa, 0xf9, 0x91,
133 0x45, 0x9f, 0x30, 0x80, 0x56, 0x26, 0x4e, 0x79, 0xe4, 0x60, 0x17, 0xda, 0x4c, 0x4a, 0x21, 0x23,
134 0x77, 0x72, 0x0f, 0x61, 0x73, 0xd3, 0x92, 0x2b, 0x8d, 0xbf, 0xa0, 0x7f, 0x15, 0xa9, 0x32, 0x2f,
135 0x5e, 0x2c, 0x0c, 0x6f, 0x58, 0x48, 0x7a, 0x4d, 0xc0, 0xea, 0xd1, 0xb7, 0x5f, 0xe5, 0xe7, 0x5b,
136 0x00, 0x00, 0x00, 0xff, 0xff, 0x1d, 0x8d, 0x18, 0x49, 0x56, 0x02, 0x00, 0x00,
137}
diff --git a/oaktreemodel/floating_ip.proto b/oaktreemodel/floating_ip.proto
new file mode 100644
index 0000000..bca48ed
--- /dev/null
+++ b/oaktreemodel/floating_ip.proto
@@ -0,0 +1,41 @@
1// Copyright (c) 2016 Red Hat, Inc
2//
3// Licensed under the Apache License, Version 2.0 (the "License");
4// you may not use this file except in compliance with the License.
5// You may obtain a copy of the License at
6//
7// http://www.apache.org/licenses/LICENSE-2.0
8//
9// Unless required by applicable law or agreed to in writing, software
10// distributed under the License is distributed on an "AS IS" BASIS,
11// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
12// implied.
13// See the License for the specific language governing permissions and
14// limitations under the License.
15
16syntax = "proto3";
17
18import "common.proto";
19
20package oaktree;
21
22message FloatingIP {
23 Location location = 1;
24 string id = 2;
25 bool is_attached = 3;
26 string fixed_ip_address = 4;
27 string floating_ip_address = 5;
28 string network = 6;
29 string port = 7;
30 enum Status {
31 active = 0;
32 down = 1;
33 error = 2;
34 }
35 Status status = 8;
36 map<string, string> properties = 99;
37}
38
39message FloatingIPList {
40 repeated FloatingIP floating_ips = 1;
41}
diff --git a/oaktreemodel/model.py b/oaktreemodel/model.py
index 2908b21..7d25f65 100644
--- a/oaktreemodel/model.py
+++ b/oaktreemodel/model.py
@@ -16,6 +16,7 @@
16 16
17from oaktreemodel.common_pb2 import Project, Location, Filter 17from oaktreemodel.common_pb2 import Project, Location, Filter
18from oaktreemodel.flavor_pb2 import Flavor, FlavorList 18from oaktreemodel.flavor_pb2 import Flavor, FlavorList
19from oaktreemodel.floating_ip_pb2 import FloatingIP, FloatingIPList
19from oaktreemodel.image_pb2 import Image, ImageList 20from oaktreemodel.image_pb2 import Image, ImageList
20from oaktreemodel.security_group_pb2 import SecurityGroup, SecurityGroupList 21from oaktreemodel.security_group_pb2 import SecurityGroup, SecurityGroupList
21from oaktreemodel.security_group_pb2 import SecurityGroupRule 22from oaktreemodel.security_group_pb2 import SecurityGroupRule
diff --git a/oaktreemodel/oaktree.pb.go b/oaktreemodel/oaktree.pb.go
index fb3a1b0..4187105 100644
--- a/oaktreemodel/oaktree.pb.go
+++ b/oaktreemodel/oaktree.pb.go
@@ -19,6 +19,7 @@ import _ "."
19import _ "." 19import _ "."
20import _ "." 20import _ "."
21import _ "." 21import _ "."
22import _ "."
22 23
23// Reference imports to suppress errors if they are not otherwise used. 24// Reference imports to suppress errors if they are not otherwise used.
24var _ = proto.Marshal 25var _ = proto.Marshal
@@ -34,24 +35,26 @@ const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
34func init() { proto.RegisterFile("oaktree.proto", fileDescriptor0) } 35func init() { proto.RegisterFile("oaktree.proto", fileDescriptor0) }
35 36
36var fileDescriptor0 = []byte{ 37var fileDescriptor0 = []byte{
37 // 291 bytes of a gzipped FileDescriptorProto 38 // 327 bytes of a gzipped FileDescriptorProto
38 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0xdf, 0x4a, 0xc3, 0x30, 39 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x92, 0xd1, 0x4a, 0xf3, 0x30,
39 0x18, 0xc5, 0xd5, 0x81, 0xd3, 0xcf, 0x4e, 0x25, 0x0e, 0x91, 0x08, 0x5e, 0x78, 0x6f, 0x05, 0x87, 40 0x1c, 0xc5, 0xbf, 0x4f, 0xc5, 0xe9, 0xdf, 0x4e, 0x5d, 0x1d, 0x2a, 0x15, 0xbc, 0xf0, 0xde, 0x0a,
40 0x78, 0xe5, 0x85, 0x03, 0x37, 0x44, 0x65, 0xc3, 0x3d, 0x80, 0xc4, 0x92, 0xd5, 0xb0, 0xb6, 0x29, 41 0x0e, 0xf1, 0x4a, 0xc4, 0x81, 0x1b, 0x43, 0x65, 0xc5, 0x3d, 0xc0, 0x88, 0x25, 0xad, 0x61, 0x6d,
41 0x5f, 0x53, 0xc1, 0xd7, 0xf1, 0x1d, 0xbd, 0x37, 0xff, 0x36, 0xec, 0x1a, 0xc1, 0xcb, 0x9c, 0x9c, 42 0x53, 0xd2, 0x54, 0xf0, 0x75, 0x7c, 0x41, 0x5f, 0xc1, 0x34, 0xf9, 0x77, 0xd8, 0x35, 0x8a, 0x97,
42 0xdf, 0x39, 0x27, 0x10, 0xe8, 0x49, 0xb6, 0x50, 0xc8, 0x79, 0x5c, 0xa2, 0x54, 0x92, 0x74, 0xfd, 43 0x39, 0x39, 0xe7, 0xfc, 0x0e, 0x21, 0xd0, 0xe5, 0x64, 0x21, 0x05, 0xa5, 0x7e, 0x2e, 0xb8, 0xe4,
43 0x91, 0x46, 0x89, 0xcc, 0x73, 0x59, 0x38, 0x99, 0x46, 0xf3, 0x8c, 0x7d, 0x48, 0xf4, 0xa7, 0x3d, 44 0x6e, 0x07, 0x8f, 0x9e, 0x13, 0xf2, 0x34, 0xe5, 0x99, 0x91, 0x3d, 0x27, 0x4a, 0xc8, 0x1b, 0x17,
44 0x91, 0xb3, 0xd4, 0x13, 0xb4, 0x5f, 0xf1, 0xa4, 0x46, 0xa1, 0x3e, 0x5f, 0x53, 0x94, 0x75, 0xe9, 45 0x78, 0xea, 0x45, 0x09, 0x27, 0x92, 0x65, 0xf1, 0x9c, 0xe5, 0x28, 0xed, 0xb0, 0x94, 0xc4, 0x58,
45 0xd4, 0xab, 0xef, 0x0e, 0x74, 0x27, 0x2e, 0x8a, 0x5c, 0xc2, 0xee, 0x98, 0xab, 0x91, 0x4d, 0x20, 46 0xe2, 0xf5, 0x0b, 0x1a, 0x96, 0x82, 0xc9, 0xf7, 0x79, 0x2c, 0x78, 0x89, 0x96, 0xcb, 0xcf, 0x0d,
46 0x07, 0xf1, 0xb2, 0x70, 0x24, 0x32, 0xc5, 0x91, 0xfe, 0x12, 0xac, 0xe3, 0x7c, 0x83, 0xdc, 0x40, 47 0xe8, 0x4c, 0x4d, 0xbb, 0x7b, 0x01, 0xdb, 0x63, 0x2a, 0x47, 0xba, 0xd4, 0xdd, 0xf3, 0xeb, 0x0d,
47 0x6f, 0xc6, 0x19, 0x26, 0xef, 0x4e, 0xa9, 0xda, 0xd0, 0xd1, 0x1a, 0xf4, 0x24, 0x2a, 0xa5, 0xc1, 48 0x23, 0x96, 0x48, 0x2a, 0xbc, 0x6f, 0x82, 0x76, 0x9c, 0xfd, 0x73, 0xaf, 0xa1, 0x3b, 0xa3, 0x44,
48 0x0b, 0xd8, 0xd1, 0x4d, 0x0f, 0x66, 0x5d, 0x9b, 0xd9, 0x5f, 0x09, 0xd6, 0xa0, 0xed, 0xd7, 0x10, 49 0x84, 0xaf, 0x46, 0x29, 0xda, 0xa1, 0x83, 0x95, 0xd0, 0x23, 0x2b, 0xa4, 0x09, 0x6a, 0x92, 0x19,
49 0xb9, 0x1e, 0x2b, 0x04, 0x6a, 0x48, 0x13, 0xf1, 0x2d, 0xb7, 0x70, 0xa8, 0x5b, 0x66, 0xfe, 0xd9, 50 0x3c, 0x09, 0x7e, 0x0f, 0xd6, 0x2e, 0x15, 0xbc, 0x85, 0x5e, 0x4d, 0xac, 0x55, 0x0b, 0xf5, 0xc8,
50 0x63, 0xf3, 0xea, 0x36, 0x7a, 0xbc, 0x12, 0x1a, 0x46, 0x8d, 0xdf, 0x43, 0xdf, 0xb5, 0x36, 0x2e, 51 0x12, 0x46, 0xf2, 0x39, 0x6c, 0x29, 0xf2, 0xa4, 0x7a, 0x97, 0x76, 0x6e, 0x77, 0x29, 0x68, 0x83,
51 0x02, 0xed, 0x34, 0x1c, 0xe1, 0x57, 0xe8, 0x98, 0xf5, 0x15, 0x2f, 0x75, 0xc6, 0xff, 0x1d, 0x63, 52 0xb2, 0x5f, 0x81, 0x63, 0x78, 0x5a, 0xb0, 0xa0, 0xdc, 0x66, 0x04, 0x29, 0x37, 0xb0, 0xaf, 0x28,
52 0xcc, 0x3a, 0xe6, 0x19, 0x4e, 0x02, 0x6b, 0xcc, 0x65, 0x60, 0xd1, 0xd9, 0xdf, 0x51, 0x6e, 0xd5, 53 0x33, 0x7c, 0xf0, 0x71, 0xf5, 0xde, 0xed, 0xe8, 0xe1, 0x52, 0x68, 0x18, 0x55, 0xfc, 0x1e, 0xfa,
53 0x70, 0x00, 0xa7, 0x12, 0xd3, 0x58, 0x96, 0xbc, 0xa8, 0x14, 0x4b, 0x16, 0xb1, 0x28, 0xe6, 0xc8, 54 0x86, 0xda, 0xb8, 0xb0, 0xd0, 0x3d, 0x7b, 0x05, 0xae, 0x50, 0x35, 0xab, 0x2b, 0x9e, 0xcb, 0x84,
54 0x96, 0xd8, 0x30, 0xf2, 0x7f, 0x62, 0x6a, 0x3e, 0xc9, 0x74, 0xf3, 0x6b, 0xab, 0x33, 0xb9, 0x7b, 55 0xfe, 0xb9, 0xa6, 0x32, 0xab, 0x9a, 0x27, 0x38, 0xb6, 0xac, 0xa9, 0x2e, 0x2d, 0x8b, 0x4e, 0x7f,
55 0x7c, 0xdb, 0xb6, 0x7f, 0x66, 0xf0, 0x13, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x6e, 0xbe, 0xa3, 0x8c, 56 0xae, 0x32, 0xab, 0x86, 0x03, 0x38, 0xe1, 0x22, 0xf6, 0x79, 0x4e, 0xb3, 0x42, 0x92, 0x70, 0xe1,
56 0x02, 0x00, 0x00, 57 0xb3, 0x2c, 0x12, 0xa4, 0x8e, 0x0d, 0x1d, 0xfc, 0x8d, 0x41, 0xf5, 0x3d, 0x83, 0xff, 0x1f, 0x6b,
58 0xeb, 0xd3, 0xbb, 0x87, 0x97, 0x4d, 0xfd, 0x5b, 0x07, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x66,
59 0xa3, 0x18, 0x3f, 0x19, 0x03, 0x00, 0x00,
57} 60}
diff --git a/oaktreemodel/oaktree.proto b/oaktreemodel/oaktree.proto
index 33e1af3..da11770 100644
--- a/oaktreemodel/oaktree.proto
+++ b/oaktreemodel/oaktree.proto
@@ -22,6 +22,7 @@ option objc_class_prefix = "OAK";
22 22
23import "common.proto"; 23import "common.proto";
24import "flavor.proto"; 24import "flavor.proto";
25import "floating_ip.proto";
25import "image.proto"; 26import "image.proto";
26import "security_group.proto"; 27import "security_group.proto";
27 28
@@ -30,6 +31,8 @@ package oaktree;
30service Oaktree { 31service Oaktree {
31 rpc GetFlavor (Filter) returns (Flavor) {} 32 rpc GetFlavor (Filter) returns (Flavor) {}
32 rpc SearchFlavors (Filter) returns (FlavorList) {} 33 rpc SearchFlavors (Filter) returns (FlavorList) {}
34 rpc GetFloatingIP (Filter) returns (FloatingIP) {}
35 rpc SearchFloatingIPs (Filter) returns (FloatingIPList) {}
33 rpc GetImage (Filter) returns (Image) {} 36 rpc GetImage (Filter) returns (Image) {}
34 rpc SearchImages (Filter) returns (ImageList) {} 37 rpc SearchImages (Filter) returns (ImageList) {}
35 rpc GetSecurityGroup (Filter) returns (SecurityGroup) {} 38 rpc GetSecurityGroup (Filter) returns (SecurityGroup) {}