Merge pull request #5 from tianxiaoliang/main

add model

Author: tianxiaoliang

discovery/instance.go

@@ -67,6 +67,10 @@ type GetInstancesResponse struct {
 	Instances []*MicroServiceInstance `protobuf:"bytes,2,rep,name=instances" json:"instances,omitempty"`
 }
 
+type GetProviderInstancesRequest struct {
+	ProviderServiceId string `protobuf:"bytes,1,opt,name=providerServiceId" json:"providerServiceId,omitempty"`
+}
+
 type UpdateInstanceStatusRequest struct {
 	ServiceId  string `protobuf:"bytes,1,opt,name=serviceId" json:"serviceId,omitempty"`
 	InstanceId string `protobuf:"bytes,2,opt,name=instanceId" json:"instanceId,omitempty"`
@@ -109,3 +113,11 @@ type UpdateInstancePropsRequest struct {
 type UpdateInstancePropsResponse struct {
 	Response *Response `protobuf:"bytes,1,opt,name=response" json:"response,omitempty"`
 }
+
+type GetAllInstancesRequest struct {
+}
+
+type GetAllInstancesResponse struct {
+	Response  *Response               `protobuf:"bytes,1,opt,name=response" json:"response,omitempty"`
+	Instances []*MicroServiceInstance `protobuf:"bytes,2,rep,name=instances" json:"instances,omitempty"`
+}

discovery/types.go

@@ -17,6 +17,8 @@
 
 package discovery
 
+import "fmt"
+
 const (
 	MS_UP   string = "UP"
 	MS_DOWN string = "DOWN"
@@ -105,14 +107,16 @@ type GetServicesInfoResponse struct {
 
 type MicroServiceKey struct {
 	// Tenant: The format is "{domain}/{project}"
-	Tenant string `protobuf:"bytes,1,opt,name=tenant" json:"tenant,omitempty"`
-	// Deprecated: Use Tenant instead
-	Project     string `protobuf:"bytes,2,opt,name=project" json:"project,omitempty"`
+	Tenant      string `protobuf:"bytes,1,opt,name=tenant" json:"tenant,omitempty"`
+	Environment string `protobuf:"bytes,2,opt,name=environment" json:"environment,omitempty"`
 	AppId       string `protobuf:"bytes,3,opt,name=appId" json:"appId,omitempty"`
 	ServiceName string `protobuf:"bytes,4,opt,name=serviceName" json:"serviceName,omitempty"`
-	Version     string `protobuf:"bytes,5,opt,name=version" json:"version,omitempty"`
-	Environment string `protobuf:"bytes,6,opt,name=environment" json:"environment,omitempty"`
-	Alias       string `protobuf:"bytes,7,opt,name=alias" json:"alias,omitempty"`
+	Alias       string `protobuf:"bytes,5,opt,name=alias" json:"alias,omitempty"`
+	Version     string `protobuf:"bytes,6,opt,name=version" json:"version,omitempty"`
+}
+
+func (mk *MicroServiceKey) String() string {
+	return fmt.Sprintf("&{%v %v %v %v %v %v}", mk.Tenant, mk.Environment, mk.AppId, mk.ServiceName, mk.Alias, mk.Version)
 }
 
 type FrameWorkProperty struct {
@@ -363,6 +367,10 @@ type ConsumerDependency struct {
 	Override  bool               `protobuf:"varint,3,opt,name=override" json:"override,omitempty"`
 }
 
+func (cd *ConsumerDependency) String() string {
+	return fmt.Sprintf("&{%v %v %v}", cd.Consumer, cd.Providers, cd.Override)
+}
+
 type CreateDependenciesResponse struct {
 	Response *Response `protobuf:"bytes,1,opt,name=response" json:"response,omitempty"`
 }
@@ -430,3 +438,12 @@ type MicroServiceDependency struct {
 type BatchGetInstancesRequest struct {
 	ServiceIds []string `json:"serviceIds,omitempty"`
 }
+
+type GetServiceCountRequest struct {
+	Domain  string `protobuf:"bytes,1,opt,name=domain" json:"domain,omitempty"`
+	Project string `protobuf:"bytes,2,opt,name=project" json:"project,omitempty"`
+}
+type GetServiceCountResponse struct {
+	Response *Response `protobuf:"bytes,1,opt,name=response" json:"response,omitempty"`
+	Count    int64     `protobuf:"varint,2,opt,name=count" json:"count,omitempty"`
+}