VOL-3121 - Removed flows/groups/meters/ports/logicalPorts from the Device and LogicalDevice structs.
Change-Id: Ia5a9c9975b36ae3958f8b9dc97198bc5f41a698f
diff --git a/protos/voltha_protos/adapter.proto b/protos/voltha_protos/adapter.proto
index 5580784..175d8a9 100644
--- a/protos/voltha_protos/adapter.proto
+++ b/protos/voltha_protos/adapter.proto
@@ -7,7 +7,6 @@
package voltha;
import "google/protobuf/any.proto";
-import "voltha_protos/common.proto";
import "voltha_protos/meta.proto";
import "google/protobuf/timestamp.proto";
diff --git a/protos/voltha_protos/afrouter.proto b/protos/voltha_protos/afrouter.proto
deleted file mode 100644
index 14f07ed..0000000
--- a/protos/voltha_protos/afrouter.proto
+++ /dev/null
@@ -1,50 +0,0 @@
-// protoc -I echo/ echo/*.proto --go_out=plugins=grpc:echo
-
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-protos/v3/go/afrouter";
-option java_package = "org.opencord.voltha";
-
-package afrouter;
-
-// For logging
-import "voltha_protos/common.proto";
-
-service Configuration {
- rpc SetConnection (Conn) returns (Result) {}
- rpc SetAffinity(Affinity) returns (Result) {}
- rpc GetGoroutineCount(Empty) returns (Count) {}
-}
-
-message Result {
- bool success = 1;
- string error = 2;
- string info = 3;
-}
-
-message Empty {
-}
-
-message Count {
- uint32 count = 1;
-}
-
-message Conn {
- string server = 1;
- string pkg = 2;
- string svc = 3;
- string cluster = 4;
- string backend = 5;
- string connection = 6;
- string addr = 7;
- uint64 port = 8;
-}
-
-message Affinity {
- string router = 1;
- string route = 2;
- string cluster = 3;
- string backend = 4;
- string id = 5;
-}
-
diff --git a/protos/voltha_protos/device.proto b/protos/voltha_protos/device.proto
index 0baf1bc..1245e58 100644
--- a/protos/voltha_protos/device.proto
+++ b/protos/voltha_protos/device.proto
@@ -101,6 +101,7 @@
repeated Image image = 1;
}
+//TODO: ImageDownload is not actively used (05/19/2020). When this is tackled, can remove extra/unnecessary fields.
message ImageDownload {
enum ImageDownloadState {
DOWNLOAD_UNKNOWN = 0;
@@ -166,7 +167,7 @@
// Image activation state
ImageActivateState image_state = 12;
-
+
// Image file size
uint32 file_size = 13;
}
@@ -296,9 +297,6 @@
// Device type specific attributes
google.protobuf.Any custom = 64;
- repeated Port ports = 128 [(child_node) = {key: "port_no"}];
- openflow_13.Flows flows = 129 [(child_node) = {}];
- openflow_13.FlowGroups flow_groups = 130 [(child_node) = {}];
// PmConfigs will eventually converted to a child node of the
// device to falicitata callbacks and to simplify manipulation.
PmConfigs pm_configs = 131 [(child_node) = {}];
diff --git a/protos/voltha_protos/logical_device.proto b/protos/voltha_protos/logical_device.proto
index 3205778..88de026 100644
--- a/protos/voltha_protos/logical_device.proto
+++ b/protos/voltha_protos/logical_device.proto
@@ -47,20 +47,6 @@
// name of the root device anchoring logical device
string root_device_id = 5;
-
- // logical device ports
- repeated LogicalPort ports = 128 [(child_node) = {key: "id"}];
-
- // flows configured on the logical device
- openflow_13.Flows flows = 129 [(child_node) = {}];
-
- // flow groups configured on the logical device
- openflow_13.FlowGroups flow_groups = 130 [(child_node) = {}];
-
- // meters configured on the logical device
- openflow_13.Meters meters = 131 [(child_node) = {}];
-
-
}
message LogicalDevices {