VOL-1460 Migrated to use voltha-protos
Also removed uses of third_party, which didn't seem to be used, and is not currently provided by voltha-protos
Change-Id: I360b9a67adc981912bb96bdcdd4f41354e0b6772
diff --git a/Makefile b/Makefile
index 766e07d..32d9d23 100644
--- a/Makefile
+++ b/Makefile
@@ -52,15 +52,14 @@
VENV_BIN ?= virtualenv
VENV_OPTS ?=
-.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 protos venv rebuild-venv clean distclean build test docker_base_img docker_image
+.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 venv rebuild-venv clean distclean build test docker_base_img docker_image
# This should to be the first and default target in this Makefile
help:
@echo "Usage: make [<target>]"
@echo "where available targets are:"
@echo
- @echo "build : Build the protos"
- @echo "dist : Build the protos and create the python package"
+ @echo "dist : Create the python package"
@echo "docker_base_img : Build a base docker image with a modern version of pip and requirements.txt installed"
@echo "docker_image : Build a docker image with pyvoltha installed"
@echo "utest : Run all unit test"
@@ -68,7 +67,6 @@
@echo "clean : Remove files created by the build and tests"
@echo "distclean : Remove venv directory"
@echo "help : Print this help"
- @echo "protos : Compile all grpc/protobuf files"
@echo "rebuild-venv : Rebuild local Python virtualenv from scratch"
@echo "venv : Build local Python virtualenv if did not exist yet"
@echo
@@ -100,12 +98,7 @@
@echo " FLAKE8 $(basename $@)"
-$(Q)$(MAKE) -C $(basename $@) flake8
-build: protos
-
-protos:
- @ . ${VENVDIR}/bin/activate && make -C pyvoltha/protos
-
-dist: venv protos
+dist: venv
@ echo "Creating PyPi artifacts"
python setup.py sdist
@@ -120,10 +113,7 @@
docker_image: docker_base_img dist
docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}pyvoltha:${TAG} -f docker/Dockerfile.pyvoltha .
-install-protoc:
- make -C pyvoltha/protos install-protoc
-
-test: venv protos
+test: venv
@ echo "Executing all unit tests"
@ tox -- --with-xunit
diff --git a/pyvoltha/adapters/extensions/alarms/adapter_alarms.py b/pyvoltha/adapters/extensions/alarms/adapter_alarms.py
index 00e74de..56d47a1 100644
--- a/pyvoltha/adapters/extensions/alarms/adapter_alarms.py
+++ b/pyvoltha/adapters/extensions/alarms/adapter_alarms.py
@@ -15,7 +15,7 @@
import structlog
import arrow
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity,\
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity,\
AlarmEventState, AlarmEventCategory
log = structlog.get_logger()
diff --git a/pyvoltha/adapters/extensions/alarms/heartbeat_alarm.py b/pyvoltha/adapters/extensions/alarms/heartbeat_alarm.py
index 34472b4..74b8c7f 100644
--- a/pyvoltha/adapters/extensions/alarms/heartbeat_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/heartbeat_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/olt/olt_los_alarm.py b/pyvoltha/adapters/extensions/alarms/olt/olt_los_alarm.py
index 461c390..f6145c5 100644
--- a/pyvoltha/adapters/extensions/alarms/olt/olt_los_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/olt/olt_los_alarm.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_activation_fail_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_activation_fail_alarm.py
index b1d33b1..11662c6 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_activation_fail_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_activation_fail_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_active_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_active_alarm.py
index e6a7ea1..c675b9a 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_active_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_active_alarm.py
@@ -13,7 +13,7 @@
# limitations under the License.
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
class OnuActiveAlarm(AlarmBase):
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_discovery_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_discovery_alarm.py
index f989a41..d242a9f 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_discovery_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_discovery_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_dying_gasp_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_dying_gasp_alarm.py
index 2a310c7..4e659d2 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_dying_gasp_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_dying_gasp_alarm.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_equipment_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_equipment_alarm.py
index 127509e..5d80c88 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_equipment_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_equipment_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_high_rx_optical_power_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_high_rx_optical_power_alarm.py
index 36f99ec..ca23bd6 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_high_rx_optical_power_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_high_rx_optical_power_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_high_tx_optical_power_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_high_tx_optical_power_alarm.py
index bcfd4d3..ce9c543 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_high_tx_optical_power_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_high_tx_optical_power_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_laser_bias_current_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_laser_bias_current_alarm.py
index eabcf46..e74a83e 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_laser_bias_current_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_laser_bias_current_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_laser_eol_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_laser_eol_alarm.py
index 7fe1730..046296e 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_laser_eol_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_laser_eol_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_lob_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_lob_alarm.py
index 9f40a92..cbf24cb 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_lob_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_lob_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_lopc_mic_error_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_lopc_mic_error_alarm.py
index b4b741d..8498d91 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_lopc_mic_error_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_lopc_mic_error_alarm.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_lopc_miss_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_lopc_miss_alarm.py
index db2efe6..8c7a632 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_lopc_miss_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_lopc_miss_alarm.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_los_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_los_alarm.py
index 47d5c04..9511f28 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_los_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_los_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_low_rx_optical_power_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_low_rx_optical_power_alarm.py
index d681d42..a76ab75 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_low_rx_optical_power_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_low_rx_optical_power_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_low_tx_optical_power_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_low_tx_optical_power_alarm.py
index 59fd3ee..8360bee 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_low_tx_optical_power_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_low_tx_optical_power_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_selftest_failure_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_selftest_failure_alarm.py
index 17ca578..0465241 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_selftest_failure_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_selftest_failure_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_signal_degrade_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_signal_degrade_alarm.py
index 9b47eb9..552fc0b 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_signal_degrade_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_signal_degrade_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_signal_fail_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_signal_fail_alarm.py
index c25b752..c2dd827 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_signal_fail_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_signal_fail_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
"""
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_startup_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_startup_alarm.py
index 32b9d2e..8a787de 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_startup_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_startup_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
"""
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_temp_red_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_temp_red_alarm.py
index f1def93..5d34732 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_temp_red_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_temp_red_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_temp_yellow_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_temp_yellow_alarm.py
index 8a79df9..4c40881 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_temp_yellow_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_temp_yellow_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_voltage_red_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_voltage_red_alarm.py
index 1b727b3..70eec8f 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_voltage_red_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_voltage_red_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_voltage_yellow_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_voltage_yellow_alarm.py
index 04baea6..ee65ed5 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_voltage_yellow_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_voltage_yellow_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/alarms/onu/onu_window_drift_alarm.py b/pyvoltha/adapters/extensions/alarms/onu/onu_window_drift_alarm.py
index 132215d..4bed348 100644
--- a/pyvoltha/adapters/extensions/alarms/onu/onu_window_drift_alarm.py
+++ b/pyvoltha/adapters/extensions/alarms/onu/onu_window_drift_alarm.py
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
+from voltha_protos.events_pb2 import AlarmEventType, AlarmEventSeverity, AlarmEventCategory
from pyvoltha.adapters.extensions.alarms.adapter_alarms import AlarmBase
diff --git a/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py b/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py
index 5337d53..4a92bee 100644
--- a/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py
+++ b/pyvoltha/adapters/extensions/kpi/adapter_pm_metrics.py
@@ -15,8 +15,8 @@
import structlog
import arrow
from twisted.internet.task import LoopingCall
-from pyvoltha.protos.events_pb2 import KpiEvent2, KpiEventType, MetricInformation, MetricMetaData
-from pyvoltha.protos.device_pb2 import PmConfig
+from voltha_protos.events_pb2 import KpiEvent2, KpiEventType, MetricInformation, MetricMetaData
+from voltha_protos.device_pb2 import PmConfig
class AdapterPmMetrics(object):
diff --git a/pyvoltha/adapters/extensions/kpi/olt/olt_pm_metrics.py b/pyvoltha/adapters/extensions/kpi/olt/olt_pm_metrics.py
index fe3c326..da3a677 100644
--- a/pyvoltha/adapters/extensions/kpi/olt/olt_pm_metrics.py
+++ b/pyvoltha/adapters/extensions/kpi/olt/olt_pm_metrics.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.device_pb2 import PmConfig, PmConfigs, PmGroupConfig
+from voltha_protos.device_pb2 import PmConfig, PmConfigs, PmGroupConfig
from pyvoltha.adapters.extensions.kpi.adapter_pm_metrics import AdapterPmMetrics
diff --git a/pyvoltha/adapters/extensions/kpi/onu/onu_omci_pm.py b/pyvoltha/adapters/extensions/kpi/onu/onu_omci_pm.py
index 2daf864..98c1129 100644
--- a/pyvoltha/adapters/extensions/kpi/onu/onu_omci_pm.py
+++ b/pyvoltha/adapters/extensions/kpi/onu/onu_omci_pm.py
@@ -13,8 +13,8 @@
# limitations under the License.
import arrow
-from pyvoltha.protos.device_pb2 import PmConfig, PmGroupConfig
-from pyvoltha.protos.events_pb2 import MetricInformation, MetricMetaData
+from voltha_protos.device_pb2 import PmConfig, PmGroupConfig
+from voltha_protos.events_pb2 import MetricInformation, MetricMetaData
from pyvoltha.adapters.extensions.kpi.adapter_pm_metrics import AdapterPmMetrics
from pyvoltha.adapters.extensions.kpi.onu.onu_pm_interval_metrics import OnuPmIntervalMetrics
from pyvoltha.adapters.extensions.omci.omci_entities import UniG
diff --git a/pyvoltha/adapters/extensions/kpi/onu/onu_pm_interval_metrics.py b/pyvoltha/adapters/extensions/kpi/onu/onu_pm_interval_metrics.py
index 226a55c..8b7bf79 100644
--- a/pyvoltha/adapters/extensions/kpi/onu/onu_pm_interval_metrics.py
+++ b/pyvoltha/adapters/extensions/kpi/onu/onu_pm_interval_metrics.py
@@ -13,8 +13,8 @@
# limitations under the License.
import arrow
-from pyvoltha.protos.device_pb2 import PmConfig, PmGroupConfig
-from pyvoltha.protos.events_pb2 import KpiEvent2, MetricInformation, MetricMetaData, KpiEventType
+from voltha_protos.device_pb2 import PmConfig, PmGroupConfig
+from voltha_protos.events_pb2 import KpiEvent2, MetricInformation, MetricMetaData, KpiEventType
from pyvoltha.adapters.extensions.kpi.adapter_pm_metrics import AdapterPmMetrics
from pyvoltha.adapters.extensions.omci.omci_entities import \
EthernetFrameUpstreamPerformanceMonitoringHistoryData, \
diff --git a/pyvoltha/adapters/extensions/kpi/onu/onu_pm_metrics.py b/pyvoltha/adapters/extensions/kpi/onu/onu_pm_metrics.py
index 59e3e76..9402ae9 100644
--- a/pyvoltha/adapters/extensions/kpi/onu/onu_pm_metrics.py
+++ b/pyvoltha/adapters/extensions/kpi/onu/onu_pm_metrics.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from pyvoltha.protos.device_pb2 import PmConfig, PmConfigs, PmGroupConfig
+from voltha_protos.device_pb2 import PmConfig, PmConfigs, PmGroupConfig
from pyvoltha.adapters.extensions.kpi.adapter_pm_metrics import AdapterPmMetrics
from pyvoltha.adapters.extensions.kpi.onu.onu_omci_pm import OnuOmciPmMetrics
diff --git a/pyvoltha/adapters/extensions/omci/database/alarm_db_ext.py b/pyvoltha/adapters/extensions/omci/database/alarm_db_ext.py
index ccb6de5..575ef54 100644
--- a/pyvoltha/adapters/extensions/omci/database/alarm_db_ext.py
+++ b/pyvoltha/adapters/extensions/omci/database/alarm_db_ext.py
@@ -14,7 +14,7 @@
# limitations under the License.
#
from mib_db_api import *
-from pyvoltha.protos.omci_alarm_db_pb2 import AlarmInstanceData, AlarmClassData, \
+from voltha_protos.omci_alarm_db_pb2 import AlarmInstanceData, AlarmClassData, \
AlarmDeviceData, AlarmAttributeData
diff --git a/pyvoltha/adapters/extensions/omci/database/mib_db_ext.py b/pyvoltha/adapters/extensions/omci/database/mib_db_ext.py
index 0c5ee7b..4415987 100644
--- a/pyvoltha/adapters/extensions/omci/database/mib_db_ext.py
+++ b/pyvoltha/adapters/extensions/omci/database/mib_db_ext.py
@@ -14,7 +14,7 @@
# limitations under the License.
#
from mib_db_api import *
-from pyvoltha.protos.omci_mib_db_pb2 import MibInstanceData, MibClassData, \
+from voltha_protos.omci_mib_db_pb2 import MibInstanceData, MibClassData, \
MibDeviceData, MibAttributeData, MessageType, ManagedEntity
from pyvoltha.adapters.extensions.omci.omci_entities import *
from pyvoltha.adapters.extensions.omci.omci_fields import *
diff --git a/pyvoltha/adapters/extensions/omci/onu_configuration.py b/pyvoltha/adapters/extensions/omci/onu_configuration.py
index af55607..710bbca 100644
--- a/pyvoltha/adapters/extensions/omci/onu_configuration.py
+++ b/pyvoltha/adapters/extensions/omci/onu_configuration.py
@@ -15,7 +15,7 @@
#
import structlog
-from pyvoltha.protos.device_pb2 import Image
+from voltha_protos.device_pb2 import Image
from omci_entities import *
from database.mib_db_api import *
from enum import IntEnum
diff --git a/pyvoltha/adapters/extensions/omci/onu_device_entry.py b/pyvoltha/adapters/extensions/omci/onu_device_entry.py
index 96800ec..062edc4 100644
--- a/pyvoltha/adapters/extensions/omci/onu_device_entry.py
+++ b/pyvoltha/adapters/extensions/omci/onu_device_entry.py
@@ -16,7 +16,7 @@
import structlog
from copy import deepcopy
-from pyvoltha.protos.device_pb2 import ImageDownload
+from voltha_protos.device_pb2 import ImageDownload
from pyvoltha.adapters.extensions.omci.omci_defs import EntityOperations, ReasonCodes
import pyvoltha.adapters.extensions.omci.omci_entities as omci_entities
from pyvoltha.adapters.extensions.omci.omci_cc import OMCI_CC
diff --git a/pyvoltha/adapters/extensions/omci/openomci_event_bus.py b/pyvoltha/adapters/extensions/omci/openomci_event_bus.py
index 34d688e..1df33ee 100644
--- a/pyvoltha/adapters/extensions/omci/openomci_event_bus.py
+++ b/pyvoltha/adapters/extensions/omci/openomci_event_bus.py
@@ -17,8 +17,8 @@
from google.protobuf.message import Message
from simplejson import dumps
from pyvoltha.common.event_bus import EventBusClient
-from pyvoltha.protos.omci_mib_db_pb2 import OpenOmciEvent
-from pyvoltha.protos.omci_alarm_db_pb2 import AlarmOpenOmciEvent
+from voltha_protos.omci_mib_db_pb2 import OpenOmciEvent
+from voltha_protos.omci_alarm_db_pb2 import AlarmOpenOmciEvent
from pyvoltha.common.utils.json_format import MessageToDict
diff --git a/pyvoltha/adapters/extensions/omci/state_machines/alarm_sync.py b/pyvoltha/adapters/extensions/omci/state_machines/alarm_sync.py
index f1ce204..8f22796 100644
--- a/pyvoltha/adapters/extensions/omci/state_machines/alarm_sync.py
+++ b/pyvoltha/adapters/extensions/omci/state_machines/alarm_sync.py
@@ -26,7 +26,7 @@
from pyvoltha.adapters.extensions.omci.omci_entities import CircuitPack, PptpEthernetUni, OntG, AniG
from pyvoltha.common.event_bus import EventBusClient
-from pyvoltha.protos.omci_alarm_db_pb2 import AlarmOpenOmciEventType
+from voltha_protos.omci_alarm_db_pb2 import AlarmOpenOmciEventType
RxEvent = OmciCCRxEvents
RC = ReasonCodes
diff --git a/pyvoltha/adapters/extensions/omci/state_machines/image_agent.py b/pyvoltha/adapters/extensions/omci/state_machines/image_agent.py
index c758270..85a11e3 100755
--- a/pyvoltha/adapters/extensions/omci/state_machines/image_agent.py
+++ b/pyvoltha/adapters/extensions/omci/state_machines/image_agent.py
@@ -21,8 +21,8 @@
from twisted.python import failure
from twisted.internet import reactor
from twisted.internet.defer import Deferred, CancelledError
-from pyvoltha.protos.voltha_pb2 import ImageDownload
-from pyvoltha.protos.omci_mib_db_pb2 import OpenOmciEventType
+from voltha_protos.voltha_pb2 import ImageDownload
+from voltha_protos.omci_mib_db_pb2 import OpenOmciEventType
from pyvoltha.adapters.extensions.omci.omci_defs import ReasonCodes, OmciSectionDataSize
from pyvoltha.adapters.extensions.omci.omci_entities import SoftwareImage
from pyvoltha.adapters.extensions.omci.omci_cc import DEFAULT_OMCI_TIMEOUT
diff --git a/pyvoltha/adapters/extensions/omci/state_machines/mib_sync.py b/pyvoltha/adapters/extensions/omci/state_machines/mib_sync.py
index 62e2118..0445324 100644
--- a/pyvoltha/adapters/extensions/omci/state_machines/mib_sync.py
+++ b/pyvoltha/adapters/extensions/omci/state_machines/mib_sync.py
@@ -27,7 +27,7 @@
SUPPORTED_MESSAGE_ENTITY_KEY, SUPPORTED_MESSAGE_TYPES_KEY
from pyvoltha.adapters.extensions.omci.omci_entities import OntData
from pyvoltha.common.event_bus import EventBusClient
-from pyvoltha.protos.omci_mib_db_pb2 import OpenOmciEventType
+from voltha_protos.omci_mib_db_pb2 import OpenOmciEventType
RxEvent = OmciCCRxEvents
DevEvent = OnuDeviceEvents
diff --git a/pyvoltha/adapters/extensions/omci/state_machines/omci_onu_capabilities.py b/pyvoltha/adapters/extensions/omci/state_machines/omci_onu_capabilities.py
index 418788f..3cf6ac3 100644
--- a/pyvoltha/adapters/extensions/omci/state_machines/omci_onu_capabilities.py
+++ b/pyvoltha/adapters/extensions/omci/state_machines/omci_onu_capabilities.py
@@ -17,7 +17,7 @@
from transitions import Machine
from twisted.internet import reactor
from pyvoltha.adapters.extensions.omci.onu_device_entry import OnuDeviceEntry, OnuDeviceEvents, IN_SYNC_KEY
-from pyvoltha.protos.omci_mib_db_pb2 import OpenOmciEventType
+from voltha_protos.omci_mib_db_pb2 import OpenOmciEventType
class OnuOmciCapabilities(object):
diff --git a/pyvoltha/adapters/extensions/omci/state_machines/performance_intervals.py b/pyvoltha/adapters/extensions/omci/state_machines/performance_intervals.py
index c6ab07e..cfdbafa 100644
--- a/pyvoltha/adapters/extensions/omci/state_machines/performance_intervals.py
+++ b/pyvoltha/adapters/extensions/omci/state_machines/performance_intervals.py
@@ -20,7 +20,7 @@
from random import uniform, shuffle
from twisted.internet import reactor
from pyvoltha.common.utils.indexpool import IndexPool
-from pyvoltha.protos.omci_mib_db_pb2 import OpenOmciEventType
+from voltha_protos.omci_mib_db_pb2 import OpenOmciEventType
from pyvoltha.adapters.extensions.omci.omci_defs import EntityOperations, ReasonCodes
from pyvoltha.adapters.extensions.omci.omci_cc import OmciCCRxEvents, OMCI_CC, TX_REQUEST_KEY, \
RX_RESPONSE_KEY
diff --git a/pyvoltha/adapters/extensions/omci/tasks/omci_sw_image_upgrade_task.py b/pyvoltha/adapters/extensions/omci/tasks/omci_sw_image_upgrade_task.py
index 609a55e..fbea4ad 100644
--- a/pyvoltha/adapters/extensions/omci/tasks/omci_sw_image_upgrade_task.py
+++ b/pyvoltha/adapters/extensions/omci/tasks/omci_sw_image_upgrade_task.py
@@ -16,7 +16,7 @@
import structlog
from task import Task
from twisted.internet import reactor
-from pyvoltha.protos.voltha_pb2 import ImageDownload
+from voltha_protos.voltha_pb2 import ImageDownload
class OmciSwImageUpgradeTask(Task):
diff --git a/pyvoltha/adapters/iadapter.py b/pyvoltha/adapters/iadapter.py
index 6473f10..07930ec 100644
--- a/pyvoltha/adapters/iadapter.py
+++ b/pyvoltha/adapters/iadapter.py
@@ -23,12 +23,12 @@
from zope.interface import implementer
from interface import IAdapterInterface
-from pyvoltha.protos.adapter_pb2 import Adapter
-from pyvoltha.protos.adapter_pb2 import AdapterConfig
-from pyvoltha.protos.common_pb2 import AdminState
-from pyvoltha.protos.common_pb2 import LogLevel
-from pyvoltha.protos.device_pb2 import DeviceType, DeviceTypes
-from pyvoltha.protos.health_pb2 import HealthStatus
+from voltha_protos.adapter_pb2 import Adapter
+from voltha_protos.adapter_pb2 import AdapterConfig
+from voltha_protos.common_pb2 import AdminState
+from voltha_protos.common_pb2 import LogLevel
+from voltha_protos.device_pb2 import DeviceType, DeviceTypes
+from voltha_protos.health_pb2 import HealthStatus
log = structlog.get_logger()
diff --git a/pyvoltha/adapters/kafka/adapter_proxy.py b/pyvoltha/adapters/kafka/adapter_proxy.py
index fc9dae0..4f6945f 100644
--- a/pyvoltha/adapters/kafka/adapter_proxy.py
+++ b/pyvoltha/adapters/kafka/adapter_proxy.py
@@ -22,12 +22,10 @@
from uuid import uuid4
from twisted.internet.defer import inlineCallbacks, returnValue
from container_proxy import ContainerProxy
-from pyvoltha.protos import third_party
-from pyvoltha.protos.inter_container_pb2 import InterAdapterHeader, \
+from voltha_protos.inter_container_pb2 import InterAdapterHeader, \
InterAdapterMessage
import time
-_ = third_party
log = structlog.get_logger()
diff --git a/pyvoltha/adapters/kafka/adapter_request_facade.py b/pyvoltha/adapters/kafka/adapter_request_facade.py
index ef13342..98ba680 100644
--- a/pyvoltha/adapters/kafka/adapter_request_facade.py
+++ b/pyvoltha/adapters/kafka/adapter_request_facade.py
@@ -25,9 +25,9 @@
from afkak.consumer import OFFSET_LATEST, OFFSET_EARLIEST
from pyvoltha.adapters.interface import IAdapterInterface
-from pyvoltha.protos.inter_container_pb2 import IntType, InterAdapterMessage, StrType, Error, ErrorCode
-from pyvoltha.protos.device_pb2 import Device, ImageDownload
-from pyvoltha.protos.openflow_13_pb2 import FlowChanges, FlowGroups, Flows, \
+from voltha_protos.inter_container_pb2 import IntType, InterAdapterMessage, StrType, Error, ErrorCode
+from voltha_protos.device_pb2 import Device, ImageDownload
+from voltha_protos.openflow_13_pb2 import FlowChanges, FlowGroups, Flows, \
FlowGroupChanges, ofp_packet_out
from pyvoltha.adapters.kafka.kafka_inter_container_library import IKafkaMessagingProxy, \
get_messaging_proxy, KAFKA_OFFSET_LATEST, KAFKA_OFFSET_EARLIEST, ARG_FROM_TOPIC
diff --git a/pyvoltha/adapters/kafka/core_proxy.py b/pyvoltha/adapters/kafka/core_proxy.py
index 98fa4d6..c0f0dd4 100644
--- a/pyvoltha/adapters/kafka/core_proxy.py
+++ b/pyvoltha/adapters/kafka/core_proxy.py
@@ -22,10 +22,11 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from container_proxy import ContainerProxy
-from pyvoltha.protos.common_pb2 import ID, ConnectStatus, OperStatus
-from pyvoltha.protos.inter_container_pb2 import StrType, BoolType, IntType, Packet
-from pyvoltha.protos.device_pb2 import Device, Ports, Devices
-from pyvoltha.protos.voltha_pb2 import CoreInstance
+
+from voltha_protos.common_pb2 import ID, ConnectStatus, OperStatus
+from voltha_protos.inter_container_pb2 import StrType, BoolType, IntType, Packet
+from voltha_protos.device_pb2 import Device, Portsi, Devices
+from voltha_protos.voltha_pb2 import CoreInstance
log = structlog.get_logger()
diff --git a/pyvoltha/adapters/kafka/kafka_inter_container_library.py b/pyvoltha/adapters/kafka/kafka_inter_container_library.py
index d8840a2..37f11d0 100644
--- a/pyvoltha/adapters/kafka/kafka_inter_container_library.py
+++ b/pyvoltha/adapters/kafka/kafka_inter_container_library.py
@@ -26,7 +26,7 @@
from pyvoltha.common.utils import asleep
from pyvoltha.common.utils.registry import IComponent
from kafka_proxy import KafkaProxy, get_kafka_proxy
-from pyvoltha.protos.inter_container_pb2 import MessageType, Argument, \
+from voltha_protos.inter_container_pb2 import MessageType, Argument, \
InterContainerRequestBody, InterContainerMessage, Header, \
InterContainerResponseBody, StrType
diff --git a/pyvoltha/common/config/config_event_bus.py b/pyvoltha/common/config/config_event_bus.py
index 6043dc5..cfd1252 100644
--- a/pyvoltha/common/config/config_event_bus.py
+++ b/pyvoltha/common/config/config_event_bus.py
@@ -19,8 +19,7 @@
from pyvoltha.common.event_bus import EventBusClient
from pyvoltha.common.config.config_proxy import CallbackType
-from pyvoltha.protos import third_party
-from pyvoltha.protos.events_pb2 import ConfigEvent, ConfigEventType
+from voltha_protos.events_pb2 import ConfigEvent, ConfigEventType
IGNORED_CALLBACKS = [CallbackType.PRE_ADD, CallbackType.GET,
CallbackType.POST_LISTCHANGE, CallbackType.PRE_REMOVE,
diff --git a/pyvoltha/common/config/config_node.py b/pyvoltha/common/config/config_node.py
index d0d35ba..68ef717 100644
--- a/pyvoltha/common/config/config_node.py
+++ b/pyvoltha/common/config/config_node.py
@@ -26,8 +26,7 @@
ConfigRevision, access_rights
from pyvoltha.common.config.config_rev_persisted import PersistedConfigRevision
from pyvoltha.common.config.merge_3way import merge_3way
-from pyvoltha.protos import third_party
-from pyvoltha.protos import meta_pb2
+from voltha_protos import meta_pb2
import structlog
diff --git a/pyvoltha/common/config/config_rev.py b/pyvoltha/common/config/config_rev.py
index faafa47..8e6472f 100644
--- a/pyvoltha/common/config/config_rev.py
+++ b/pyvoltha/common/config/config_rev.py
@@ -29,8 +29,7 @@
from simplejson import dumps
from pyvoltha.common.utils.json_format import MessageToJson
-from pyvoltha.protos import third_party
-from pyvoltha.protos import meta_pb2
+from voltha_protos import meta_pb2
import structlog
diff --git a/pyvoltha/common/openflow/utils.py b/pyvoltha/common/openflow/utils.py
index ca9eb68..27b99b5 100644
--- a/pyvoltha/common/openflow/utils.py
+++ b/pyvoltha/common/openflow/utils.py
@@ -15,7 +15,7 @@
#
import structlog
-from pyvoltha.protos import openflow_13_pb2 as ofp
+from voltha_protos import openflow_13_pb2 as ofp
from hashlib import md5
log = structlog.get_logger()
diff --git a/pyvoltha/common/tech_profile/tech_profile.py b/pyvoltha/common/tech_profile/tech_profile.py
index b708444..57f0173 100644
--- a/pyvoltha/common/tech_profile/tech_profile.py
+++ b/pyvoltha/common/tech_profile/tech_profile.py
@@ -23,7 +23,7 @@
# from pyvoltha.core.config.config_backend import EtcdStore
from pyvoltha.adapters.common.kvstore.kvstore import create_kv_client
from pyvoltha.common.utils.registry import registry
-from pyvoltha.protos import openolt_pb2
+from voltha_protos import openolt_pb2
# logger
log = structlog.get_logger()
diff --git a/pyvoltha/protos/Makefile b/pyvoltha/protos/Makefile
deleted file mode 100644
index e0cab35..0000000
--- a/pyvoltha/protos/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# Copyright 2017 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Makefile to build all protobuf and gRPC related artifacts
-
-default: third_party build
-
-PROTO_FILES := $(wildcard ./*.proto)
-PROTO_GOOGLE_API := $(wildcard third_party/google/api/*.proto)
-PROTO_ALL_FILES := $(PROTO_FILES) $(PROTO_GOOGLE_API)
-PROTO_PB2_FILES := $(foreach f,$(PROTO_FILES),$(subst .proto,_pb2.py,$(f)))
-PROTO_PB2_GOOGLE_API := $(foreach f,$(PROTO_GOOGLE_API),$(subst .proto,_pb2.py,$(f)))
-PROTO_PB2_GRPC_GOOGLE_API := $(foreach f,$(PROTO_GOOGLE_API),$(subst .proto,_pb2_grpc.py,$(f)))
-PROTO_DESC_GOOGLE_API := $(foreach f,$(PROTO_GOOGLE_API),$(subst .proto,.desc,$(f)))
-
-PROTOC_PREFIX := /usr/local
-PROTOC_LIBDIR := $(PROTOC_PREFIX)/lib
-
-PROTOC := $(PROTOC_PREFIX)/bin/protoc
-
-PROTOC_VERSION := "3.3.0"
-PROTOC_DOWNLOAD_PREFIX := "https://github.com/google/protobuf/releases/download"
-PROTOC_DIR := protobuf-$(PROTOC_VERSION)
-PROTOC_TARBALL := protobuf-python-$(PROTOC_VERSION).tar.gz
-PROTOC_DOWNLOAD_URI := $(PROTOC_DOWNLOAD_PREFIX)/v$(PROTOC_VERSION)/$(PROTOC_TARBALL)
-PROTOC_BUILD_TMP_DIR := "/tmp/protobuf-build-$(shell uname -s | tr '[:upper:]' '[:lower:]')"
-
-# Google API needs to be built from within the third party directory
-#
-third_party: google_api
-google_api:
- @echo "Building protocol buffer artifacts from third_party google api"
- cd third_party ; \
- env LD_LIBRARY_PATH=$(PROTOC_LIBDIR) python -m grpc_tools.protoc \
- -I. \
- --python_out=. \
- --grpc_python_out=. \
- --descriptor_set_out=google/api/annotations.desc \
- --include_imports \
- --include_source_info \
- google/api/annotations.proto google/api/http.proto
-
-build: $(PROTOC) $(PROTO_PB2_FILES)
-
-%_pb2.py: %.proto Makefile
- @echo "Building protocol buffer artifacts from $<"
- env LD_LIBRARY_PATH=$(PROTOC_LIBDIR) python -m grpc_tools.protoc \
- -I. \
- -I./third_party \
- --python_out=. \
- --grpc_python_out=. \
- --descriptor_set_out=./$(basename $(notdir $<)).desc \
- --include_imports \
- --include_source_info \
- $<
-
-clean:
- rm -f *.desc *_pb2* \
- $(PROTO_PB2_GOOGLE_API) \
- $(PROTO_PB2_GRPC_GOOGLE_API)\
- $(PROTO_DESC_GOOGLE_API)
-
-$(PROTOC):
- @echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
- @echo "It looks like you don't have protocol buffer tools installed."
- @echo "To install the protocol buffer toolchain, you can run:"
- @echo " make install-protoc"
- @echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-
-install-protoc: $(PROTOC)
- @echo "Downloading and installing protocol buffer support."
- @echo "Installation will require sudo privileges"
- @echo "This will take a few minutes."
- mkdir -p $(PROTOC_BUILD_TMP_DIR)
- @echo "We ask for sudo credentials now so we can install at the end"; \
- sudo echo "Thanks"; \
- cd $(PROTOC_BUILD_TMP_DIR); \
- wget $(PROTOC_DOWNLOAD_URI); \
- tar xzvf $(PROTOC_TARBALL); \
- cd $(PROTOC_DIR); \
- ./configure --prefix=$(PROTOC_PREFIX); \
- make; \
- sudo make install
-
-uninstall-protoc:
- cd $(PROTOC_BUILD_TMP_DIR)/$(PROTOC_DIR); \
- sudo make uninstall
-
diff --git a/pyvoltha/protos/__init__.py b/pyvoltha/protos/__init__.py
deleted file mode 100644
index cfcdc97..0000000
--- a/pyvoltha/protos/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright 2017 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
\ No newline at end of file
diff --git a/pyvoltha/protos/adapter.proto b/pyvoltha/protos/adapter.proto
deleted file mode 100644
index fc1ec94..0000000
--- a/pyvoltha/protos/adapter.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/voltha";
-
-package voltha;
-
-import "google/protobuf/any.proto";
-import "common.proto";
-import "meta.proto";
-
-
-message AdapterConfig {
-
- // Common adapter config attributes here
- LogLevel.LogLevel log_level = 1;
-
- // Custom (vendor-specific) configuration attributes
- google.protobuf.Any additional_config = 64;
-
-}
-
-// Adapter (software plugin)
-message Adapter {
-
- // Unique name of adapter, matching the python packate name under
- // voltha/adapters.
- string id = 1 [(access) = READ_ONLY];
- string vendor = 2 [(access) = READ_ONLY];
- string version = 3 [(access) = READ_ONLY];
-
- // Adapter configuration
- AdapterConfig config = 16;
-
- // Custom descriptors and custom configuration
- google.protobuf.Any additional_description = 64 [(access) = READ_ONLY];
-
- repeated string logical_device_ids = 4; // Logical devices "owned"
-
-}
-
-message Adapters {
- repeated Adapter items = 1;
-}
diff --git a/pyvoltha/protos/common.proto b/pyvoltha/protos/common.proto
deleted file mode 100644
index b1c13ae..0000000
--- a/pyvoltha/protos/common.proto
+++ /dev/null
@@ -1,122 +0,0 @@
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/common";
-
-package voltha;
-
-import "yang_options.proto";
-
-// Convey a resource identifier
-message ID {
- string id = 1;
-}
-
-// Represents a list of IDs
-message IDs {
- repeated ID items = 1;
-}
-
-enum TestModeKeys {
- api_test=0;
-}
-
-message LogLevel {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
- // Logging verbosity level
- enum LogLevel {
- DEBUG = 0;
- INFO = 1;
- WARNING = 2;
- ERROR = 3;
- CRITICAL = 4;
- FATAL = 5;
- }
-}
-
-message AdminState {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
- // Administrative State
- enum AdminState {
-
- // The administrative state of the device is unknown
- UNKNOWN = 0;
-
- // The device is pre-provisioned into Voltha, but not contacted by it
- PREPROVISIONED = 1;
-
- // The device is enabled for activation and operation
- ENABLED = 2;
-
- // The device is disabled and shall not perform its intended forwarding
- // functions other than being available for re-activation.
- DISABLED = 3;
-
- // The device is in the state of image download
- DOWNLOADING_IMAGE = 4;
-
- // The device is marked to be deleted
- DELETED = 5;
- }
-}
-
-message OperStatus {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
- // Operational Status
- enum OperStatus {
-
- // The status of the device is unknown at this point
- UNKNOWN = 0;
-
- // The device has been discovered, but not yet activated
- DISCOVERED = 1;
-
- // The device is being activated (booted, rebooted, upgraded, etc.)
- ACTIVATING = 2;
-
- // Service impacting tests are being conducted
- TESTING = 3;
-
- // The device is up and active
- ACTIVE = 4;
-
- // The device has failed and cannot fulfill its intended role
- FAILED = 5;
- }
-}
-
-message ConnectStatus {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
- // Connectivity Status
- enum ConnectStatus {
-
- // The device connectivity status is unknown
- UNKNOWN = 0;
-
- // The device cannot be reached by Voltha
- UNREACHABLE = 1;
-
- // There is live communication between device and Voltha
- REACHABLE = 2;
- }
-}
-
-message OperationResp {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
- enum OperationReturnCode {
- OPERATION_SUCCESS = 0;
- OPERATION_FAILURE = 1;
- OPERATION_UNSUPPORTED = 2;
- }
- // Return code
- OperationReturnCode code = 1;
-
- // Additional Info
- string additional_info = 2;
-}
-
-
diff --git a/pyvoltha/protos/device.proto b/pyvoltha/protos/device.proto
deleted file mode 100644
index ece4db5..0000000
--- a/pyvoltha/protos/device.proto
+++ /dev/null
@@ -1,329 +0,0 @@
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/voltha";
-
-package voltha;
-
-import "meta.proto";
-import "google/protobuf/any.proto";
-import "common.proto";
-import "openflow_13.proto";
-import "yang_options.proto";
-
-
-// A Device Type
-message DeviceType {
-
- // Unique name for the device type
- string id = 1;
-
- // Unique venor id for the device type applicable to ONU
- // 4 bytes of vendor id from ONU serial number
- string vendor_id = 5;
-
- repeated string vendor_ids = 6;
-
- // Name of the adapter that handles device type
- string adapter = 2;
-
- // Capabilitities
-
- bool accepts_bulk_flow_update = 3;
- bool accepts_add_remove_flow_updates = 4;
- bool accepts_direct_logical_flows_update = 7;
-
-}
-
-// A plurality of device types
-message DeviceTypes {
- repeated DeviceType items = 1;
-}
-
-message PmConfig {
- enum PmType {
- COUNTER = 0;
- GAUGE = 1;
- STATE = 2;
- CONTEXT = 3;
- }
- string name = 1;
- PmType type = 2;
- bool enabled = 3; // Whether or not this metric makes it to Kafka
- uint32 sample_freq = 4; // Sample rate in 10ths of a second
-}
-
-message PmGroupConfig {
- string group_name = 1;
- uint32 group_freq = 2; // Frequency applicable to the grop
- bool enabled = 3; // Enable/disable group level only
- repeated PmConfig metrics = 4;
-}
-
-message PmConfigs {
- string id = 1; // To work around a chameleon POST bug
- uint32 default_freq = 2; // Default sample rate
- // Forces group names and group semantics
- bool grouped = 3 [(access) = READ_ONLY];
- // Allows Pm to set an individual sample frequency
- bool freq_override = 4 [(access) = READ_ONLY];
- repeated PmGroupConfig groups = 5; // The groups if grouped is true
- repeated PmConfig metrics = 6; // The metrics themselves if grouped is false.
-}
-
-// Describes instance of software image on the device
-message Image {
- string name = 1; // software patch name
- string version = 2; // version of software
- string hash = 3; // md5 hash
- string install_datetime = 4; // combined date and time expressed in UTC.
- // use ISO 8601 format for date and time
-
- // The active software image is one that is currently loaded and executing
- // in the ONU or circuit pack. Under normal operation, one software image
- // is always active while the other is inactive. Under no circumstances are
- // both software images allowed to be active at the same time
- bool is_active = 5; // True if the image is active
-
- // The committed software image is loaded and executed upon reboot of the
- // ONU and/or circuit pack. During normal operation, one software image is
- // always committed, while the other is uncommitted.
- bool is_committed = 6; // True if the image is committed
-
- // A software image is valid if it has been verified to be an executable
- // code image. The verification mechanism is not subject to standardization;
- // however, it should include at least a data integrity (e.g., CRC) check of
- // the entire code image.
- bool is_valid = 7; // True if the image is valid
-}
-
-// List of software on the device
-message Images {
- repeated Image image = 1;
-}
-
-message ImageDownload {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
- enum ImageDownloadState {
- DOWNLOAD_UNKNOWN = 0;
- DOWNLOAD_SUCCEEDED = 1;
- DOWNLOAD_REQUESTED = 2;
- DOWNLOAD_STARTED = 3;
- DOWNLOAD_FAILED = 4;
- DOWNLOAD_UNSUPPORTED = 5;
- DOWNLOAD_CANCELLED = 6;
- }
-
- enum ImageDownloadFailureReason {
- NO_ERROR = 0;
- INVALID_URL = 1;
- DEVICE_BUSY = 2;
- INSUFFICIENT_SPACE = 3;
- UNKNOWN_ERROR = 4;
- CANCELLED = 5;
- }
-
- enum ImageActivateState {
- IMAGE_UNKNOWN = 0;
- IMAGE_INACTIVE = 1;
- IMAGE_ACTIVATE = 2;
- IMAGE_ACTIVE = 3;
- IMAGE_REVERT = 4;
- }
-
- // Device Identifier
- string id = 1;
-
- // Image unique identifier
- string name = 2;
-
- // URL where the image is available
- // should include username password
- string url = 3;
-
- // CRC of the image to be verified aginst
- uint32 crc = 4;
-
- // Download state
- ImageDownloadState download_state = 5;
-
- // Downloaded version
- string image_version = 6;
-
- // Bytes downloaded
- uint32 downloaded_bytes = 7;
-
- // Download failure reason
- ImageDownloadFailureReason reason= 8;
-
- // Additional info
- string additional_info = 9;
-
- // Save current configuration
- bool save_config = 10;
-
- // Image local location
- string local_dir = 11;
-
- // Image activation state
- ImageActivateState image_state = 12;
-
- // Image file size
- uint32 file_size = 13;
-}
-
-message ImageDownloads {
- repeated ImageDownload items = 2;
-}
-
-message Port {
- option (voltha.yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
- enum PortType {
- UNKNOWN = 0;
- ETHERNET_NNI = 1;
- ETHERNET_UNI = 2;
- PON_OLT = 3;
- PON_ONU = 4;
- VENET_OLT = 5;
- VENET_ONU = 6;
- }
-
- uint32 port_no = 1; // Device-unique port number
-
- string label = 2; // Arbitrary port label
-
- PortType type = 3; // Type of port
-
- AdminState.AdminState admin_state = 5;
-
- OperStatus.OperStatus oper_status = 6;
-
- string device_id = 7; // Unique .id of device that owns this port
-
- message PeerPort {
- string device_id = 1;
- uint32 port_no = 2;
- }
- repeated PeerPort peers = 8;
-
- fixed64 rx_packets = 9;
- fixed64 rx_bytes = 10;
- fixed64 rx_errors = 11;
- fixed64 tx_packets = 12;
- fixed64 tx_bytes = 13;
- fixed64 tx_errors = 14;
-
-}
-
-message Ports {
- repeated Port items = 1;
-}
-
-// A Physical Device instance
-message Device {
- option (voltha.yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
- // Voltha's device identifier
- string id = 1 [(access) = READ_ONLY];
-
- // Device type, refers to one of the registered device types
- string type = 2 [(access) = READ_ONLY];
-
- // Is this device a root device. Each logical switch has one root
- // device that is associated with the logical flow switch.
- bool root = 3 [(access) = READ_ONLY];
-
- // Parent device id, in the device tree (for a root device, the parent_id
- // is the logical_device.id)
- string parent_id = 4 [(access) = READ_ONLY];
- uint32 parent_port_no = 20 [(access) = READ_ONLY];
-
- // Vendor, version, serial number, etc.
- string vendor = 5 [(access) = READ_ONLY];
- string model = 6 [(access) = READ_ONLY];
- string hardware_version = 7 [(access) = READ_ONLY];
- string firmware_version = 8 [(access) = READ_ONLY];
- // List of software on the device
- Images images = 9 [(access) = READ_ONLY];
- string serial_number = 10 [(access) = READ_ONLY];
- string vendor_id = 24 [(access) = READ_ONLY];
-
- // Addapter that takes care of device
- string adapter = 11 [(access) = READ_ONLY];
-
- // Device contact on vlan (if 0, no vlan)
- uint32 vlan = 12;
-
- message ProxyAddress {
- string device_id = 1; // Which device to use as proxy to this device
- string device_type = 2; // The device type of the proxy device to use as the adapter name
- uint32 channel_id = 3; // Sub-address within proxy
- uint32 channel_group_id = 4; // Channel Group index
- string channel_termination = 5; // Channel Termination name
- uint32 onu_id = 6; // onu identifier; optional
- uint32 onu_session_id = 7; // session identifier for the ONU; optional
- };
-
- oneof address {
- // Device contact MAC address (format: "xx:xx:xx:xx:xx:xx")
- string mac_address = 13;
-
- // Device contact IPv4 address (format: "a.b.c.d" or can use hostname too)
- string ipv4_address = 14;
-
- // Device contact IPv6 address using the canonical string form
- // ("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx")
- string ipv6_address = 15;
-
- string host_and_port = 21;
-
- };
- string extra_args = 23; // Used to pass additional device specific arguments
-
- ProxyAddress proxy_address = 19;
-
- AdminState.AdminState admin_state = 16;
-
- OperStatus.OperStatus oper_status = 17 [(access) = READ_ONLY];
-
- string reason = 22 [(access) = READ_ONLY]; // Used in FAILED state
-
- ConnectStatus.ConnectStatus connect_status = 18 [(access) = READ_ONLY];
-
- // TODO additional common attribute here
-
- // 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) = {}];
-
- repeated ImageDownload image_downloads = 133 [(child_node) = {key: "name"}];
-}
-
-message Devices {
- repeated Device items = 1;
-}
-
-message SimulateAlarmRequest {
- enum OperationType {
- RAISE = 0;
- CLEAR = 1;
- }
- // Device Identifier
- string id = 1;
- string indicator = 2;
- string intf_id = 3;
- string port_type_name = 4;
- string onu_device_id = 5;
- int32 inverse_bit_error_rate = 6;
- int32 drift = 7;
- int32 new_eqd = 8;
- string onu_serial_number = 9;
- OperationType operation = 10;
-}
diff --git a/pyvoltha/protos/events.proto b/pyvoltha/protos/events.proto
deleted file mode 100644
index 961dde8..0000000
--- a/pyvoltha/protos/events.proto
+++ /dev/null
@@ -1,195 +0,0 @@
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/voltha";
-
-package voltha;
-
-import "meta.proto";
-import "google/api/annotations.proto";
-
-message ConfigEventType {
- enum ConfigEventType {
- add = 0; // A new config has been added
- remove = 1; // A config has been removed
- update = 2; // A config has been updated
- }
-}
-
-message ConfigEvent {
- ConfigEventType.ConfigEventType type = 1;
-
- string hash = 2; // hash for this change, can be used for quick lookup
- string data = 3; // the actual new data, in json format
-}
-
-message KpiEventType {
- enum KpiEventType {
- slice = 0; // slice: a set of path/metric data for same time-stamp
- ts = 1; // time-series: array of data for same metric
- }
-}
-
-/*
- * Struct to convey a dictionary of metric metadata.
- */
-message MetricMetaData {
- string title = 1; // Metric group or individual metric name
- double ts = 2; // UTC time-stamp of data (seconds since epoch) of
- // when the metric or metric group was collected.
- // If this is a 15-min historical group, it is the
- // time of the collection and reporting, not the
- // start or end of the 15-min group interval.
-
- string logical_device_id = 3; // The logical device ID of the VOLTHA
- // (equivalent to the DPID that ONOS has
- // for the VOLTHA device without the
- // 'of:' prefix
- string serial_no = 4; // The OLT, ONU, ... device serial number
- string device_id = 5; // The OLT, ONU, ... physical device ID
-
- map<string, string> context = 6; // Name value pairs that provide additional
- // context information on the metrics being
- // reported.
-}
-
-/*
- * Struct to convey a dictionary of metric->value pairs. Typically used in
- * pure shared-timestamp or shared-timestamp + shared object prefix situations.
- */
-message MetricValuePairs {
-
- // Metric / value pairs.
- map<string, float> metrics = 1;
-
-}
-
-/*
- * Struct to group metadata for a metric (or group of metrics) with the key-value
- * pairs of collected metrics
- */
-message MetricInformation {
- MetricMetaData metadata = 1;
- map<string, float> metrics = 2;
-}
-
-/*
- * Legacy KPI Event structured. In mid-August, the KPI event format was updated
- * to a more easily parsable format. See VOL-1140
- * for more information.
- */
-message KpiEvent {
-
- KpiEventType.KpiEventType type = 1;
-
- // Fields used when for slice:
-
- float ts = 2; // UTC time-stamp of data in slice mode (seconds since epoc)
-
- map<string, MetricValuePairs> prefixes = 3;
-
-}
-
-message KpiEvent2 {
- // Type of KPI Event
- KpiEventType.KpiEventType type = 1;
-
- // Fields used when for slice:
- double ts = 2; // UTC time-stamp of data in slice mode (seconds since epoch)
- // of the time this entire KpiEvent was published to the kafka bus
-
- repeated MetricInformation slice_data = 3;
-}
-
-/*
- * Identify to the area of the system impacted by the alarm
- */
-message AlarmEventType {
- enum AlarmEventType {
- COMMUNICATION = 0;
- ENVIRONMENT = 1;
- EQUIPMENT = 2;
- SERVICE = 3;
- PROCESSING = 4;
- SECURITY = 5;
- }
-}
-
-/*
- * Identify to the functional category originating the alarm
- */
-message AlarmEventCategory {
- enum AlarmEventCategory {
- PON = 0;
- OLT = 1;
- ONT = 2;
- ONU = 3;
- NNI = 4;
- }
-}
-
-/*
- * Active state of the alarm
- */
-message AlarmEventState {
- enum AlarmEventState {
- RAISED = 0;
- CLEARED = 1;
- }
-}
-
-/*
- * Identify the overall impact of the alarm on the system
- */
-message AlarmEventSeverity {
- enum AlarmEventSeverity {
- INDETERMINATE = 0;
- WARNING = 1;
- MINOR = 2;
- MAJOR = 3;
- CRITICAL = 4;
- }
-}
-
-/*
- *
- */
-message AlarmEvent {
- // Unique ID for this alarm. e.g. voltha.some_olt.1234
- string id = 1;
-
- // Refers to the area of the system impacted by the alarm
- AlarmEventType.AlarmEventType type = 2;
-
- // Refers to functional category of the alarm
- AlarmEventCategory.AlarmEventCategory category = 3;
-
- // Current active state of the alarm
- AlarmEventState.AlarmEventState state = 4;
-
- // Overall impact of the alarm on the system
- AlarmEventSeverity.AlarmEventSeverity severity = 5;
-
- // Timestamp at which the alarm was first raised
- float raised_ts = 6;
-
- // Timestamp at which the alarm was reported
- float reported_ts = 7;
-
- // Timestamp at which the alarm has changed since it was raised
- float changed_ts = 8;
-
- // Identifier of the originating resource of the alarm
- string resource_id = 9;
-
- // Textual explanation of the alarm
- string description = 10;
-
- // Key/Value storage for extra information that may give context to the alarm
- map<string, string> context = 11;
-
- // logical device id
- string logical_device_id = 12;
-
- // alarm_type name indicates clearly the name of the alarm
- string alarm_type_name = 13;
-}
diff --git a/pyvoltha/protos/health.proto b/pyvoltha/protos/health.proto
deleted file mode 100644
index 0730eac..0000000
--- a/pyvoltha/protos/health.proto
+++ /dev/null
@@ -1,36 +0,0 @@
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/voltha";
-
-package voltha;
-
-import "google/api/annotations.proto";
-import "google/protobuf/empty.proto";
-import "meta.proto";
-
-// Encode health status of a Voltha instance
-message HealthStatus {
-
- // Health states
- enum HealthState {
- HEALTHY = 0; // The instance is healthy
- OVERLOADED = 1; // The instance is overloaded, decrease query rate
- DYING = 2; // The instance is in a critical condition, do not use it
- }
-
- // Current state of health of this Voltha instance
- HealthState state = 1 [(access) = READ_ONLY];
-}
-
-// Health related services
-service HealthService {
-
- // Return current health status of a Voltha instance
- rpc GetHealthStatus(google.protobuf.Empty) returns (HealthStatus) {
- option (google.api.http) = {
- get: "/health"
- };
- }
-
-}
-
diff --git a/pyvoltha/protos/inter_container.proto b/pyvoltha/protos/inter_container.proto
deleted file mode 100644
index acd3bc2..0000000
--- a/pyvoltha/protos/inter_container.proto
+++ /dev/null
@@ -1,128 +0,0 @@
-syntax = "proto3";
-
-import "google/protobuf/any.proto";
-import "openflow_13.proto";
-import public "logical_device.proto";
-
-
-option go_package = "github.com/opencord/voltha-go/protos/inter_container";
-
-package voltha;
-
-message StrType {
- string val = 1;
-}
-
-message IntType {
- int64 val = 1;
-}
-
-message BoolType {
- bool val = 1;
-}
-
-message Packet {
- bytes payload = 1;
-}
-
-message ErrorCode {
- enum codes {
- UNSUPPORTED_REQUEST = 0;
- INVALID_PARAMETERS = 1;
- }
-}
-
-message Error {
- ErrorCode code = 1;
- string reason = 2;
-}
-
-enum MessageType {
- REQUEST = 0;
- RESPONSE = 1;
- DEVICE_DISCOVERED=2;
-}
-
-message Header {
- string id = 1;
- MessageType type = 2;
- string from_topic = 3;
- string to_topic = 4;
- int64 timestamp = 5;
-}
-
-message Argument {
- string key = 1;
- google.protobuf.Any value = 2;
-}
-
-message InterContainerMessage {
- Header header = 1;
- google.protobuf.Any body = 2;
-}
-
-message InterContainerRequestBody {
- string rpc = 2;
- repeated Argument args = 3;
- bool response_required = 4;
- string reply_to_topic = 5;
-}
-
-message InterContainerResponseBody {
- bool success = 1;
- google.protobuf.Any result = 3;
-}
-
-message SwitchCapability {
- openflow_13.ofp_desc desc = 1;
- openflow_13.ofp_switch_features switch_features = 2;
-}
-
-message PortCapability {
- LogicalPort port = 1;
-}
-
-message DeviceDiscovered {
- string id = 1;
- string parent_id = 2;
- string device_type = 3;
- string publisher = 4;
-}
-
-message InterAdapterMessageType {
- enum Types {
- FLOW_REQUEST = 0;
- FLOW_RESPONSE = 1;
- OMCI_REQUEST = 2;
- OMCI_RESPONSE = 3;
- METRICS_REQUEST = 4;
- METRICS_RESPONSE = 5;
- }
-}
-
-message InterAdapterHeader {
- string id = 1;
- InterAdapterMessageType.Types type = 2;
- string from_topic = 3;
- string to_topic = 4;
- string to_device_id = 5;
- string proxy_device_id = 6;
- int64 timestamp = 7;
-}
-
-message InterAdapterOmciMessage {
- bytes message = 1; // OMCI_REQUEST or OMCI_RESPONSE
-}
-
-message InterAdapterResponseBody {
- bool status = 1;
- oneof payload {
- google.protobuf.Any body = 2;
- InterAdapterOmciMessage omci = 3; // OMCI_REQUEST or OMCI_RESPONSE
- }
-}
-
-message InterAdapterMessage {
- InterAdapterHeader header = 1;
- google.protobuf.Any body = 2;
-}
\ No newline at end of file
diff --git a/pyvoltha/protos/logical_device.proto b/pyvoltha/protos/logical_device.proto
deleted file mode 100644
index b8d424f..0000000
--- a/pyvoltha/protos/logical_device.proto
+++ /dev/null
@@ -1,61 +0,0 @@
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/voltha";
-
-package voltha;
-
-import "meta.proto";
-import "google/api/annotations.proto";
-import "openflow_13.proto";
-
-message LogicalPortId {
- // unique id of logical device
- string id = 1;
-
- // id of the port on the logical device
- string port_id = 2;
-}
-
-message LogicalPort {
- string id = 1;
- openflow_13.ofp_port ofp_port = 2;
- string device_id = 3;
- uint32 device_port_no = 4;
- bool root_port = 5;
-}
-
-message LogicalPorts {
- repeated LogicalPort items = 1;
-}
-
-message LogicalDevice {
-
- // unique id of logical device
- string id = 1;
-
- // unique datapath id for the logical device (used by the SDN controller)
- uint64 datapath_id = 2;
-
- // device description
- openflow_13.ofp_desc desc = 3;
-
- // device features
- openflow_13.ofp_switch_features switch_features = 4;
-
- // 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) = {}];
-
-}
-
-message LogicalDevices {
- repeated LogicalDevice items = 1;
-}
diff --git a/pyvoltha/protos/meta.proto b/pyvoltha/protos/meta.proto
deleted file mode 100644
index fc02e46..0000000
--- a/pyvoltha/protos/meta.proto
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) 2015, Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// This file contains annotation definitions that can be used to describe
-// a configuration tree.
-
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/common";
-
-package voltha;
-
-import "google/protobuf/descriptor.proto";
-
-message ChildNode {
- string key = 1;
-}
-
-enum Access {
-
- // read-write, stored attribute
- CONFIG = 0;
-
- // read-only field, stored with the model, covered by its hash
- READ_ONLY = 1;
-
- // A read-only attribute that is not stored in the model, not covered
- // by its hash, its value is filled real-time upon each request.
- REAL_TIME = 2;
-
-}
-
-extend google.protobuf.FieldOptions {
-
- // If present, it indicates that this field is stored as external child node
- // or children nodes in Voltha's internal configuration tree.
- // If the field is a container field and if the option specifies a key
- // the child objects will be addressible by that key.
- ChildNode child_node = 7761772;
-
- // This annotation can be used to indicate that a field is read-only,
- // from the perspective of NBI access. Backend plugins and system
- // internals can update the field but the update requests through the
- // NBI will ignore for instance a field that is marked as read-only (RO).
- Access access = 7761773;
-}
diff --git a/pyvoltha/protos/omci_alarm_db.proto b/pyvoltha/protos/omci_alarm_db.proto
deleted file mode 100644
index decaf2e..0000000
--- a/pyvoltha/protos/omci_alarm_db.proto
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright 2018 - present the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/omci";
-
-package alarm;
-
-import "meta.proto";
-
-
-message AlarmAttributeData {
- string name = 1 [(voltha.access) = READ_ONLY];
- string value = 2;
-}
-
-message AlarmInstanceData {
- uint32 instance_id = 1 [(voltha.access) = READ_ONLY];
- string created = 2;
- string modified = 3;
-
- repeated AlarmAttributeData attributes = 4
- [(voltha.child_node) = {key: "name"}];
-}
-
-message AlarmClassData {
- uint32 class_id = 1 [(voltha.access) = READ_ONLY];
-
- repeated AlarmInstanceData instances= 2
- [(voltha.child_node) = {key: "instance_id"}];
-}
-
-message AlarmManagedEntity {
- uint32 class_id = 1 [(voltha.access) = READ_ONLY];
- string name = 2 [(voltha.access) = READ_ONLY];
-}
-
-message AlarmMessageType {
- uint32 message_type = 1 [(voltha.access) = READ_ONLY];
-}
-
-message AlarmDeviceData {
- string device_id = 1 [(voltha.access) = READ_ONLY];
- string created = 2;
- uint32 last_alarm_sequence = 3;
- string last_sync_time = 4;
- uint32 version = 5;
-
-
- repeated AlarmClassData classes = 6
- [(voltha.child_node) = {key: "class_id"}];
-
- repeated AlarmManagedEntity managed_entities = 7;
- repeated AlarmMessageType message_types = 8;
-}
-
-message AlarmOpenOmciEventType {
- enum OpenOmciEventType {
- state_change = 0; // A state machine has transitioned to a new state
- }
-}
-
-message AlarmOpenOmciEvent {
- AlarmOpenOmciEventType.OpenOmciEventType type = 1;
-
- string data = 2; // associated data, in json format
-}
diff --git a/pyvoltha/protos/omci_mib_db.proto b/pyvoltha/protos/omci_mib_db.proto
deleted file mode 100644
index d5eecb4..0000000
--- a/pyvoltha/protos/omci_mib_db.proto
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// Copyright 2018 - present the original author or authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/omci";
-
-package omci;
-
-import "meta.proto";
-
-
-message MibAttributeData {
- string name = 1 [(voltha.access) = READ_ONLY];
- string value = 2;
-}
-
-message MibInstanceData {
- uint32 instance_id = 1 [(voltha.access) = READ_ONLY];
- string created = 2;
- string modified = 3;
-
- repeated MibAttributeData attributes = 4
- [(voltha.child_node) = {key: "name"}];
-}
-
-message MibClassData {
- uint32 class_id = 1 [(voltha.access) = READ_ONLY];
-
- repeated MibInstanceData instances= 2
- [(voltha.child_node) = {key: "instance_id"}];
-}
-
-message ManagedEntity {
- uint32 class_id = 1 [(voltha.access) = READ_ONLY];
- string name = 2 [(voltha.access) = READ_ONLY];
-}
-
-message MessageType {
- uint32 message_type = 1 [(voltha.access) = READ_ONLY];
-}
-
-message MibDeviceData {
- string device_id = 1 [(voltha.access) = READ_ONLY];
- string created = 2;
- string last_sync_time = 3;
- uint32 mib_data_sync = 4;
- uint32 version = 5;
-
- repeated MibClassData classes = 6
- [(voltha.child_node) = {key: "class_id"}];
-
- repeated ManagedEntity managed_entities = 7;
- repeated MessageType message_types = 8;
-}
-
-message OpenOmciEventType {
- enum OpenOmciEventType {
- state_change = 0; // A state machine has transitioned to a new state
- }
-}
-
-message OpenOmciEvent {
- OpenOmciEventType.OpenOmciEventType type = 1;
-
- string data = 2; // associated data, in json format
-}
diff --git a/pyvoltha/protos/openflow_13.proto b/pyvoltha/protos/openflow_13.proto
deleted file mode 100644
index 0496854..0000000
--- a/pyvoltha/protos/openflow_13.proto
+++ /dev/null
@@ -1,2303 +0,0 @@
-/* Copyright (c) 2008 The Board of Trustees of The Leland Stanford
- * Junior University
- * Copyright (c) 2011, 2012 Open Networking Foundation
- *
- * We are making the OpenFlow specification and associated documentation
- * (Software) available for public use and benefit with the expectation
- * that others will use, modify and enhance the Software and contribute
- * those enhancements back to the community. However, since we would
- * like to make the Software available for broadest use, with as few
- * restrictions as possible permission is hereby granted, free of
- * charge, to any person obtaining a copy of this Software to deal in
- * the Software under the copyrights without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * The name and trademarks of copyright holder(s) may NOT be used in
- * advertising or publicity pertaining to the Software or any
- * derivatives without specific, written prior permission.
- */
-
-/* OpenFlow: protocol between controller and datapath. */
-
-/*
- * This is a relatively straightforward rendering of OpenFlow message
- * definitions into protocol buffer messages. We preserved the snake
- * case syntax, and made the following changes:
- * - all pad fields dropped
- * - for each enum value above 0x7fffffff the MSB is dropped. For example,
- * 0xffffffff is now 0x7fffffff.
- * - '<type> thing[...]' is replaced with 'repeated <type> thing'
- * - 'char thing[...]' is replaced with 'string thing'
- * - 'uint8_t data[...]' is replaced with 'bytes data'
- * - the following systematic changes are done to various integer types:
- * uint8_t -> uint32
- * uint16_t -> uint32
- * uint32_t -> uint32
- * uint64_t -> uint64
- * - removed most length, len, size fields where these values can be determined
- * from the explicitly encoded length of "repeated" protobuf fields.
- * - explicit use of enum types whereever it is unambigous (and not used as
- * bitmask/flags value.
- *
- */
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/openflow_13";
-
-package openflow_13;
-
-import "google/api/annotations.proto";
-import public "yang_options.proto";
-
-
-/* Version number:
- * OpenFlow versions released: 0x01 = 1.0 ; 0x02 = 1.1 ; 0x03 = 1.2
- * 0x04 = 1.3
- */
-/* The most significant bit in the version field is reserved and must
- * be set to zero.
- */
-//#define OFP_VERSION 0x04
-//#define PIPELINE_TABLES 64
-//#define OFP_MAX_TABLE_NAME_LEN 32
-//#define OFP_MAX_PORT_NAME_LEN 16
-/* Official IANA registered port for OpenFlow. */
-//#define OFP_TCP_PORT 6653
-//#define OFP_SSL_PORT 6653
-
-//#define OFP_ETH_ALEN 6 /* Bytes in an Ethernet address. */
-
-/* Port numbering. Ports are numbered starting from 1. */
-enum ofp_port_no {
- OFPP_INVALID = 0;
-
- /* Maximum number of physical and logical switch ports. */
- OFPP_MAX = 0x7fffff00;
-
- /* Reserved OpenFlow Port (fake output "ports"). */
- OFPP_IN_PORT = 0x7ffffff8; /* Send the packet out the input port. This
- reserved port must be explicitly used
- in order to send back out of the input
- port. */
- OFPP_TABLE = 0x7ffffff9; /* Submit the packet to the first flow table
- NB: This destination port can only be
- used in packet-out messages. */
- OFPP_NORMAL = 0x7ffffffa; /* Forward using non-OpenFlow pipeline. */
- OFPP_FLOOD = 0x7ffffffb; /* Flood using non-OpenFlow pipeline. */
- OFPP_ALL = 0x7ffffffc; /* All standard ports except input port. */
- OFPP_CONTROLLER = 0x7ffffffd; /* Send to controller. */
- OFPP_LOCAL = 0x7ffffffe; /* Local openflow "port". */
- OFPP_ANY = 0x7fffffff; /* Special value used in some requests when
- no port is specified (i.e. wildcarded).*/
-};
-
-enum ofp_type {
-
- /* Immutable messages. */
- OFPT_HELLO = 0; /* Symmetric message */
- OFPT_ERROR = 1; /* Symmetric message */
- OFPT_ECHO_REQUEST = 2; /* Symmetric message */
- OFPT_ECHO_REPLY = 3; /* Symmetric message */
- OFPT_EXPERIMENTER = 4; /* Symmetric message */
-
- /* Switch configuration messages. */
- OFPT_FEATURES_REQUEST = 5; /* Controller/switch message */
- OFPT_FEATURES_REPLY = 6; /* Controller/switch message */
- OFPT_GET_CONFIG_REQUEST = 7; /* Controller/switch message */
- OFPT_GET_CONFIG_REPLY = 8; /* Controller/switch message */
- OFPT_SET_CONFIG = 9; /* Controller/switch message */
-
- /* Asynchronous messages. */
- OFPT_PACKET_IN = 10; /* Async message */
- OFPT_FLOW_REMOVED = 11; /* Async message */
- OFPT_PORT_STATUS = 12; /* Async message */
-
- /* Controller command messages. */
- OFPT_PACKET_OUT = 13; /* Controller/switch message */
- OFPT_FLOW_MOD = 14; /* Controller/switch message */
- OFPT_GROUP_MOD = 15; /* Controller/switch message */
- OFPT_PORT_MOD = 16; /* Controller/switch message */
- OFPT_TABLE_MOD = 17; /* Controller/switch message */
-
- /* Multipart messages. */
- OFPT_MULTIPART_REQUEST = 18; /* Controller/switch message */
- OFPT_MULTIPART_REPLY = 19; /* Controller/switch message */
-
- /* Barrier messages. */
- OFPT_BARRIER_REQUEST = 20; /* Controller/switch message */
- OFPT_BARRIER_REPLY = 21; /* Controller/switch message */
-
- /* Queue Configuration messages. */
- OFPT_QUEUE_GET_CONFIG_REQUEST = 22; /* Controller/switch message */
- OFPT_QUEUE_GET_CONFIG_REPLY = 23; /* Controller/switch message */
-
- /* Controller role change request messages. */
- OFPT_ROLE_REQUEST = 24; /* Controller/switch message */
- OFPT_ROLE_REPLY = 25; /* Controller/switch message */
-
- /* Asynchronous message configuration. */
- OFPT_GET_ASYNC_REQUEST = 26; /* Controller/switch message */
- OFPT_GET_ASYNC_REPLY = 27; /* Controller/switch message */
- OFPT_SET_ASYNC = 28; /* Controller/switch message */
-
- /* Meters and rate limiters configuration messages. */
- OFPT_METER_MOD = 29; /* Controller/switch message */
-};
-
-/* Header on all OpenFlow packets. */
-message ofp_header {
- uint32 version = 1; /* OFP_VERSION. */
- ofp_type type = 2; /* One of the OFPT_ constants. */
- uint32 xid = 3; /* Transaction id associated with this packet.
- Replies use the same id as was in the request
- to facilitate pairing. */
-};
-
-/* Hello elements types.
- */
-enum ofp_hello_elem_type {
- OFPHET_INVALID = 0;
- OFPHET_VERSIONBITMAP = 1; /* Bitmap of version supported. */
-};
-
-/* Common header for all Hello Elements */
-message ofp_hello_elem_header {
- ofp_hello_elem_type type = 1; /* One of OFPHET_*. */
- oneof element {
- ofp_hello_elem_versionbitmap versionbitmap = 2;
- }
-};
-
-/* Version bitmap Hello Element */
-message ofp_hello_elem_versionbitmap {
- repeated uint32 bitmaps = 2; /* List of bitmaps - supported versions */
-};
-
-/* OFPT_HELLO. This message includes zero or more hello elements having
- * variable size. Unknown elements types must be ignored/skipped, to allow
- * for future extensions. */
-message ofp_hello {
- //ofp_header header;
- /* Hello element list */
- repeated ofp_hello_elem_header elements = 1; /* 0 or more */
-};
-
-//#define OFP_DEFAULT_MISS_SEND_LEN 128
-
-enum ofp_config_flags {
- /* Handling of IP fragments. */
- OFPC_FRAG_NORMAL = 0; /* No special handling for fragments. */
- OFPC_FRAG_DROP = 1; /* Drop fragments. */
- OFPC_FRAG_REASM = 2; /* Reassemble (only if OFPC_IP_REASM set). */
- OFPC_FRAG_MASK = 3; /* Bitmask of flags dealing with frag. */
-};
-
-/* Switch configuration. */
-message ofp_switch_config {
- //ofp_header header;
- uint32 flags = 1; /* Bitmap of OFPC_* flags. */
- uint32 miss_send_len = 2; /* Max bytes of packet that datapath
- should send to the controller. See
- ofp_controller_max_len for valid values.
- */
-};
-
-/* Flags to configure the table. Reserved for future use. */
-enum ofp_table_config {
- OFPTC_INVALID = 0;
- OFPTC_DEPRECATED_MASK = 3; /* Deprecated bits */
-};
-
-/* Table numbering. Tables can use any number up to OFPT_MAX. */
-enum ofp_table {
-
- OFPTT_INVALID = 0;
-
- /* Last usable table number. */
- OFPTT_MAX = 0xfe;
-
- /* Fake tables. */
- OFPTT_ALL = 0xff; /* Wildcard table used for table config,
- flow stats and flow deletes. */
-};
-
-
-/* Configure/Modify behavior of a flow table */
-message ofp_table_mod {
- //ofp_header header;
- uint32 table_id = 1; /* ID of the table, OFPTT_ALL indicates all tables */
- uint32 config = 2; /* Bitmap of OFPTC_* flags */
-};
-
-/* Capabilities supported by the datapath. */
-enum ofp_capabilities {
- OFPC_INVALID = 0;
- OFPC_FLOW_STATS = 1; /* Flow statistics. */
- OFPC_TABLE_STATS = 2; /* Table statistics. */
- OFPC_PORT_STATS = 4; /* Port statistics. */
- OFPC_GROUP_STATS = 8; /* Group statistics. */
- OFPC_IP_REASM = 32; /* Can reassemble IP fragments. */
- OFPC_QUEUE_STATS = 64; /* Queue statistics. */
- OFPC_PORT_BLOCKED = 256; /* Switch will block looping ports. */
-};
-
-/* Flags to indicate behavior of the physical port. These flags are
- * used in ofp_port to describe the current configuration. They are
- * used in the ofp_port_mod message to configure the port's behavior.
- */
-enum ofp_port_config {
- OFPPC_INVALID = 0;
- OFPPC_PORT_DOWN = 1; /* Port is administratively down. */
-
- OFPPC_NO_RECV = 4; /* Drop all packets received by port. */
- OFPPC_NO_FWD = 32; /* Drop packets forwarded to port. */
- OFPPC_NO_PACKET_IN = 64; /* Do not send packet-in msgs for port. */
-};
-
-/* Current state of the physical port. These are not configurable from
- * the controller.
- */
-enum ofp_port_state {
- OFPPS_INVALID = 0;
- OFPPS_LINK_DOWN = 1; /* No physical link present. */
- OFPPS_BLOCKED = 2; /* Port is blocked */
- OFPPS_LIVE = 4; /* Live for Fast Failover Group. */
-};
-
-/* Features of ports available in a datapath. */
-enum ofp_port_features {
- OFPPF_INVALID = 0;
- OFPPF_10MB_HD = 1; /* 10 Mb half-duplex rate support. */
- OFPPF_10MB_FD = 2; /* 10 Mb full-duplex rate support. */
- OFPPF_100MB_HD = 4; /* 100 Mb half-duplex rate support. */
- OFPPF_100MB_FD = 8; /* 100 Mb full-duplex rate support. */
- OFPPF_1GB_HD = 16; /* 1 Gb half-duplex rate support. */
- OFPPF_1GB_FD = 32; /* 1 Gb full-duplex rate support. */
- OFPPF_10GB_FD = 64; /* 10 Gb full-duplex rate support. */
- OFPPF_40GB_FD = 128; /* 40 Gb full-duplex rate support. */
- OFPPF_100GB_FD = 256; /* 100 Gb full-duplex rate support. */
- OFPPF_1TB_FD = 512; /* 1 Tb full-duplex rate support. */
- OFPPF_OTHER = 1024; /* Other rate, not in the list. */
- OFPPF_COPPER = 2048; /* Copper medium. */
- OFPPF_FIBER = 4096; /* Fiber medium. */
- OFPPF_AUTONEG = 8192; /* Auto-negotiation. */
- OFPPF_PAUSE = 16384; /* Pause. */
- OFPPF_PAUSE_ASYM = 32768; /* Asymmetric pause. */
-};
-
-/* Description of a port */
-message ofp_port {
- uint32 port_no = 1;
- repeated uint32 hw_addr = 2; // [OFP_ETH_ALEN];
- string name = 3; /* Null-terminated */
-
- uint32 config = 4; /* Bitmap of OFPPC_* flags. */
- uint32 state = 5; /* Bitmap of OFPPS_* flags. */
-
- /* Bitmaps of OFPPF_* that describe features. All bits zeroed if
- * unsupported or unavailable. */
- uint32 curr = 6; /* Current features. */
- uint32 advertised = 7; /* Features being advertised by the port. */
- uint32 supported = 8; /* Features supported by the port. */
- uint32 peer = 9; /* Features advertised by peer. */
- uint32 curr_speed = 10; /* Current port bitrate in kbps. */
- uint32 max_speed = 11; /* Max port bitrate in kbps */
-};
-
-/* Switch features. */
-message ofp_switch_features {
- //ofp_header header;
- uint64 datapath_id = 1; /* Datapath unique ID. The lower 48-bits are for
- a MAC address, while the upper 16-bits are
- implementer-defined. */
-
- uint32 n_buffers = 2; /* Max packets buffered at once. */
-
- uint32 n_tables = 3; /* Number of tables supported by datapath. */
- uint32 auxiliary_id = 4; /* Identify auxiliary connections */
-
- /* Features. */
- uint32 capabilities = 5; /* Bitmap of support "ofp_capabilities". */
-};
-
-/* What changed about the physical port */
-enum ofp_port_reason {
- OFPPR_ADD = 0; /* The port was added. */
- OFPPR_DELETE = 1; /* The port was removed. */
- OFPPR_MODIFY = 2; /* Some attribute of the port has changed. */
-};
-
-/* A physical port has changed in the datapath */
-message ofp_port_status {
- //ofp_header header;
- ofp_port_reason reason = 1; /* One of OFPPR_*. */
- ofp_port desc = 2;
-};
-
-/* Modify behavior of the physical port */
-message ofp_port_mod {
- //ofp_header header;
- uint32 port_no = 1;
- repeated uint32 hw_addr = 2; //[OFP_ETH_ALEN];
- /* The hardware address is not
- configurable. This is used to
- sanity-check the request, so it must
- be the same as returned in an
- ofp_port struct. */
- uint32 config = 3; /* Bitmap of OFPPC_* flags. */
- uint32 mask = 4; /* Bitmap of OFPPC_* flags to be changed. */
-
- uint32 advertise = 5; /* Bitmap of OFPPF_*. Zero all bits to prevent
- any action taking place. */
-};
-
-/* ## -------------------------- ## */
-/* ## OpenFlow Extensible Match. ## */
-/* ## -------------------------- ## */
-
-/* The match type indicates the match structure (set of fields that compose the
- * match) in use. The match type is placed in the type field at the beginning
- * of all match structures. The "OpenFlow Extensible Match" type corresponds
- * to OXM TLV format described below and must be supported by all OpenFlow
- * switches. Extensions that define other match types may be published on the
- * ONF wiki. Support for extensions is optional.
- */
-enum ofp_match_type {
- OFPMT_STANDARD = 0; /* Deprecated. */
- OFPMT_OXM = 1; /* OpenFlow Extensible Match */
-};
-
-/* Fields to match against flows */
-message ofp_match {
- ofp_match_type type = 1; /* One of OFPMT_* */
- repeated ofp_oxm_field oxm_fields = 2; /* 0 or more */
-};
-
-/* Components of a OXM TLV header.
- * Those macros are not valid for the experimenter class, macros for the
- * experimenter class will depend on the experimenter header used. */
-//#define OXM_HEADER__(CLASS, FIELD, HASMASK, LENGTH) \
-// (((CLASS) << 16) | ((FIELD) << 9) | ((HASMASK) << 8) | (LENGTH))
-//#define OXM_HEADER(CLASS, FIELD, LENGTH) \
-// OXM_HEADER__(CLASS, FIELD, 0, LENGTH)
-//#define OXM_HEADER_W(CLASS, FIELD, LENGTH) \
-// OXM_HEADER__(CLASS, FIELD, 1, (LENGTH) * 2)
-//#define OXM_CLASS(HEADER) ((HEADER) >> 16)
-//#define OXM_FIELD(HEADER) (((HEADER) >> 9) & 0x7f)
-//#define OXM_TYPE(HEADER) (((HEADER) >> 9) & 0x7fffff)
-//#define OXM_HASMASK(HEADER) (((HEADER) >> 8) & 1)
-//#define OXM_LENGTH(HEADER) ((HEADER) & 0xff)
-//
-//#define OXM_MAKE_WILD_HEADER(HEADER) \
-// OXM_HEADER_W(OXM_CLASS(HEADER), OXM_FIELD(HEADER), OXM_LENGTH(HEADER))
-
-/* OXM Class IDs.
- * The high order bit differentiate reserved classes from member classes.
- * Classes 0x0000 to 0x7FFF are member classes, allocated by ONF.
- * Classes 0x8000 to 0xFFFE are reserved classes, reserved for standardisation.
- */
-enum ofp_oxm_class {
- OFPXMC_NXM_0 = 0x0000; /* Backward compatibility with NXM */
- OFPXMC_NXM_1 = 0x0001; /* Backward compatibility with NXM */
- OFPXMC_OPENFLOW_BASIC = 0x8000; /* Basic class for OpenFlow */
- OFPXMC_EXPERIMENTER = 0xFFFF; /* Experimenter class */
-};
-
-/* OXM Flow field types for OpenFlow basic class. */
-enum oxm_ofb_field_types {
- OFPXMT_OFB_IN_PORT = 0; /* Switch input port. */
- OFPXMT_OFB_IN_PHY_PORT = 1; /* Switch physical input port. */
- OFPXMT_OFB_METADATA = 2; /* Metadata passed between tables. */
- OFPXMT_OFB_ETH_DST = 3; /* Ethernet destination address. */
- OFPXMT_OFB_ETH_SRC = 4; /* Ethernet source address. */
- OFPXMT_OFB_ETH_TYPE = 5; /* Ethernet frame type. */
- OFPXMT_OFB_VLAN_VID = 6; /* VLAN id. */
- OFPXMT_OFB_VLAN_PCP = 7; /* VLAN priority. */
- OFPXMT_OFB_IP_DSCP = 8; /* IP DSCP (6 bits in ToS field). */
- OFPXMT_OFB_IP_ECN = 9; /* IP ECN (2 bits in ToS field). */
- OFPXMT_OFB_IP_PROTO = 10; /* IP protocol. */
- OFPXMT_OFB_IPV4_SRC = 11; /* IPv4 source address. */
- OFPXMT_OFB_IPV4_DST = 12; /* IPv4 destination address. */
- OFPXMT_OFB_TCP_SRC = 13; /* TCP source port. */
- OFPXMT_OFB_TCP_DST = 14; /* TCP destination port. */
- OFPXMT_OFB_UDP_SRC = 15; /* UDP source port. */
- OFPXMT_OFB_UDP_DST = 16; /* UDP destination port. */
- OFPXMT_OFB_SCTP_SRC = 17; /* SCTP source port. */
- OFPXMT_OFB_SCTP_DST = 18; /* SCTP destination port. */
- OFPXMT_OFB_ICMPV4_TYPE = 19; /* ICMP type. */
- OFPXMT_OFB_ICMPV4_CODE = 20; /* ICMP code. */
- OFPXMT_OFB_ARP_OP = 21; /* ARP opcode. */
- OFPXMT_OFB_ARP_SPA = 22; /* ARP source IPv4 address. */
- OFPXMT_OFB_ARP_TPA = 23; /* ARP target IPv4 address. */
- OFPXMT_OFB_ARP_SHA = 24; /* ARP source hardware address. */
- OFPXMT_OFB_ARP_THA = 25; /* ARP target hardware address. */
- OFPXMT_OFB_IPV6_SRC = 26; /* IPv6 source address. */
- OFPXMT_OFB_IPV6_DST = 27; /* IPv6 destination address. */
- OFPXMT_OFB_IPV6_FLABEL = 28; /* IPv6 Flow Label */
- OFPXMT_OFB_ICMPV6_TYPE = 29; /* ICMPv6 type. */
- OFPXMT_OFB_ICMPV6_CODE = 30; /* ICMPv6 code. */
- OFPXMT_OFB_IPV6_ND_TARGET = 31; /* Target address for ND. */
- OFPXMT_OFB_IPV6_ND_SLL = 32; /* Source link-layer for ND. */
- OFPXMT_OFB_IPV6_ND_TLL = 33; /* Target link-layer for ND. */
- OFPXMT_OFB_MPLS_LABEL = 34; /* MPLS label. */
- OFPXMT_OFB_MPLS_TC = 35; /* MPLS TC. */
- OFPXMT_OFB_MPLS_BOS = 36; /* MPLS BoS bit. */
- OFPXMT_OFB_PBB_ISID = 37; /* PBB I-SID. */
- OFPXMT_OFB_TUNNEL_ID = 38; /* Logical Port Metadata. */
- OFPXMT_OFB_IPV6_EXTHDR = 39; /* IPv6 Extension Header pseudo-field */
-};
-
-/* OXM Flow match fields */
-message ofp_oxm_field {
- ofp_oxm_class oxm_class = 1;
- oneof field {
- /* 2 and 3 reserved for NXM_0 and NXM-1 OXM classes */
- ofp_oxm_ofb_field ofb_field = 4;
- ofp_oxm_experimenter_field experimenter_field = 5;
- }
-}
-
-/* OXM OpenFlow Basic Match Field */
-message ofp_oxm_ofb_field {
- oxm_ofb_field_types type = 1;
- bool has_mask = 2;
- oneof value {
-
- /* OpenFlow port on which the packet was received.
- * May be a physical port, a logical port, or the reserved port OFPP_LOCAL
- *
- * Prereqs: None.
- *
- * Format: 32-bit integer in network byte order.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_IN_PORT OXM_HEADER (0x8000, OFPXMT_OFB_IN_PORT, 4)
- uint32 port = 3; /* Used for OFPXMT_OFB_IN_PORT */
-
- /* Physical port on which the packet was received.
- *
- * Consider a packet received on a tunnel interface defined over a link
- * aggregation group (LAG) with two physical port members. If the tunnel
- * interface is the logical port bound to OpenFlow. In this case,
- * OFPXMT_OF_IN_PORT is the tunnel's port number and OFPXMT_OF_IN_PHY_PORT is
- * the physical port number of the LAG on which the tunnel is configured.
- *
- * When a packet is received directly on a physical port and not processed by a
- * logical port, OFPXMT_OF_IN_PORT and OFPXMT_OF_IN_PHY_PORT have the same
- * value.
- *
- * This field is usually not available in a regular match and only available
- * in ofp_packet_in messages when it's different from OXM_OF_IN_PORT.
- *
- * Prereqs: OXM_OF_IN_PORT must be present.
- *
- * Format: 32-bit integer in network byte order.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_IN_PHY_PORT OXM_HEADER (0x8000, OFPXMT_OFB_IN_PHY_PORT, 4)
- uint32 physical_port = 4; /* Used for OFPXMT_OF_IN_PHY_PORT */
-
- /* Table metadata.
- *
- * Prereqs: None.
- *
- * Format: 64-bit integer in network byte order.
- *
- * Masking: Arbitrary masks.
- */
- //#define OXM_OF_METADATA OXM_HEADER (0x8000, OFPXMT_OFB_METADATA, 8)
- //#define OXM_OF_METADATA_W OXM_HEADER_W(0x8000, OFPXMT_OFB_METADATA, 8)
- uint64 table_metadata = 5; /* Used for OFPXMT_OFB_METADATA */
-
- /* Source or destination address in Ethernet header.
- *
- * Prereqs: None.
- *
- * Format: 48-bit Ethernet MAC address.
- *
- * Masking: Arbitrary masks. */
- //#define OXM_OF_ETH_DST OXM_HEADER (0x8000, OFPXMT_OFB_ETH_DST, 6)
- //#define OXM_OF_ETH_DST_W OXM_HEADER_W(0x8000, OFPXMT_OFB_ETH_DST, 6)
- //#define OXM_OF_ETH_SRC OXM_HEADER (0x8000, OFPXMT_OFB_ETH_SRC, 6)
- //#define OXM_OF_ETH_SRC_W OXM_HEADER_W(0x8000, OFPXMT_OFB_ETH_SRC, 6)
- bytes eth_dst = 6; /* Used for OFPXMT_OFB_ETH_DST (exactly 6 bytes) */
- bytes eth_src = 7; /* Used for OFPXMT_OFB_ETH_SRC (exactly 6 bytes) */
-
- /* Packet's Ethernet type.
- *
- * Prereqs: None.
- *
- * Format: 16-bit integer in network byte order.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_ETH_TYPE OXM_HEADER (0x8000, OFPXMT_OFB_ETH_TYPE,2)
- uint32 eth_type = 8; /* Used for OFPXMT_OFB_ETH_TYPE */
-
- /* 802.1Q VID.
- *
- * For a packet with an 802.1Q header, this is the VLAN-ID (VID) from the
- * outermost tag, with the CFI bit forced to 1. For a packet with no 802.1Q
- * header, this has value OFPVID_NONE.
- *
- * Prereqs: None.
- *
- * Format: 16-bit integer in network byte order with bit 13 indicating
- * presence of VLAN header and 3 most-significant bits forced to 0.
- * Only the lower 13 bits have meaning.
- *
- * Masking: Arbitrary masks.
- *
- * This field can be used in various ways:
- *
- * - If it is not constrained at all, the nx_match matches packets without
- * an 802.1Q header or with an 802.1Q header that has any VID value.
- *
- * - Testing for an exact match with 0x0 matches only packets without
- * an 802.1Q header.
- *
- * - Testing for an exact match with a VID value with CFI=1 matches packets
- * that have an 802.1Q header with a specified VID.
- *
- * - Testing for an exact match with a nonzero VID value with CFI=0 does
- * not make sense. The switch may reject this combination.
- *
- * - Testing with nxm_value=0, nxm_mask=0x0fff matches packets with no 802.1Q
- * header or with an 802.1Q header with a VID of 0.
- *
- * - Testing with nxm_value=0x1000, nxm_mask=0x1000 matches packets with
- * an 802.1Q header that has any VID value.
- */
- //#define OXM_OF_VLAN_VID OXM_HEADER (0x8000, OFPXMT_OFB_VLAN_VID, 2)
- //#define OXM_OF_VLAN_VID_W OXM_HEADER_W(0x8000, OFPXMT_OFB_VLAN_VID, 2)
- uint32 vlan_vid = 9; /* Used for OFPXMT_OFB_VLAN_VID */
-
- /* 802.1Q PCP.
- *
- * For a packet with an 802.1Q header, this is the VLAN-PCP from the
- * outermost tag. For a packet with no 802.1Q header, this has value
- * 0.
- *
- * Prereqs: OXM_OF_VLAN_VID must be different from OFPVID_NONE.
- *
- * Format: 8-bit integer with 5 most-significant bits forced to 0.
- * Only the lower 3 bits have meaning.
- *
- * Masking: Not maskable.
- */
- //#define OXM_OF_VLAN_PCP OXM_HEADER (0x8000, OFPXMT_OFB_VLAN_PCP, 1)
- uint32 vlan_pcp = 10; /* Used for OFPXMT_OFB_VLAN_PCP */
-
- /* The Diff Serv Code Point (DSCP) bits of the IP header.
- * Part of the IPv4 ToS field or the IPv6 Traffic Class field.
- *
- * Prereqs: OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd.
- *
- * Format: 8-bit integer with 2 most-significant bits forced to 0.
- * Only the lower 6 bits have meaning.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_IP_DSCP OXM_HEADER (0x8000, OFPXMT_OFB_IP_DSCP, 1)
- uint32 ip_dscp = 11; /* Used for OFPXMT_OFB_IP_DSCP */
-
- /* The ECN bits of the IP header.
- * Part of the IPv4 ToS field or the IPv6 Traffic Class field.
- *
- * Prereqs: OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd.
- *
- * Format: 8-bit integer with 6 most-significant bits forced to 0.
- * Only the lower 2 bits have meaning.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_IP_ECN OXM_HEADER (0x8000, OFPXMT_OFB_IP_ECN, 1)
- uint32 ip_ecn = 12; /* Used for OFPXMT_OFB_IP_ECN */
-
- /* The "protocol" byte in the IP header.
- *
- * Prereqs: OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd.
- *
- * Format: 8-bit integer.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_IP_PROTO OXM_HEADER (0x8000, OFPXMT_OFB_IP_PROTO, 1)
- uint32 ip_proto = 13; /* Used for OFPXMT_OFB_IP_PROTO */
-
- /* The source or destination address in the IP header.
- *
- * Prereqs: OXM_OF_ETH_TYPE must match 0x0800 exactly.
- *
- * Format: 32-bit integer in network byte order.
- *
- * Masking: Arbitrary masks.
- */
- //#define OXM_OF_IPV4_SRC OXM_HEADER (0x8000, OFPXMT_OFB_IPV4_SRC, 4)
- //#define OXM_OF_IPV4_SRC_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV4_SRC, 4)
- //#define OXM_OF_IPV4_DST OXM_HEADER (0x8000, OFPXMT_OFB_IPV4_DST, 4)
- //#define OXM_OF_IPV4_DST_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV4_DST, 4)
- uint32 ipv4_src = 14; /* Used for OFPXMT_OFB_IPV4_SRC */
- uint32 ipv4_dst = 15; /* Used for OFPXMT_OFB_IPV4_DST */
-
- /* The source or destination port in the TCP header.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must be either 0x0800 or 0x86dd.
- * OXM_OF_IP_PROTO must match 6 exactly.
- *
- * Format: 16-bit integer in network byte order.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_TCP_SRC OXM_HEADER (0x8000, OFPXMT_OFB_TCP_SRC, 2)
- //#define OXM_OF_TCP_DST OXM_HEADER (0x8000, OFPXMT_OFB_TCP_DST, 2)
- uint32 tcp_src = 16; /* Used for OFPXMT_OFB_TCP_SRC */
- uint32 tcp_dst = 17; /* Used for OFPXMT_OFB_TCP_DST */
-
- /* The source or destination port in the UDP header.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match either 0x0800 or 0x86dd.
- * OXM_OF_IP_PROTO must match 17 exactly.
- *
- * Format: 16-bit integer in network byte order.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_UDP_SRC OXM_HEADER (0x8000, OFPXMT_OFB_UDP_SRC, 2)
- //#define OXM_OF_UDP_DST OXM_HEADER (0x8000, OFPXMT_OFB_UDP_DST, 2)
- uint32 udp_src = 18; /* Used for OFPXMT_OFB_UDP_SRC */
- uint32 udp_dst = 19; /* Used for OFPXMT_OFB_UDP_DST */
-
- /* The source or destination port in the SCTP header.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match either 0x0800 or 0x86dd.
- * OXM_OF_IP_PROTO must match 132 exactly.
- *
- * Format: 16-bit integer in network byte order.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_SCTP_SRC OXM_HEADER (0x8000, OFPXMT_OFB_SCTP_SRC, 2)
- //#define OXM_OF_SCTP_DST OXM_HEADER (0x8000, OFPXMT_OFB_SCTP_DST, 2)
- uint32 sctp_src = 20; /* Used for OFPXMT_OFB_SCTP_SRC */
- uint32 sctp_dst = 21; /* Used for OFPXMT_OFB_SCTP_DST */
-
- /* The type or code in the ICMP header.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x0800 exactly.
- * OXM_OF_IP_PROTO must match 1 exactly.
- *
- * Format: 8-bit integer.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_ICMPV4_TYPE OXM_HEADER (0x8000, OFPXMT_OFB_ICMPV4_TYPE, 1)
- //#define OXM_OF_ICMPV4_CODE OXM_HEADER (0x8000, OFPXMT_OFB_ICMPV4_CODE, 1)
- uint32 icmpv4_type = 22; /* Used for OFPXMT_OFB_ICMPV4_TYPE */
- uint32 icmpv4_code = 23; /* Used for OFPXMT_OFB_ICMPV4_CODE */
-
- /* ARP opcode.
- *
- * For an Ethernet+IP ARP packet, the opcode in the ARP header. Always 0
- * otherwise.
- *
- * Prereqs: OXM_OF_ETH_TYPE must match 0x0806 exactly.
- *
- * Format: 16-bit integer in network byte order.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_ARP_OP OXM_HEADER (0x8000, OFPXMT_OFB_ARP_OP, 2)
- uint32 arp_op = 24; /* Used for OFPXMT_OFB_ARP_OP */
-
- /* For an Ethernet+IP ARP packet, the source or target protocol address
- * in the ARP header. Always 0 otherwise.
- *
- * Prereqs: OXM_OF_ETH_TYPE must match 0x0806 exactly.
- *
- * Format: 32-bit integer in network byte order.
- *
- * Masking: Arbitrary masks.
- */
- //#define OXM_OF_ARP_SPA OXM_HEADER (0x8000, OFPXMT_OFB_ARP_SPA, 4)
- //#define OXM_OF_ARP_SPA_W OXM_HEADER_W(0x8000, OFPXMT_OFB_ARP_SPA, 4)
- //#define OXM_OF_ARP_TPA OXM_HEADER (0x8000, OFPXMT_OFB_ARP_TPA, 4)
- //#define OXM_OF_ARP_TPA_W OXM_HEADER_W(0x8000, OFPXMT_OFB_ARP_TPA, 4)
- uint32 arp_spa = 25; /* For OFPXMT_OFB_ARP_SPA */
- uint32 arp_tpa = 26; /* For OFPXMT_OFB_ARP_TPA */
-
- /* For an Ethernet+IP ARP packet, the source or target hardware address
- * in the ARP header. Always 0 otherwise.
- *
- * Prereqs: OXM_OF_ETH_TYPE must match 0x0806 exactly.
- *
- * Format: 48-bit Ethernet MAC address.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_ARP_SHA OXM_HEADER (0x8000, OFPXMT_OFB_ARP_SHA, 6)
- //#define OXM_OF_ARP_SHA_W OXM_HEADER_W (0x8000, OFPXMT_OFB_ARP_SHA, 6)
- //#define OXM_OF_ARP_THA OXM_HEADER (0x8000, OFPXMT_OFB_ARP_THA, 6)
- //#define OXM_OF_ARP_THA_W OXM_HEADER_W (0x8000, OFPXMT_OFB_ARP_THA, 6)
- bytes arp_sha = 27; /* For OFPXMT_OFB_ARP_SHA (6 bytes) */
- bytes arp_tha = 28; /* For OFPXMT_OFB_ARP_THA (6 bytes) */
-
- /* The source or destination address in the IPv6 header.
- *
- * Prereqs: OXM_OF_ETH_TYPE must match 0x86dd exactly.
- *
- * Format: 128-bit IPv6 address.
- *
- * Masking: Arbitrary masks.
- */
- //#define OXM_OF_IPV6_SRC OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_SRC, 16)
- //#define OXM_OF_IPV6_SRC_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV6_SRC, 16)
- //#define OXM_OF_IPV6_DST OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_DST, 16)
- //#define OXM_OF_IPV6_DST_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV6_DST, 16)
- bytes ipv6_src = 29; /* For OFPXMT_OFB_IPV6_SRC */
- bytes ipv6_dst = 30; /* For OFPXMT_OFB_IPV6_DST */
-
- /* The IPv6 Flow Label
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x86dd exactly
- *
- * Format: 32-bit integer with 12 most-significant bits forced to 0.
- * Only the lower 20 bits have meaning.
- *
- * Masking: Arbitrary masks.
- */
- //#define OXM_OF_IPV6_FLABEL OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_FLABEL, 4)
- //#define OXM_OF_IPV6_FLABEL_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV6_FLABEL, 4)
- uint32 ipv6_flabel = 31; /* For OFPXMT_OFB_IPV6_FLABEL */
-
- /* The type or code in the ICMPv6 header.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x86dd exactly.
- * OXM_OF_IP_PROTO must match 58 exactly.
- *
- * Format: 8-bit integer.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_ICMPV6_TYPE OXM_HEADER (0x8000, OFPXMT_OFB_ICMPV6_TYPE, 1)
- //#define OXM_OF_ICMPV6_CODE OXM_HEADER (0x8000, OFPXMT_OFB_ICMPV6_CODE, 1)
- uint32 icmpv6_type = 32; /* For OFPXMT_OFB_ICMPV6_TYPE */
- uint32 icmpv6_code = 33; /* For OFPXMT_OFB_ICMPV6_CODE */
-
- /* The target address in an IPv6 Neighbor Discovery message.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x86dd exactly.
- * OXM_OF_IP_PROTO must match 58 exactly.
- * OXM_OF_ICMPV6_TYPE must be either 135 or 136.
- *
- * Format: 128-bit IPv6 address.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_IPV6_ND_TARGET OXM_HEADER \
- // (0x8000, OFPXMT_OFB_IPV6_ND_TARGET, 16)
- bytes ipv6_nd_target = 34; /* For OFPXMT_OFB_IPV6_ND_TARGET */
-
- /* The source link-layer address option in an IPv6 Neighbor Discovery
- * message.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x86dd exactly.
- * OXM_OF_IP_PROTO must match 58 exactly.
- * OXM_OF_ICMPV6_TYPE must be exactly 135.
- *
- * Format: 48-bit Ethernet MAC address.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_IPV6_ND_SLL OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_ND_SLL, 6)
- bytes ipv6_nd_ssl = 35; /* For OFPXMT_OFB_IPV6_ND_SLL */
-
- /* The target link-layer address option in an IPv6 Neighbor Discovery
- * message.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x86dd exactly.
- * OXM_OF_IP_PROTO must match 58 exactly.
- * OXM_OF_ICMPV6_TYPE must be exactly 136.
- *
- * Format: 48-bit Ethernet MAC address.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_IPV6_ND_TLL OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_ND_TLL, 6)
- bytes ipv6_nd_tll = 36; /* For OFPXMT_OFB_IPV6_ND_TLL */
-
- /* The LABEL in the first MPLS shim header.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x8847 or 0x8848 exactly.
- *
- * Format: 32-bit integer in network byte order with 12 most-significant
- * bits forced to 0. Only the lower 20 bits have meaning.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_MPLS_LABEL OXM_HEADER (0x8000, OFPXMT_OFB_MPLS_LABEL, 4)
- uint32 mpls_label = 37; /* For OFPXMT_OFB_MPLS_LABEL */
-
- /* The TC in the first MPLS shim header.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x8847 or 0x8848 exactly.
- *
- * Format: 8-bit integer with 5 most-significant bits forced to 0.
- * Only the lower 3 bits have meaning.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_MPLS_TC OXM_HEADER (0x8000, OFPXMT_OFB_MPLS_TC, 1)
- uint32 mpls_tc = 38; /* For OFPXMT_OFB_MPLS_TC */
-
- /* The BoS bit in the first MPLS shim header.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x8847 or 0x8848 exactly.
- *
- * Format: 8-bit integer with 7 most-significant bits forced to 0.
- * Only the lowest bit have a meaning.
- *
- * Masking: Not maskable. */
- //#define OXM_OF_MPLS_BOS OXM_HEADER (0x8000, OFPXMT_OFB_MPLS_BOS, 1)
- uint32 mpls_bos = 39; /* For OFPXMT_OFB_MPLS_BOS */
-
- /* IEEE 802.1ah I-SID.
- *
- * For a packet with a PBB header, this is the I-SID from the
- * outermost service tag.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x88E7 exactly.
- *
- * Format: 24-bit integer in network byte order.
- *
- * Masking: Arbitrary masks. */
- //#define OXM_OF_PBB_ISID OXM_HEADER (0x8000, OFPXMT_OFB_PBB_ISID, 3)
- //#define OXM_OF_PBB_ISID_W OXM_HEADER_W(0x8000, OFPXMT_OFB_PBB_ISID, 3)
- uint32 pbb_isid = 40; /* For OFPXMT_OFB_PBB_ISID */
-
- /* Logical Port Metadata.
- *
- * Metadata associated with a logical port.
- * If the logical port performs encapsulation and decapsulation, this
- * is the demultiplexing field from the encapsulation header.
- * For example, for a packet received via GRE tunnel including a (32-bit) key,
- * the key is stored in the low 32-bits and the high bits are zeroed.
- * For a MPLS logical port, the low 20 bits represent the MPLS Label.
- * For a VxLAN logical port, the low 24 bits represent the VNI.
- * If the packet is not received through a logical port, the value is 0.
- *
- * Prereqs: None.
- *
- * Format: 64-bit integer in network byte order.
- *
- * Masking: Arbitrary masks. */
- //#define OXM_OF_TUNNEL_ID OXM_HEADER (0x8000, OFPXMT_OFB_TUNNEL_ID, 8)
- //#define OXM_OF_TUNNEL_ID_W OXM_HEADER_W(0x8000, OFPXMT_OFB_TUNNEL_ID, 8)
- uint64 tunnel_id = 41; /* For OFPXMT_OFB_TUNNEL_ID */
-
- /* The IPv6 Extension Header pseudo-field.
- *
- * Prereqs:
- * OXM_OF_ETH_TYPE must match 0x86dd exactly
- *
- * Format: 16-bit integer with 7 most-significant bits forced to 0.
- * Only the lower 9 bits have meaning.
- *
- * Masking: Maskable. */
- //#define OXM_OF_IPV6_EXTHDR OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_EXTHDR, 2)
- //#define OXM_OF_IPV6_EXTHDR_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV6_EXTHDR, 2)
- uint32 ipv6_exthdr = 42; /* For OFPXMT_OFB_IPV6_EXTHDR */
-
- }
-
- /* Optional mask values (must be present when has_mask is true */
- oneof mask {
- uint64 table_metadata_mask = 105; /* For OFPXMT_OFB_METADATA */
-
- bytes eth_dst_mask = 106; /* For OFPXMT_OFB_ETH_DST (exactly 6 bytes)*/
- bytes eth_src_mask = 107; /* For OFPXMT_OFB_ETH_SRC (exactly 6 bytes)*/
-
- uint32 vlan_vid_mask = 109; /* For OFPXMT_OFB_VLAN_VID */
-
- uint32 ipv4_src_mask = 114; /* For OFPXMT_OFB_IPV4_SRC */
- uint32 ipv4_dst_mask = 115; /* For OFPXMT_OFB_IPV4_DST */
-
- uint32 arp_spa_mask = 125; /* For OFPXMT_OFB_ARP_SPA */
- uint32 arp_tpa_mask = 126; /* For OFPXMT_OFB_ARP_TPA */
-
- bytes ipv6_src_mask = 129; /* For OFPXMT_OFB_IPV6_SRC */
- bytes ipv6_dst_mask = 130; /* For OFPXMT_OFB_IPV6_DST */
-
- uint32 ipv6_flabel_mask = 131; /* For OFPXMT_OFB_IPV6_FLABEL */
-
- uint32 pbb_isid_mask = 140; /* For OFPXMT_OFB_PBB_ISID */
-
- uint64 tunnel_id_mask = 141; /* For OFPXMT_OFB_TUNNEL_ID */
-
- uint32 ipv6_exthdr_mask = 142; /* For OFPXMT_OFB_IPV6_EXTHDR */
- }
-
-}
-//#define OFPXMT_OFB_ALL ((UINT64_C(1) << 40) - 1)
-
-
-/* The VLAN id is 12-bits, so we can use the entire 16 bits to indicate
- * special conditions.
- */
-enum ofp_vlan_id {
- OFPVID_NONE = 0x0000; /* No VLAN id was set. */
- OFPVID_PRESENT = 0x1000; /* Bit that indicate that a VLAN id is set */
-};
-/* Define for compatibility */
-//#define OFP_VLAN_NONE OFPVID_NONE
-
-/* Bit definitions for IPv6 Extension Header pseudo-field. */
-enum ofp_ipv6exthdr_flags {
- OFPIEH_INVALID = 0;
- OFPIEH_NONEXT = 1; /* "No next header" encountered. */
- OFPIEH_ESP = 2; /* Encrypted Sec Payload header present. */
- OFPIEH_AUTH = 4; /* Authentication header present. */
- OFPIEH_DEST = 8; /* 1 or 2 dest headers present. */
- OFPIEH_FRAG = 16; /* Fragment header present. */
- OFPIEH_ROUTER = 32; /* Router header present. */
- OFPIEH_HOP = 64; /* Hop-by-hop header present. */
- OFPIEH_UNREP = 128; /* Unexpected repeats encountered. */
- OFPIEH_UNSEQ = 256; /* Unexpected sequencing encountered. */
-};
-
-/* Header for OXM experimenter match fields.
- * The experimenter class should not use OXM_HEADER() macros for defining
- * fields due to this extra header. */
-message ofp_oxm_experimenter_field {
- uint32 oxm_header = 1; /* oxm_class = OFPXMC_EXPERIMENTER */
- uint32 experimenter = 2; /* Experimenter ID which takes the same
- form as in struct ofp_experimenter_header. */
-};
-
-/* ## ----------------- ## */
-/* ## OpenFlow Actions. ## */
-/* ## ----------------- ## */
-
-enum ofp_action_type {
- OFPAT_OUTPUT = 0; /* Output to switch port. */
- OFPAT_COPY_TTL_OUT = 11; /* Copy TTL "outwards" -- from next-to-outermost
- to outermost */
- OFPAT_COPY_TTL_IN = 12; /* Copy TTL "inwards" -- from outermost to
- next-to-outermost */
- OFPAT_SET_MPLS_TTL = 15; /* MPLS TTL */
- OFPAT_DEC_MPLS_TTL = 16; /* Decrement MPLS TTL */
-
- OFPAT_PUSH_VLAN = 17; /* Push a new VLAN tag */
- OFPAT_POP_VLAN = 18; /* Pop the outer VLAN tag */
- OFPAT_PUSH_MPLS = 19; /* Push a new MPLS tag */
- OFPAT_POP_MPLS = 20; /* Pop the outer MPLS tag */
- OFPAT_SET_QUEUE = 21; /* Set queue id when outputting to a port */
- OFPAT_GROUP = 22; /* Apply group. */
- OFPAT_SET_NW_TTL = 23; /* IP TTL. */
- OFPAT_DEC_NW_TTL = 24; /* Decrement IP TTL. */
- OFPAT_SET_FIELD = 25; /* Set a header field using OXM TLV format. */
- OFPAT_PUSH_PBB = 26; /* Push a new PBB service tag (I-TAG) */
- OFPAT_POP_PBB = 27; /* Pop the outer PBB service tag (I-TAG) */
- OFPAT_EXPERIMENTER = 0xffff;
-};
-
-/* Action header that is common to all actions. The length includes the
- * header and any padding used to make the action 64-bit aligned.
- * NB: The length of an action *must* always be a multiple of eight. */
-message ofp_action {
- ofp_action_type type = 1; /* One of OFPAT_*. */
- oneof action {
- ofp_action_output output = 2;
- ofp_action_mpls_ttl mpls_ttl = 3;
- ofp_action_push push = 4;
- ofp_action_pop_mpls pop_mpls = 5;
- ofp_action_group group = 6;
- ofp_action_nw_ttl nw_ttl = 7;
- ofp_action_set_field set_field = 8;
- ofp_action_experimenter experimenter = 9;
- }
-};
-
-enum ofp_controller_max_len {
- OFPCML_INVALID = 0;
- OFPCML_MAX = 0xffe5; /* maximum max_len value which can be used
- to request a specific byte length. */
- OFPCML_NO_BUFFER = 0xffff; /* indicates that no buffering should be
- applied and the whole packet is to be
- sent to the controller. */
-};
-
-/* Action structure for OFPAT_OUTPUT, which sends packets out 'port'.
- * When the 'port' is the OFPP_CONTROLLER, 'max_len' indicates the max
- * number of bytes to send. A 'max_len' of zero means no bytes of the
- * packet should be sent. A 'max_len' of OFPCML_NO_BUFFER means that
- * the packet is not buffered and the complete packet is to be sent to
- * the controller. */
-message ofp_action_output {
- uint32 port = 1; /* Output port. */
- uint32 max_len = 2; /* Max length to send to controller. */
-};
-
-/* Action structure for OFPAT_SET_MPLS_TTL. */
-message ofp_action_mpls_ttl {
- uint32 mpls_ttl = 1; /* MPLS TTL */
-};
-
-/* Action structure for OFPAT_PUSH_VLAN/MPLS/PBB. */
-message ofp_action_push {
- uint32 ethertype = 1; /* Ethertype */
-};
-
-/* Action structure for OFPAT_POP_MPLS. */
-message ofp_action_pop_mpls {
- uint32 ethertype = 1; /* Ethertype */
-};
-
-/* Action structure for OFPAT_GROUP. */
-message ofp_action_group {
- uint32 group_id = 1; /* Group identifier. */
-};
-
-/* Action structure for OFPAT_SET_NW_TTL. */
-message ofp_action_nw_ttl {
- uint32 nw_ttl = 1; /* IP TTL */
-};
-
-/* Action structure for OFPAT_SET_FIELD. */
-message ofp_action_set_field {
- ofp_oxm_field field = 1;
-};
-
-/* Action header for OFPAT_EXPERIMENTER.
- * The rest of the body is experimenter-defined. */
-message ofp_action_experimenter {
- uint32 experimenter = 1; /* Experimenter ID which takes the same
- form as in struct
- ofp_experimenter_header. */
- bytes data = 2;
-};
-
-/* ## ---------------------- ## */
-/* ## OpenFlow Instructions. ## */
-/* ## ---------------------- ## */
-
-enum ofp_instruction_type {
- OFPIT_INVALID = 0;
- OFPIT_GOTO_TABLE = 1; /* Setup the next table in the lookup
- pipeline */
- OFPIT_WRITE_METADATA = 2; /* Setup the metadata field for use later in
- pipeline */
- OFPIT_WRITE_ACTIONS = 3; /* Write the action(s) onto the datapath action
- set */
- OFPIT_APPLY_ACTIONS = 4; /* Applies the action(s) immediately */
- OFPIT_CLEAR_ACTIONS = 5; /* Clears all actions from the datapath
- action set */
- OFPIT_METER = 6; /* Apply meter (rate limiter) */
-
- OFPIT_EXPERIMENTER = 0xFFFF; /* Experimenter instruction */
-};
-
-/* Instruction header that is common to all instructions. The length includes
- * the header and any padding used to make the instruction 64-bit aligned.
- * NB: The length of an instruction *must* always be a multiple of eight. */
-message ofp_instruction {
- uint32 type = 1; /* Instruction type */
- oneof data {
- ofp_instruction_goto_table goto_table = 2;
- ofp_instruction_write_metadata write_metadata = 3;
- ofp_instruction_actions actions = 4;
- ofp_instruction_meter meter = 5;
- ofp_instruction_experimenter experimenter = 6;
- }
-};
-
-/* Instruction structure for OFPIT_GOTO_TABLE */
-message ofp_instruction_goto_table {
- uint32 table_id = 1; /* Set next table in the lookup pipeline */
-};
-
-/* Instruction structure for OFPIT_WRITE_METADATA */
-message ofp_instruction_write_metadata {
- uint64 metadata = 1; /* Metadata value to write */
- uint64 metadata_mask = 2; /* Metadata write bitmask */
-};
-
-/* Instruction structure for OFPIT_WRITE/APPLY/CLEAR_ACTIONS */
-message ofp_instruction_actions {
- repeated ofp_action actions = 1; /* 0 or more actions associated
- with OFPIT_WRITE_ACTIONS and
- OFPIT_APPLY_ACTIONS */
-};
-
-/* Instruction structure for OFPIT_METER */
-message ofp_instruction_meter {
- uint32 meter_id = 1; /* Meter instance. */
-};
-
-/* Instruction structure for experimental instructions */
-message ofp_instruction_experimenter {
- uint32 experimenter = 1; /* Experimenter ID which takes the same form
- as in struct ofp_experimenter_header. */
- /* Experimenter-defined arbitrary additional data. */
- bytes data = 2;
-};
-
-/* ## --------------------------- ## */
-/* ## OpenFlow Flow Modification. ## */
-/* ## --------------------------- ## */
-
-enum ofp_flow_mod_command {
- OFPFC_ADD = 0; /* New flow. */
- OFPFC_MODIFY = 1; /* Modify all matching flows. */
- OFPFC_MODIFY_STRICT = 2; /* Modify entry strictly matching wildcards and
- priority. */
- OFPFC_DELETE = 3; /* Delete all matching flows. */
- OFPFC_DELETE_STRICT = 4; /* Delete entry strictly matching wildcards and
- priority. */
-};
-
-/* Value used in "idle_timeout" and "hard_timeout" to indicate that the entry
- * is permanent. */
-//#define OFP_FLOW_PERMANENT 0
-
-/* By default, choose a priority in the middle. */
-//#define OFP_DEFAULT_PRIORITY 0x8000
-
-enum ofp_flow_mod_flags {
- OFPFF_INVALID = 0;
- OFPFF_SEND_FLOW_REM = 1; /* Send flow removed message when flow
- * expires or is deleted. */
- OFPFF_CHECK_OVERLAP = 2; /* Check for overlapping entries first. */
- OFPFF_RESET_COUNTS = 4; /* Reset flow packet and byte counts. */
- OFPFF_NO_PKT_COUNTS = 8; /* Don't keep track of packet count. */
- OFPFF_NO_BYT_COUNTS = 16; /* Don't keep track of byte count. */
-};
-
-/* Flow setup and teardown (controller -> datapath). */
-message ofp_flow_mod {
- //ofp_header header;
- uint64 cookie = 1; /* Opaque controller-issued identifier. */
- uint64 cookie_mask = 2; /* Mask used to restrict the cookie bits
- that must match when the command is
- OFPFC_MODIFY* or OFPFC_DELETE*. A value
- of 0 indicates no restriction. */
- uint32 table_id = 3; /* ID of the table to put the flow in.
- For OFPFC_DELETE_* commands, OFPTT_ALL
- can also be used to delete matching
- flows from all tables. */
- ofp_flow_mod_command command = 4; /* One of OFPFC_*. */
- uint32 idle_timeout = 5; /* Idle time before discarding (seconds). */
- uint32 hard_timeout = 6; /* Max time before discarding (seconds). */
- uint32 priority = 7; /* Priority level of flow entry. */
- uint32 buffer_id = 8; /* Buffered packet to apply to, or
- OFP_NO_BUFFER.
- Not meaningful for OFPFC_DELETE*. */
- uint32 out_port = 9; /* For OFPFC_DELETE* commands, require
- matching entries to include this as an
- output port. A value of OFPP_ANY
- indicates no restriction. */
- uint32 out_group = 10; /* For OFPFC_DELETE* commands, require
- matching entries to include this as an
- output group. A value of OFPG_ANY
- indicates no restriction. */
- uint32 flags = 11; /* Bitmap of OFPFF_* flags. */
- ofp_match match = 12; /* Fields to match. Variable size. */
- repeated ofp_instruction instructions = 13; /* 0 or more. */
-};
-
-/* Group numbering. Groups can use any number up to OFPG_MAX. */
-enum ofp_group {
-
- OFPG_INVALID = 0;
-
- /* Last usable group number. */
- OFPG_MAX = 0x7fffff00;
-
- /* Fake groups. */
- OFPG_ALL = 0x7ffffffc; /* Represents all groups for group delete
- commands. */
- OFPG_ANY = 0x7fffffff; /* Special wildcard: no group specified. */
-};
-
-/* Group commands */
-enum ofp_group_mod_command {
- OFPGC_ADD = 0; /* New group. */
- OFPGC_MODIFY = 1; /* Modify all matching groups. */
- OFPGC_DELETE = 2; /* Delete all matching groups. */
-};
-
-/* Bucket for use in groups. */
-message ofp_bucket {
- uint32 weight = 1; /* Relative weight of bucket. Only
- defined for select groups. */
- uint32 watch_port = 2; /* Port whose state affects whether this
- bucket is live. Only required for fast
- failover groups. */
- uint32 watch_group = 3; /* Group whose state affects whether this
- bucket is live. Only required for fast
- failover groups. */
- repeated ofp_action actions = 4;
-};
-
-/* Group setup and teardown (controller -> datapath). */
-message ofp_group_mod {
- //ofp_header header;
- ofp_group_mod_command command = 1; /* One of OFPGC_*. */
- ofp_group_type type = 2; /* One of OFPGT_*. */
- uint32 group_id = 3; /* Group identifier. */
- repeated ofp_bucket buckets = 4;
-};
-
-/* Group types. Values in the range [128; 255] are reserved for experimental
- * use. */
-enum ofp_group_type {
- OFPGT_ALL = 0; /* All (multicast/broadcast) group. */
- OFPGT_SELECT = 1; /* Select group. */
- OFPGT_INDIRECT = 2; /* Indirect group. */
- OFPGT_FF = 3; /* Fast failover group. */
-};
-
-/* Special buffer-id to indicate 'no buffer' */
-//#define OFP_NO_BUFFER 0xffffffff
-
-/* Send packet (controller -> datapath). */
-message ofp_packet_out {
- //ofp_header header;
- uint32 buffer_id = 1; /* ID assigned by datapath (OFP_NO_BUFFER
- if none). */
- uint32 in_port = 2; /* Packet's input port or OFPP_CONTROLLER.*/
- repeated ofp_action actions = 3; /* Action list - 0 or more. */
- /* The variable size action list is optionally followed by packet data.
- * This data is only present and meaningful if buffer_id == -1. */
- bytes data = 4; /* Packet data. */
-};
-
-/* Why is this packet being sent to the controller? */
-enum ofp_packet_in_reason {
- OFPR_NO_MATCH = 0; /* No matching flow (table-miss flow entry). */
- OFPR_ACTION = 1; /* Action explicitly output to controller. */
- OFPR_INVALID_TTL = 2; /* Packet has invalid TTL */
-};
-
-/* Packet received on port (datapath -> controller). */
-message ofp_packet_in {
- //ofp_header header;
- uint32 buffer_id = 1; /* ID assigned by datapath. */
- ofp_packet_in_reason reason = 2; /* Reason packet is being sent */
- uint32 table_id = 3; /* ID of the table that was looked up */
- uint64 cookie = 4; /* Cookie of the flow entry that was looked up. */
- ofp_match match = 5; /* Packet metadata. Variable size. */
- bytes data = 6; /* Ethernet frame */
-};
-
-/* Why was this flow removed? */
-enum ofp_flow_removed_reason {
- OFPRR_IDLE_TIMEOUT = 0; /* Flow idle time exceeded idle_timeout. */
- OFPRR_HARD_TIMEOUT = 1; /* Time exceeded hard_timeout. */
- OFPRR_DELETE = 2; /* Evicted by a DELETE flow mod. */
- OFPRR_GROUP_DELETE = 3; /* Group was removed. */
- OFPRR_METER_DELETE = 4; /* Meter was removed */
-};
-
-/* Flow removed (datapath -> controller). */
-message ofp_flow_removed {
- //ofp_header header;
- uint64 cookie = 1; /* Opaque controller-issued identifier. */
-
- uint32 priority = 2; /* Priority level of flow entry. */
- ofp_flow_removed_reason reason = 3; /* One of OFPRR_*. */
- uint32 table_id = 4; /* ID of the table */
-
- uint32 duration_sec = 5; /* Time flow was alive in seconds. */
- uint32 duration_nsec = 6; /* Time flow was alive in nanoseconds beyond
- duration_sec. */
- uint32 idle_timeout = 7; /* Idle timeout from original flow mod. */
- uint32 hard_timeout = 8; /* Hard timeout from original flow mod. */
- uint64 packet_count = 9;
- uint64 byte_count = 10;
- ofp_match match = 121; /* Description of fields. Variable size. */
-};
-
-/* Meter numbering. Flow meters can use any number up to OFPM_MAX. */
-enum ofp_meter {
- OFPM_ZERO = 0;
- /* Last usable meter. */
- OFPM_MAX = 0x7fff0000;
-
- /* Virtual meters. */
- OFPM_SLOWPATH = 0x7ffffffd; /* Meter for slow datapath. */
- OFPM_CONTROLLER = 0x7ffffffe; /* Meter for controller connection. */
- OFPM_ALL = 0x7fffffff; /* Represents all meters for stat requests
- commands. */
-};
-
-/* Meter band types */
-enum ofp_meter_band_type {
- OFPMBT_INVALID = 0;
- OFPMBT_DROP = 1; /* Drop packet. */
- OFPMBT_DSCP_REMARK = 2; /* Remark DSCP in the IP header. */
- OFPMBT_EXPERIMENTER = 0xFFFF; /* Experimenter meter band. */
-};
-
-/* Common header for all meter bands */
-message ofp_meter_band_header {
- ofp_meter_band_type type = 1; /* One of OFPMBT_*. */
- uint32 rate = 2; /* Rate for this band. */
- uint32 burst_size = 3;/* Size of bursts. */
- oneof data {
- ofp_meter_band_drop drop = 4;
- ofp_meter_band_dscp_remark dscp_remark = 5;
- ofp_meter_band_experimenter experimenter = 6;
- }
-};
-
-/* OFPMBT_DROP band - drop packets */
-message ofp_meter_band_drop {
- //Empty payload
-};
-
-/* OFPMBT_DSCP_REMARK band - Remark DSCP in the IP header */
-message ofp_meter_band_dscp_remark {
- uint32 prec_level = 1; /* Number of drop precedence level to add. */
-};
-
-/* OFPMBT_EXPERIMENTER band - Experimenter type.
- * The rest of the band is experimenter-defined. */
-message ofp_meter_band_experimenter {
- uint32 experimenter = 1;/* Experimenter ID which takes the
- same form as in struct
- ofp_experimenter_header. */
-};
-
-/* Meter commands */
-enum ofp_meter_mod_command {
- OFPMC_ADD = 0; /* New meter. */
- OFPMC_MODIFY = 1; /* Modify specified meter. */
- OFPMC_DELETE = 2; /* Delete specified meter. */
-};
-
-/* Meter configuration flags */
-enum ofp_meter_flags {
- OFPMF_INVALID = 0;
- OFPMF_KBPS = 1; /* Rate value in kb/s (kilo-bit per second). */
- OFPMF_PKTPS = 2; /* Rate value in packet/sec. */
- OFPMF_BURST = 4; /* Do burst size. */
- OFPMF_STATS = 8; /* Collect statistics. */
-};
-
-/* Meter configuration. OFPT_METER_MOD. */
-message ofp_meter_mod {
- ofp_meter_mod_command command = 1; /* One of OFPMC_*. */
- uint32 flags = 2; /* Bitmap of OFPMF_* flags. */
- uint32 meter_id = 3; /* Meter instance. */
- repeated ofp_meter_band_header bands = 4; /* The band list length is
- inferred from the length field
- in the header. */
-};
-
-/* Values for 'type' in ofp_error_message. These values are immutable: they
- * will not change in future versions of the protocol (although new values may
- * be added). */
-enum ofp_error_type {
- OFPET_HELLO_FAILED = 0; /* Hello protocol failed. */
- OFPET_BAD_REQUEST = 1; /* Request was not understood. */
- OFPET_BAD_ACTION = 2; /* Error in action description. */
- OFPET_BAD_INSTRUCTION = 3; /* Error in instruction list. */
- OFPET_BAD_MATCH = 4; /* Error in match. */
- OFPET_FLOW_MOD_FAILED = 5; /* Problem modifying flow entry. */
- OFPET_GROUP_MOD_FAILED = 6; /* Problem modifying group entry. */
- OFPET_PORT_MOD_FAILED = 7; /* Port mod request failed. */
- OFPET_TABLE_MOD_FAILED = 8; /* Table mod request failed. */
- OFPET_QUEUE_OP_FAILED = 9; /* Queue operation failed. */
- OFPET_SWITCH_CONFIG_FAILED = 10; /* Switch config request failed. */
- OFPET_ROLE_REQUEST_FAILED = 11; /* Controller Role request failed. */
- OFPET_METER_MOD_FAILED = 12; /* Error in meter. */
- OFPET_TABLE_FEATURES_FAILED = 13; /* Setting table features failed. */
- OFPET_EXPERIMENTER = 0xffff; /* Experimenter error messages. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_HELLO_FAILED. 'data' contains an
- * ASCII text string that may give failure details. */
-enum ofp_hello_failed_code {
- OFPHFC_INCOMPATIBLE = 0; /* No compatible version. */
- OFPHFC_EPERM = 1; /* Permissions error. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_BAD_REQUEST. 'data' contains at least
- * the first 64 bytes of the failed request. */
-enum ofp_bad_request_code {
- OFPBRC_BAD_VERSION = 0; /* ofp_header.version not supported. */
- OFPBRC_BAD_TYPE = 1; /* ofp_header.type not supported. */
- OFPBRC_BAD_MULTIPART = 2; /* ofp_multipart_request.type not supported.
- */
- OFPBRC_BAD_EXPERIMENTER = 3; /* Experimenter id not supported
- * (in ofp_experimenter_header or
- * ofp_multipart_request or
- * ofp_multipart_reply). */
- OFPBRC_BAD_EXP_TYPE = 4; /* Experimenter type not supported. */
- OFPBRC_EPERM = 5; /* Permissions error. */
- OFPBRC_BAD_LEN = 6; /* Wrong request length for type. */
- OFPBRC_BUFFER_EMPTY = 7; /* Specified buffer has already been used. */
- OFPBRC_BUFFER_UNKNOWN = 8; /* Specified buffer does not exist. */
- OFPBRC_BAD_TABLE_ID = 9; /* Specified table-id invalid or does not
- * exist. */
- OFPBRC_IS_SLAVE = 10; /* Denied because controller is slave. */
- OFPBRC_BAD_PORT = 11; /* Invalid port. */
- OFPBRC_BAD_PACKET = 12; /* Invalid packet in packet-out. */
- OFPBRC_MULTIPART_BUFFER_OVERFLOW = 13; /* ofp_multipart_request
- overflowed the assigned buffer. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_BAD_ACTION. 'data' contains at least
- * the first 64 bytes of the failed request. */
-enum ofp_bad_action_code {
- OFPBAC_BAD_TYPE = 0; /* Unknown or unsupported action type. */
- OFPBAC_BAD_LEN = 1; /* Length problem in actions. */
- OFPBAC_BAD_EXPERIMENTER = 2; /* Unknown experimenter id specified. */
- OFPBAC_BAD_EXP_TYPE = 3; /* Unknown action for experimenter id. */
- OFPBAC_BAD_OUT_PORT = 4; /* Problem validating output port. */
- OFPBAC_BAD_ARGUMENT = 5; /* Bad action argument. */
- OFPBAC_EPERM = 6; /* Permissions error. */
- OFPBAC_TOO_MANY = 7; /* Can't handle this many actions. */
- OFPBAC_BAD_QUEUE = 8; /* Problem validating output queue. */
- OFPBAC_BAD_OUT_GROUP = 9; /* Invalid group id in forward action. */
- OFPBAC_MATCH_INCONSISTENT = 10; /* Action can't apply for this match,
- or Set-Field missing prerequisite. */
- OFPBAC_UNSUPPORTED_ORDER = 11; /* Action order is unsupported for the
- action list in an Apply-Actions instruction */
- OFPBAC_BAD_TAG = 12; /* Actions uses an unsupported
- tag/encap. */
- OFPBAC_BAD_SET_TYPE = 13; /* Unsupported type in SET_FIELD action. */
- OFPBAC_BAD_SET_LEN = 14; /* Length problem in SET_FIELD action. */
- OFPBAC_BAD_SET_ARGUMENT = 15; /* Bad argument in SET_FIELD action. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_BAD_INSTRUCTION. 'data' contains at
- * least the first 64 bytes of the failed request. */
-enum ofp_bad_instruction_code {
- OFPBIC_UNKNOWN_INST = 0; /* Unknown instruction. */
- OFPBIC_UNSUP_INST = 1; /* Switch or table does not support the
- instruction. */
- OFPBIC_BAD_TABLE_ID = 2; /* Invalid Table-ID specified. */
- OFPBIC_UNSUP_METADATA = 3; /* Metadata value unsupported by datapath. */
- OFPBIC_UNSUP_METADATA_MASK = 4; /* Metadata mask value unsupported by
- datapath. */
- OFPBIC_BAD_EXPERIMENTER = 5; /* Unknown experimenter id specified. */
- OFPBIC_BAD_EXP_TYPE = 6; /* Unknown instruction for experimenter id. */
- OFPBIC_BAD_LEN = 7; /* Length problem in instructions. */
- OFPBIC_EPERM = 8; /* Permissions error. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_BAD_MATCH. 'data' contains at least
- * the first 64 bytes of the failed request. */
-enum ofp_bad_match_code {
- OFPBMC_BAD_TYPE = 0; /* Unsupported match type specified by the
- match */
- OFPBMC_BAD_LEN = 1; /* Length problem in match. */
- OFPBMC_BAD_TAG = 2; /* Match uses an unsupported tag/encap. */
- OFPBMC_BAD_DL_ADDR_MASK = 3; /* Unsupported datalink addr mask - switch
- does not support arbitrary datalink
- address mask. */
- OFPBMC_BAD_NW_ADDR_MASK = 4; /* Unsupported network addr mask - switch
- does not support arbitrary network
- address mask. */
- OFPBMC_BAD_WILDCARDS = 5; /* Unsupported combination of fields masked
- or omitted in the match. */
- OFPBMC_BAD_FIELD = 6; /* Unsupported field type in the match. */
- OFPBMC_BAD_VALUE = 7; /* Unsupported value in a match field. */
- OFPBMC_BAD_MASK = 8; /* Unsupported mask specified in the match,
- field is not dl-address or nw-address. */
- OFPBMC_BAD_PREREQ = 9; /* A prerequisite was not met. */
- OFPBMC_DUP_FIELD = 10; /* A field type was duplicated. */
- OFPBMC_EPERM = 11; /* Permissions error. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_FLOW_MOD_FAILED. 'data' contains
- * at least the first 64 bytes of the failed request. */
-enum ofp_flow_mod_failed_code {
- OFPFMFC_UNKNOWN = 0; /* Unspecified error. */
- OFPFMFC_TABLE_FULL = 1; /* Flow not added because table was full. */
- OFPFMFC_BAD_TABLE_ID = 2; /* Table does not exist */
- OFPFMFC_OVERLAP = 3; /* Attempted to add overlapping flow with
- CHECK_OVERLAP flag set. */
- OFPFMFC_EPERM = 4; /* Permissions error. */
- OFPFMFC_BAD_TIMEOUT = 5; /* Flow not added because of unsupported
- idle/hard timeout. */
- OFPFMFC_BAD_COMMAND = 6; /* Unsupported or unknown command. */
- OFPFMFC_BAD_FLAGS = 7; /* Unsupported or unknown flags. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_GROUP_MOD_FAILED. 'data' contains
- * at least the first 64 bytes of the failed request. */
-enum ofp_group_mod_failed_code {
- OFPGMFC_GROUP_EXISTS = 0; /* Group not added because a group ADD
- attempted to replace an
- already-present group. */
- OFPGMFC_INVALID_GROUP = 1; /* Group not added because Group
- specified is invalid. */
- OFPGMFC_WEIGHT_UNSUPPORTED = 2; /* Switch does not support unequal load
- sharing with select groups. */
- OFPGMFC_OUT_OF_GROUPS = 3; /* The group table is full. */
- OFPGMFC_OUT_OF_BUCKETS = 4; /* The maximum number of action buckets
- for a group has been exceeded. */
- OFPGMFC_CHAINING_UNSUPPORTED = 5; /* Switch does not support groups that
- forward to groups. */
- OFPGMFC_WATCH_UNSUPPORTED = 6; /* This group cannot watch the
- watch_port or watch_group specified.
- */
- OFPGMFC_LOOP = 7; /* Group entry would cause a loop. */
- OFPGMFC_UNKNOWN_GROUP = 8; /* Group not modified because a group
- MODIFY attempted to modify a
- non-existent group. */
- OFPGMFC_CHAINED_GROUP = 9; /* Group not deleted because another
- group is forwarding to it. */
- OFPGMFC_BAD_TYPE = 10; /* Unsupported or unknown group type. */
- OFPGMFC_BAD_COMMAND = 11; /* Unsupported or unknown command. */
- OFPGMFC_BAD_BUCKET = 12; /* Error in bucket. */
- OFPGMFC_BAD_WATCH = 13; /* Error in watch port/group. */
- OFPGMFC_EPERM = 14; /* Permissions error. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_PORT_MOD_FAILED. 'data' contains
- * at least the first 64 bytes of the failed request. */
-enum ofp_port_mod_failed_code {
- OFPPMFC_BAD_PORT = 0; /* Specified port number does not exist. */
- OFPPMFC_BAD_HW_ADDR = 1; /* Specified hardware address does not
- * match the port number. */
- OFPPMFC_BAD_CONFIG = 2; /* Specified config is invalid. */
- OFPPMFC_BAD_ADVERTISE = 3; /* Specified advertise is invalid. */
- OFPPMFC_EPERM = 4; /* Permissions error. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_TABLE_MOD_FAILED. 'data' contains
- * at least the first 64 bytes of the failed request. */
-enum ofp_table_mod_failed_code {
- OFPTMFC_BAD_TABLE = 0; /* Specified table does not exist. */
- OFPTMFC_BAD_CONFIG = 1; /* Specified config is invalid. */
- OFPTMFC_EPERM = 2; /* Permissions error. */
-};
-
-/* ofp_error msg 'code' values for OFPET_QUEUE_OP_FAILED. 'data' contains
- * at least the first 64 bytes of the failed request */
-enum ofp_queue_op_failed_code {
- OFPQOFC_BAD_PORT = 0; /* Invalid port (or port does not exist). */
- OFPQOFC_BAD_QUEUE = 1; /* Queue does not exist. */
- OFPQOFC_EPERM = 2; /* Permissions error. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_SWITCH_CONFIG_FAILED. 'data' contains
- * at least the first 64 bytes of the failed request. */
-enum ofp_switch_config_failed_code {
- OFPSCFC_BAD_FLAGS = 0; /* Specified flags is invalid. */
- OFPSCFC_BAD_LEN = 1; /* Specified len is invalid. */
- OFPSCFC_EPERM = 2; /* Permissions error. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_ROLE_REQUEST_FAILED. 'data' contains
- * at least the first 64 bytes of the failed request. */
-enum ofp_role_request_failed_code {
- OFPRRFC_STALE = 0; /* Stale Message: old generation_id. */
- OFPRRFC_UNSUP = 1; /* Controller role change unsupported. */
- OFPRRFC_BAD_ROLE = 2; /* Invalid role. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_METER_MOD_FAILED. 'data' contains
- * at least the first 64 bytes of the failed request. */
-enum ofp_meter_mod_failed_code {
- OFPMMFC_UNKNOWN = 0; /* Unspecified error. */
- OFPMMFC_METER_EXISTS = 1; /* Meter not added because a Meter ADD
- * attempted to replace an existing Meter. */
- OFPMMFC_INVALID_METER = 2; /* Meter not added because Meter specified
- * is invalid,
- * or invalid meter in meter action. */
- OFPMMFC_UNKNOWN_METER = 3; /* Meter not modified because a Meter MODIFY
- * attempted to modify a non-existent Meter,
- * or bad meter in meter action. */
- OFPMMFC_BAD_COMMAND = 4; /* Unsupported or unknown command. */
- OFPMMFC_BAD_FLAGS = 5; /* Flag configuration unsupported. */
- OFPMMFC_BAD_RATE = 6; /* Rate unsupported. */
- OFPMMFC_BAD_BURST = 7; /* Burst size unsupported. */
- OFPMMFC_BAD_BAND = 8; /* Band unsupported. */
- OFPMMFC_BAD_BAND_VALUE = 9; /* Band value unsupported. */
- OFPMMFC_OUT_OF_METERS = 10; /* No more meters available. */
- OFPMMFC_OUT_OF_BANDS = 11; /* The maximum number of properties
- * for a meter has been exceeded. */
-};
-
-/* ofp_error_msg 'code' values for OFPET_TABLE_FEATURES_FAILED. 'data' contains
- * at least the first 64 bytes of the failed request. */
-enum ofp_table_features_failed_code {
- OFPTFFC_BAD_TABLE = 0; /* Specified table does not exist. */
- OFPTFFC_BAD_METADATA = 1; /* Invalid metadata mask. */
- OFPTFFC_BAD_TYPE = 2; /* Unknown property type. */
- OFPTFFC_BAD_LEN = 3; /* Length problem in properties. */
- OFPTFFC_BAD_ARGUMENT = 4; /* Unsupported property value. */
- OFPTFFC_EPERM = 5; /* Permissions error. */
-};
-
-/* OFPT_ERROR: Error message (datapath -> controller). */
-message ofp_error_msg {
- //ofp_header header;
- uint32 type = 1;
- uint32 code = 2;
- bytes data = 3; /* Variable-length data. Interpreted based
- on the type and code. No padding. */
-};
-
-/* OFPET_EXPERIMENTER: Error message (datapath -> controller). */
-message ofp_error_experimenter_msg {
- //ofp_header header;
-
- uint32 type = 1; /* OFPET_EXPERIMENTER. */
- uint32 exp_type = 2; /* Experimenter defined. */
- uint32 experimenter = 3; /* Experimenter ID which takes the same form
- as in struct ofp_experimenter_header. */
- bytes data = 4; /* Variable-length data. Interpreted based
- on the type and code. No padding. */
-};
-
-enum ofp_multipart_type {
- /* Description of this OpenFlow switch.
- * The request body is empty.
- * The reply body is struct ofp_desc. */
- OFPMP_DESC = 0;
-
- /* Individual flow statistics.
- * The request body is struct ofp_flow_stats_request.
- * The reply body is an array of struct ofp_flow_stats. */
- OFPMP_FLOW = 1;
-
- /* Aggregate flow statistics.
- * The request body is struct ofp_aggregate_stats_request.
- * The reply body is struct ofp_aggregate_stats_reply. */
- OFPMP_AGGREGATE = 2;
-
- /* Flow table statistics.
- * The request body is empty.
- * The reply body is an array of struct ofp_table_stats. */
- OFPMP_TABLE = 3;
-
- /* Port statistics.
- * The request body is struct ofp_port_stats_request.
- * The reply body is an array of struct ofp_port_stats. */
- OFPMP_PORT_STATS = 4;
-
- /* Queue statistics for a port
- * The request body is struct ofp_queue_stats_request.
- * The reply body is an array of struct ofp_queue_stats */
- OFPMP_QUEUE = 5;
-
- /* Group counter statistics.
- * The request body is struct ofp_group_stats_request.
- * The reply is an array of struct ofp_group_stats. */
- OFPMP_GROUP = 6;
-
- /* Group description.
- * The request body is empty.
- * The reply body is an array of struct ofp_group_desc. */
- OFPMP_GROUP_DESC = 7;
-
- /* Group features.
- * The request body is empty.
- * The reply body is struct ofp_group_features. */
- OFPMP_GROUP_FEATURES = 8;
-
- /* Meter statistics.
- * The request body is struct ofp_meter_multipart_requests.
- * The reply body is an array of struct ofp_meter_stats. */
- OFPMP_METER = 9;
-
- /* Meter configuration.
- * The request body is struct ofp_meter_multipart_requests.
- * The reply body is an array of struct ofp_meter_config. */
- OFPMP_METER_CONFIG = 10;
-
- /* Meter features.
- * The request body is empty.
- * The reply body is struct ofp_meter_features. */
- OFPMP_METER_FEATURES = 11;
-
- /* Table features.
- * The request body is either empty or contains an array of
- * struct ofp_table_features containing the controller's
- * desired view of the switch. If the switch is unable to
- * set the specified view an error is returned.
- * The reply body is an array of struct ofp_table_features. */
- OFPMP_TABLE_FEATURES = 12;
-
- /* Port description.
- * The request body is empty.
- * The reply body is an array of struct ofp_port. */
- OFPMP_PORT_DESC = 13;
-
- /* Experimenter extension.
- * The request and reply bodies begin with
- * struct ofp_experimenter_multipart_header.
- * The request and reply bodies are otherwise experimenter-defined. */
- OFPMP_EXPERIMENTER = 0xffff;
-};
-
-/* Backward compatibility with 1.3.1 - avoid breaking the API. */
-//#define ofp_multipart_types ofp_multipart_type
-
-enum ofp_multipart_request_flags {
- OFPMPF_REQ_INVALID = 0;
- OFPMPF_REQ_MORE = 1; /* More requests to follow. */
-};
-
-message ofp_multipart_request {
- //ofp_header header;
- ofp_multipart_type type = 1; /* One of the OFPMP_* constants. */
- uint32 flags = 2; /* OFPMPF_REQ_* flags. */
- bytes body = 3; /* Body of the request. 0 or more bytes. */
-};
-
-enum ofp_multipart_reply_flags {
- OFPMPF_REPLY_INVALID = 0;
- OFPMPF_REPLY_MORE = 1; /* More replies to follow. */
-};
-
-message ofp_multipart_reply {
- //ofp_header header;
- ofp_multipart_type type = 1; /* One of the OFPMP_* constants. */
- uint32 flags = 2; /* OFPMPF_REPLY_* flags. */
- bytes body = 3; /* Body of the reply. 0 or more bytes. */
-};
-
-//#define DESC_STR_LEN 256
-//#define SERIAL_NUM_LEN 32
-/* Body of reply to OFPMP_DESC request. Each entry is a NULL-terminated
- * ASCII string. */
-message ofp_desc {
- string mfr_desc = 1; /* Manufacturer description. */
- string hw_desc = 2; /* Hardware description. */
- string sw_desc = 3; /* Software description. */
- string serial_num = 4; /* Serial number. */
- string dp_desc = 5; /* Human readable description of datapath. */
-};
-
-/* Body for ofp_multipart_request of type OFPMP_FLOW. */
-message ofp_flow_stats_request {
- uint32 table_id = 1; /* ID of table to read (from ofp_table_stats),
- OFPTT_ALL for all tables. */
- uint32 out_port = 2; /* Require matching entries to include this
- as an output port. A value of OFPP_ANY
- indicates no restriction. */
- uint32 out_group = 3; /* Require matching entries to include this
- as an output group. A value of OFPG_ANY
- indicates no restriction. */
- uint64 cookie = 4; /* Require matching entries to contain this
- cookie value */
- uint64 cookie_mask = 5; /* Mask used to restrict the cookie bits that
- must match. A value of 0 indicates
- no restriction. */
- ofp_match match = 6; /* Fields to match. Variable size. */
-};
-
-/* Body of reply to OFPMP_FLOW request. */
-message ofp_flow_stats {
- uint64 id = 14; /* Unique ID of flow within device. */
- uint32 table_id = 1; /* ID of table flow came from. */
- uint32 duration_sec = 2; /* Time flow has been alive in seconds. */
- uint32 duration_nsec = 3; /* Time flow has been alive in nanoseconds
- beyond duration_sec. */
- uint32 priority = 4; /* Priority of the entry. */
- uint32 idle_timeout = 5; /* Number of seconds idle before expiration. */
- uint32 hard_timeout = 6; /* Number of seconds before expiration. */
- uint32 flags = 7; /* Bitmap of OFPFF_* flags. */
- uint64 cookie = 8; /* Opaque controller-issued identifier. */
- uint64 packet_count = 9; /* Number of packets in flow. */
- uint64 byte_count = 10; /* Number of bytes in flow. */
- ofp_match match = 12; /* Description of fields. Variable size. */
- repeated ofp_instruction instructions = 13; /* Instruction set
- (0 or more) */
-};
-
-/* Body for ofp_multipart_request of type OFPMP_AGGREGATE. */
-message ofp_aggregate_stats_request {
- uint32 table_id = 1; /* ID of table to read (from ofp_table_stats)
- OFPTT_ALL for all tables. */
- uint32 out_port = 2; /* Require matching entries to include this
- as an output port. A value of OFPP_ANY
- indicates no restriction. */
- uint32 out_group = 3; /* Require matching entries to include this
- as an output group. A value of OFPG_ANY
- indicates no restriction. */
- uint64 cookie = 4; /* Require matching entries to contain this
- cookie value */
- uint64 cookie_mask = 5; /* Mask used to restrict the cookie bits that
- must match. A value of 0 indicates
- no restriction. */
- ofp_match match = 6; /* Fields to match. Variable size. */
-};
-
-/* Body of reply to OFPMP_AGGREGATE request. */
-message ofp_aggregate_stats_reply {
- uint64 packet_count = 1; /* Number of packets in flows. */
- uint64 byte_count = 2; /* Number of bytes in flows. */
- uint32 flow_count = 3; /* Number of flows. */
-};
-
-/* Table Feature property types.
- * Low order bit cleared indicates a property for a regular Flow Entry.
- * Low order bit set indicates a property for the Table-Miss Flow Entry.
- */
-enum ofp_table_feature_prop_type {
- OFPTFPT_INSTRUCTIONS = 0; /* Instructions property. */
- OFPTFPT_INSTRUCTIONS_MISS = 1; /* Instructions for table-miss. */
- OFPTFPT_NEXT_TABLES = 2; /* Next Table property. */
- OFPTFPT_NEXT_TABLES_MISS = 3; /* Next Table for table-miss. */
- OFPTFPT_WRITE_ACTIONS = 4; /* Write Actions property. */
- OFPTFPT_WRITE_ACTIONS_MISS = 5; /* Write Actions for table-miss. */
- OFPTFPT_APPLY_ACTIONS = 6; /* Apply Actions property. */
- OFPTFPT_APPLY_ACTIONS_MISS = 7; /* Apply Actions for table-miss. */
- OFPTFPT_MATCH = 8; /* Match property. */
- OFPTFPT_WILDCARDS = 10; /* Wildcards property. */
- OFPTFPT_WRITE_SETFIELD = 12; /* Write Set-Field property. */
- OFPTFPT_WRITE_SETFIELD_MISS = 13; /* Write Set-Field for table-miss. */
- OFPTFPT_APPLY_SETFIELD = 14; /* Apply Set-Field property. */
- OFPTFPT_APPLY_SETFIELD_MISS = 15; /* Apply Set-Field for table-miss. */
- OFPTFPT_EXPERIMENTER = 0xFFFE; /* Experimenter property. */
- OFPTFPT_EXPERIMENTER_MISS = 0xFFFF; /* Experimenter for table-miss. */
-};
-
-/* Common header for all Table Feature Properties */
-message ofp_table_feature_property {
- ofp_table_feature_prop_type type = 1; /* One of OFPTFPT_*. */
- oneof value {
- ofp_table_feature_prop_instructions instructions = 2;
- ofp_table_feature_prop_next_tables next_tables = 3;
- ofp_table_feature_prop_actions actions = 4;
- ofp_table_feature_prop_oxm oxm = 5;
- ofp_table_feature_prop_experimenter experimenter = 6;
- }
-};
-
-/* Instructions property */
-message ofp_table_feature_prop_instructions {
- /* One of OFPTFPT_INSTRUCTIONS,
- OFPTFPT_INSTRUCTIONS_MISS. */
- repeated ofp_instruction instructions = 1; /* List of instructions */
-};
-
-/* Next Tables property */
-message ofp_table_feature_prop_next_tables {
- /* One of OFPTFPT_NEXT_TABLES,
- OFPTFPT_NEXT_TABLES_MISS. */
- repeated uint32 next_table_ids = 1; /* List of table ids. */
-};
-
-/* Actions property */
-message ofp_table_feature_prop_actions {
- /* One of OFPTFPT_WRITE_ACTIONS,
- OFPTFPT_WRITE_ACTIONS_MISS,
- OFPTFPT_APPLY_ACTIONS,
- OFPTFPT_APPLY_ACTIONS_MISS. */
- repeated ofp_action actions = 1; /* List of actions */
-};
-
-/* Match, Wildcard or Set-Field property */
-message ofp_table_feature_prop_oxm {
- /* One of OFPTFPT_MATCH,
- OFPTFPT_WILDCARDS,
- OFPTFPT_WRITE_SETFIELD,
- OFPTFPT_WRITE_SETFIELD_MISS,
- OFPTFPT_APPLY_SETFIELD,
- OFPTFPT_APPLY_SETFIELD_MISS. */
- /* TODO is this a uint32??? */
- repeated uint32 oxm_ids = 3; /* Array of OXM headers */
-};
-
-/* Experimenter table feature property */
-message ofp_table_feature_prop_experimenter {
- /* One of OFPTFPT_EXPERIMENTER,
- OFPTFPT_EXPERIMENTER_MISS. */
- uint32 experimenter = 2; /* Experimenter ID which takes the same
- form as in struct
- ofp_experimenter_header. */
- uint32 exp_type = 3; /* Experimenter defined. */
- repeated uint32 experimenter_data = 4;
-};
-
-/* Body for ofp_multipart_request of type OFPMP_TABLE_FEATURES./
- * Body of reply to OFPMP_TABLE_FEATURES request. */
-message ofp_table_features {
- uint32 table_id = 1; /* Identifier of table. Lower numbered tables
- are consulted first. */
- string name = 2;
- uint64 metadata_match = 3; /* Bits of metadata table can match. */
- uint64 metadata_write = 4; /* Bits of metadata table can write. */
- uint32 config = 5; /* Bitmap of OFPTC_* values */
- uint32 max_entries = 6; /* Max number of entries supported. */
-
- /* Table Feature Property list */
- repeated ofp_table_feature_property properties = 7;
-};
-
-/* Body of reply to OFPMP_TABLE request. */
-message ofp_table_stats {
- uint32 table_id = 1; /* Identifier of table. Lower numbered tables
- are consulted first. */
- uint32 active_count = 2; /* Number of active entries. */
- uint64 lookup_count = 3; /* Number of packets looked up in table. */
- uint64 matched_count = 4; /* Number of packets that hit table. */
-};
-
-/* Body for ofp_multipart_request of type OFPMP_PORT. */
-message ofp_port_stats_request {
- uint32 port_no = 1; /* OFPMP_PORT message must request statistics
- * either for a single port (specified in
- * port_no) or for all ports (if port_no ==
- * OFPP_ANY). */
-};
-
-/* Body of reply to OFPMP_PORT request. If a counter is unsupported, set
- * the field to all ones. */
-message ofp_port_stats {
- uint32 port_no = 1;
- uint64 rx_packets = 2; /* Number of received packets. */
- uint64 tx_packets = 3; /* Number of transmitted packets. */
- uint64 rx_bytes = 4; /* Number of received bytes. */
- uint64 tx_bytes = 5; /* Number of transmitted bytes. */
- uint64 rx_dropped = 6; /* Number of packets dropped by RX. */
- uint64 tx_dropped = 7; /* Number of packets dropped by TX. */
- uint64 rx_errors = 8; /* Number of receive errors. This is a super-set
- of more specific receive errors and should be
- greater than or equal to the sum of all
- rx_*_err values. */
- uint64 tx_errors = 9; /* Number of transmit errors. This is a super-set
- of more specific transmit errors and should be
- greater than or equal to the sum of all
- tx_*_err values (none currently defined.) */
- uint64 rx_frame_err = 10; /* Number of frame alignment errors. */
- uint64 rx_over_err = 11; /* Number of packets with RX overrun. */
- uint64 rx_crc_err = 12; /* Number of CRC errors. */
- uint64 collisions = 13; /* Number of collisions. */
- uint32 duration_sec = 14; /* Time port has been alive in seconds. */
- uint32 duration_nsec = 15; /* Time port has been alive in nanoseconds
- beyond duration_sec. */
-};
-
-/* Body of OFPMP_GROUP request. */
-message ofp_group_stats_request {
- uint32 group_id = 1; /* All groups if OFPG_ALL. */
-};
-
-/* Used in group stats replies. */
-message ofp_bucket_counter {
- uint64 packet_count = 1; /* Number of packets processed by bucket. */
- uint64 byte_count = 2; /* Number of bytes processed by bucket. */
-};
-
-/* Body of reply to OFPMP_GROUP request. */
-message ofp_group_stats {
- uint32 group_id = 1; /* Group identifier. */
- uint32 ref_count = 2; /* Number of flows or groups that directly
- forward to this group. */
- uint64 packet_count = 3; /* Number of packets processed by group. */
- uint64 byte_count = 4; /* Number of bytes processed by group. */
- uint32 duration_sec = 5; /* Time group has been alive in seconds. */
- uint32 duration_nsec = 6; /* Time group has been alive in nanoseconds
- beyond duration_sec. */
- repeated ofp_bucket_counter bucket_stats = 7; /* One counter set per
- bucket. */
-};
-
-/* Body of reply to OFPMP_GROUP_DESC request. */
-message ofp_group_desc {
- ofp_group_type type = 1; /* One of OFPGT_*. */
- uint32 group_id = 2; /* Group identifier. */
- repeated ofp_bucket buckets = 3; /* List of buckets - 0 or more. */
-};
-
-message ofp_group_entry {
- ofp_group_desc desc = 1 [(voltha.yang_inline_node).id = 'desc',
- (voltha.yang_inline_node).type = 'openflow_13-ofp_group_desc'];
- ofp_group_stats stats = 2;
-};
-
-/* Backward compatibility with 1.3.1 - avoid breaking the API. */
-//#define ofp_group_desc_stats ofp_group_desc
-
-/* Group configuration flags */
-enum ofp_group_capabilities {
- OFPGFC_INVALID = 0;
- OFPGFC_SELECT_WEIGHT = 1; /* Support weight for select groups */
- OFPGFC_SELECT_LIVENESS = 2; /* Support liveness for select groups */
- OFPGFC_CHAINING = 4; /* Support chaining groups */
- OFPGFC_CHAINING_CHECKS = 8; /* Check chaining for loops and delete */
-};
-
-/* Body of reply to OFPMP_GROUP_FEATURES request. Group features. */
-message ofp_group_features {
- uint32 types = 1; /* Bitmap of (1 << OFPGT_*) values supported. */
- uint32 capabilities = 2; /* Bitmap of OFPGFC_* capability supported. */
- repeated uint32 max_groups = 3; /* Maximum number of groups for each type.
- */
- repeated uint32 actions = 4; /* Bitmaps of (1 << OFPAT_*) values
- supported. */
-};
-
-/* Body of OFPMP_METER and OFPMP_METER_CONFIG requests. */
-message ofp_meter_multipart_request {
- uint32 meter_id = 1; /* Meter instance, or OFPM_ALL. */
-};
-
-/* Statistics for each meter band */
-message ofp_meter_band_stats {
- uint64 packet_band_count = 1; /* Number of packets in band. */
- uint64 byte_band_count = 2; /* Number of bytes in band. */
-};
-
-/* Body of reply to OFPMP_METER request. Meter statistics. */
-message ofp_meter_stats {
- uint32 meter_id = 1; /* Meter instance. */
- uint32 flow_count = 2; /* Number of flows bound to meter. */
- uint64 packet_in_count = 3; /* Number of packets in input. */
- uint64 byte_in_count = 4; /* Number of bytes in input. */
- uint32 duration_sec = 5; /* Time meter has been alive in seconds. */
- uint32 duration_nsec = 6;/* Time meter has been alive in nanoseconds
- beyond duration_sec. */
- repeated ofp_meter_band_stats band_stats = 7; /* The band_stats length is
- inferred from the length field. */
-};
-
-/* Body of reply to OFPMP_METER_CONFIG request. Meter configuration. */
-message ofp_meter_config {
- uint32 flags = 1; /* All OFPMF_* that apply. */
- uint32 meter_id = 2; /* Meter instance. */
- repeated ofp_meter_band_header bands = 3; /* The bands length is
- inferred from the length field. */
-};
-
-/* Body of reply to OFPMP_METER_FEATURES request. Meter features. */
-message ofp_meter_features {
- uint32 max_meter = 1; /* Maximum number of meters. */
- uint32 band_types = 2; /* Bitmaps of (1 << OFPMBT_*) values supported.
- */
- uint32 capabilities = 3; /* Bitmaps of "ofp_meter_flags". */
- uint32 max_bands = 4; /* Maximum bands per meters */
- uint32 max_color = 5; /* Maximum color value */
-};
-
-/* Body for ofp_multipart_request/reply of type OFPMP_EXPERIMENTER. */
-message ofp_experimenter_multipart_header {
- uint32 experimenter = 1; /* Experimenter ID which takes the same form
- as in struct ofp_experimenter_header. */
- uint32 exp_type = 2; /* Experimenter defined. */
- bytes data = 3; /* Experimenter-defined arbitrary additional data. */
-};
-
-/* Experimenter extension. */
-message ofp_experimenter_header {
- //ofp_header header; /* Type OFPT_EXPERIMENTER. */
- uint32 experimenter = 1; /* Experimenter ID:
- * - MSB 0: low-order bytes are IEEE OUI.
- * - MSB != 0: defined by ONF. */
- uint32 exp_type = 2; /* Experimenter defined. */
- bytes data = 3; /* Experimenter-defined arbitrary additional data. */
-};
-
-/* All ones is used to indicate all queues in a port (for stats retrieval). */
-//#define OFPQ_ALL 0xffffffff
-
-/* Min rate > 1000 means not configured. */
-//#define OFPQ_MIN_RATE_UNCFG 0xffff
-
-/* Max rate > 1000 means not configured. */
-//#define OFPQ_MAX_RATE_UNCFG 0xffff
-
-enum ofp_queue_properties {
- OFPQT_INVALID = 0;
- OFPQT_MIN_RATE = 1; /* Minimum datarate guaranteed. */
- OFPQT_MAX_RATE = 2; /* Maximum datarate. */
- OFPQT_EXPERIMENTER = 0xffff; /* Experimenter defined property. */
-};
-
-/* Common description for a queue. */
-message ofp_queue_prop_header {
- uint32 property = 1; /* One of OFPQT_. */
- uint32 len = 2; /* Length of property, including this header. */
-};
-
-/* Min-Rate queue property description. */
-message ofp_queue_prop_min_rate {
- ofp_queue_prop_header prop_header = 1;/* prop: OFPQT_MIN, len: 16. */
- uint32 rate = 2; /* In 1/10 of a percent = 0;>1000 -> disabled. */
-};
-
-/* Max-Rate queue property description. */
-message ofp_queue_prop_max_rate {
- ofp_queue_prop_header prop_header = 1;/* prop: OFPQT_MAX, len: 16. */
- uint32 rate = 2; /* In 1/10 of a percent = 0;>1000 -> disabled. */
-};
-
-/* Experimenter queue property description. */
-message ofp_queue_prop_experimenter {
- ofp_queue_prop_header prop_header = 1;/* prop: OFPQT_EXPERIMENTER */
- uint32 experimenter = 2; /* Experimenter ID which takes the same
- form as in struct
- ofp_experimenter_header. */
- bytes data = 3; /* Experimenter defined data. */
-};
-
-/* Full description for a queue. */
-message ofp_packet_queue {
- uint32 queue_id = 1; /* id for the specific queue. */
- uint32 port = 2; /* Port this queue is attached to. */
- repeated ofp_queue_prop_header properties = 4; /* List of properties. */
-};
-
-/* Query for port queue configuration. */
-message ofp_queue_get_config_request {
- //ofp_header header;
- uint32 port = 1; /* Port to be queried. Should refer
- to a valid physical port (i.e. <= OFPP_MAX),
- or OFPP_ANY to request all configured
- queues.*/
-};
-
-/* Queue configuration for a given port. */
-message ofp_queue_get_config_reply {
- //ofp_header header;
- uint32 port = 1;
- repeated ofp_packet_queue queues = 2; /* List of configured queues. */
-};
-
-/* OFPAT_SET_QUEUE action struct: send packets to given queue on port. */
-message ofp_action_set_queue {
- uint32 type = 1; /* OFPAT_SET_QUEUE. */
- uint32 queue_id = 3; /* Queue id for the packets. */
-};
-
-message ofp_queue_stats_request {
- uint32 port_no = 1; /* All ports if OFPP_ANY. */
- uint32 queue_id = 2; /* All queues if OFPQ_ALL. */
-};
-
-message ofp_queue_stats {
- uint32 port_no = 1;
- uint32 queue_id = 2; /* Queue i.d */
- uint64 tx_bytes = 3; /* Number of transmitted bytes. */
- uint64 tx_packets = 4; /* Number of transmitted packets. */
- uint64 tx_errors = 5; /* Number of packets dropped due to overrun. */
- uint32 duration_sec = 6; /* Time queue has been alive in seconds. */
- uint32 duration_nsec = 7; /* Time queue has been alive in nanoseconds
- beyond duration_sec. */
-};
-
-/* Configures the "role" of the sending controller. The default role is:
- *
- * - Equal (OFPCR_ROLE_EQUAL), which allows the controller access to all
- * OpenFlow features. All controllers have equal responsibility.
- *
- * The other possible roles are a related pair:
- *
- * - Master (OFPCR_ROLE_MASTER) is equivalent to Equal, except that there
- * may be at most one Master controller at a time: when a controller
- * configures itself as Master, any existing Master is demoted to the
- * Slave role.
- *
- * - Slave (OFPCR_ROLE_SLAVE) allows the controller read-only access to
- * OpenFlow features. In particular attempts to modify the flow table
- * will be rejected with an OFPBRC_EPERM error.
- *
- * Slave controllers do not receive OFPT_PACKET_IN or OFPT_FLOW_REMOVED
- * messages, but they do receive OFPT_PORT_STATUS messages.
- */
-
-/* Controller roles. */
-enum ofp_controller_role {
- OFPCR_ROLE_NOCHANGE = 0; /* Don't change current role. */
- OFPCR_ROLE_EQUAL = 1; /* Default role, full access. */
- OFPCR_ROLE_MASTER = 2; /* Full access, at most one master. */
- OFPCR_ROLE_SLAVE = 3; /* Read-only access. */
-};
-
-/* Role request and reply message. */
-message ofp_role_request {
- //ofp_header header; /* Type OFPT_ROLE_REQUEST/OFPT_ROLE_REPLY. */
- ofp_controller_role role = 1; /* One of OFPCR_ROLE_*. */
- uint64 generation_id = 2; /* Master Election Generation Id */
-};
-
-/* Asynchronous message configuration. */
-message ofp_async_config {
- //ofp_header header; /* OFPT_GET_ASYNC_REPLY or OFPT_SET_ASYNC. */
- repeated uint32 packet_in_mask = 1; /* Bitmasks of OFPR_* values. */
- repeated uint32 port_status_mask = 2; /* Bitmasks of OFPPR_* values. */
- repeated uint32 flow_removed_mask = 3;/* Bitmasks of OFPRR_* values. */
-};
-
-
-/* ADDITIONAL VOLTHA SPECIFIC MESSAGE TYPES, AIDING RPC CALLS */
-
-message MeterModUpdate {
- string id = 1; // Device.id or LogicalDevice.id
- ofp_meter_mod meter_mod = 2;
-}
-
-message MeterStatsReply {
- repeated ofp_meter_stats meter_stats = 1;
-}
-
-message FlowTableUpdate {
- string id = 1; // Device.id or LogicalDevice.id
- ofp_flow_mod flow_mod = 2;
-}
-
-message FlowGroupTableUpdate {
- string id = 1; // Device.id or LogicalDevice.id
- ofp_group_mod group_mod = 2;
-}
-
-message Flows {
- repeated ofp_flow_stats items = 1;
-}
-
-message Meters {
- repeated ofp_meter_config items = 1;
-}
-
-message FlowGroups {
- repeated ofp_group_entry items = 1;
-}
-
-message FlowChanges {
- Flows to_add = 1;
- Flows to_remove = 2;
-}
-
-message FlowGroupChanges {
- FlowGroups to_add = 1;
- FlowGroups to_remove = 2;
-}
-
-message PacketIn {
- string id = 1; // LogicalDevice.id
- ofp_packet_in packet_in = 2;
-}
-
-message PacketOut {
- string id = 1; // LogicalDevice.id
- ofp_packet_out packet_out = 2;
-}
-
-message ChangeEvent {
- string id = 1; // LogicalDevice.id
- oneof event {
- ofp_port_status port_status = 2;
- }
-}
diff --git a/pyvoltha/protos/openolt.proto b/pyvoltha/protos/openolt.proto
deleted file mode 100644
index ddc8f74..0000000
--- a/pyvoltha/protos/openolt.proto
+++ /dev/null
@@ -1,556 +0,0 @@
-// Copyright (c) 2018 Open Networking Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at:
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-package openolt;
-import "google/api/annotations.proto";
-
-service Openolt {
-
- rpc DisableOlt(Empty) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/Disable"
- body: "*"
- };
- }
-
- rpc ReenableOlt(Empty) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/Reenable"
- body: "*"
- };
- }
-
- rpc ActivateOnu(Onu) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/EnableOnu"
- body: "*"
- };
- }
-
- rpc DeactivateOnu(Onu) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/DisableOnu"
- body: "*"
- };
- }
-
- rpc DeleteOnu(Onu) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/DeleteOnu"
- body: "*"
- };
- }
-
- rpc OmciMsgOut(OmciMsg) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/OmciMsgOut"
- body: "*"
- };
- }
-
- rpc OnuPacketOut(OnuPacket) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/OnuPacketOut"
- body: "*"
- };
- }
-
- rpc UplinkPacketOut(UplinkPacket) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/UplinkPacketOut"
- body: "*"
- };
- }
-
- rpc FlowAdd(Flow) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/FlowAdd"
- body: "*"
- };
- }
-
- rpc FlowRemove(Flow) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/FlowRemove"
- body: "*"
- };
- }
-
- rpc HeartbeatCheck(Empty) returns (Heartbeat) {
- option (google.api.http) = {
- post: "/v1/HeartbeatCheck"
- body: "*"
- };
- }
-
- rpc EnablePonIf(Interface) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/EnablePonIf"
- body: "*"
- };
- }
-
- rpc DisablePonIf(Interface) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/DisablePonIf"
- body: "*"
- };
- }
-
- rpc GetDeviceInfo(Empty) returns (DeviceInfo) {
- option (google.api.http) = {
- post: "/v1/GetDeviceInfo"
- body: "*"
- };
- }
-
- rpc Reboot(Empty) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/Reboot"
- body: "*"
- };
- }
-
- rpc CollectStatistics(Empty) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/CollectStatistics"
- body: "*"
- };
- }
-
- rpc CreateTconts(Tconts) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/CreateTconts"
- body: "*"
- };
- }
-
- rpc RemoveTconts(Tconts) returns (Empty) {
- option (google.api.http) = {
- post: "/v1/RemoveTconts"
- body: "*"
- };
- }
-
- rpc EnableIndication(Empty) returns (stream Indication) {}
-}
-
-message Indication {
- oneof data {
- OltIndication olt_ind = 1;
- IntfIndication intf_ind = 2;
- IntfOperIndication intf_oper_ind = 3;
- OnuDiscIndication onu_disc_ind = 4;
- OnuIndication onu_ind = 5;
- OmciIndication omci_ind = 6;
- PacketIndication pkt_ind = 7;
- PortStatistics port_stats = 8;
- FlowStatistics flow_stats = 9;
- AlarmIndication alarm_ind= 10;
- }
-}
-
-message AlarmIndication {
- oneof data {
- LosIndication los_ind = 1;
- DyingGaspIndication dying_gasp_ind = 2;
- OnuAlarmIndication onu_alarm_ind = 3;
- OnuStartupFailureIndication onu_startup_fail_ind = 4;
- OnuSignalDegradeIndication onu_signal_degrade_ind = 5;
- OnuDriftOfWindowIndication onu_drift_of_window_ind = 6;
- OnuLossOfOmciChannelIndication onu_loss_omci_ind = 7;
- OnuSignalsFailureIndication onu_signals_fail_ind = 8;
- OnuTransmissionInterferenceWarning onu_tiwi_ind = 9;
- OnuActivationFailureIndication onu_activation_fail_ind = 10;
- OnuProcessingErrorIndication onu_processing_error_ind = 11;
- }
-}
-
-message OltIndication {
- string oper_state = 1; // up, down
-}
-
-message IntfIndication {
- fixed32 intf_id = 1;
- string oper_state = 2; // up, down
-}
-
-message OnuDiscIndication {
- fixed32 intf_id = 1;
- SerialNumber serial_number = 2;
-}
-
-message OnuIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string oper_state = 3; // up, down
- string admin_state = 5; // up, down
- SerialNumber serial_number = 4;
-}
-
-message IntfOperIndication {
- string type = 1; // nni, pon
- fixed32 intf_id = 2;
- string oper_state = 3; // up, down
-}
-
-message OmciIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- bytes pkt = 3;
-}
-
-message PacketIndication {
- string intf_type = 5; // nni, pon, unknown
- fixed32 intf_id = 1;
- fixed32 gemport_id = 2;
- fixed32 flow_id = 3;
- fixed32 port_no = 6;
- fixed64 cookie = 7;
- bytes pkt = 4;
-}
-
-message Interface {
- fixed32 intf_id = 1;
-}
-
-message Heartbeat {
- fixed32 heartbeat_signature = 1;
-}
-
-message Onu {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- SerialNumber serial_number = 3;
- fixed32 pir = 4; // peak information rate assigned to onu
-}
-
-message OmciMsg {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- bytes pkt = 3;
-}
-
-message OnuPacket {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- fixed32 port_no = 4;
- bytes pkt = 3;
-}
-
-message UplinkPacket {
- fixed32 intf_id = 1;
- bytes pkt = 2;
-}
-
-message DeviceInfo {
- string vendor = 1;
- string model = 2;
- string hardware_version = 3;
- string firmware_version = 4;
- string device_id = 16;
- string device_serial_number = 17;
-
- // Total number of pon intf ports on the device
- fixed32 pon_ports = 12;
-
- // If using global per-device technology profile. To be deprecated
- string technology = 5;
- fixed32 onu_id_start = 6;
- fixed32 onu_id_end = 7;
- fixed32 alloc_id_start = 8;
- fixed32 alloc_id_end = 9;
- fixed32 gemport_id_start = 10;
- fixed32 gemport_id_end = 11;
- fixed32 flow_id_start = 13;
- fixed32 flow_id_end = 14;
-
- message DeviceResourceRanges {
-
- // List of 0 or more intf_ids that use the same technology and pools.
- // If 0 intf_ids supplied, it implies ALL interfaces
- repeated fixed32 intf_ids = 1;
-
- // Technology profile for this pool
- string technology = 2;
-
- message Pool {
- enum PoolType {
- ONU_ID = 0;
- ALLOC_ID = 1;
- GEMPORT_ID = 2;
- FLOW_ID = 3;
- }
-
- enum SharingType {
- DEDICATED_PER_INTF = 0;
- SHARED_BY_ALL_INTF_ALL_TECH = 1; // Shared across all interfaces in all technologies in all ranges
- SHARED_BY_ALL_INTF_SAME_TECH = 2; // Shared across all interfaces of the same technology used in this range
- }
-
- PoolType type = 1;
- SharingType sharing = 2;
- fixed32 start = 3; // lower bound on IDs allocated from this pool
- fixed32 end = 4; // upper bound on IDs allocated from this pool
- }
- repeated Pool pools = 3;
- }
- repeated DeviceResourceRanges ranges = 15;
-}
-
-message Classifier {
- fixed32 o_tpid = 1;
- fixed32 o_vid = 2;
- fixed32 i_tpid = 3;
- fixed32 i_vid = 4;
- fixed32 o_pbits = 5;
- fixed32 i_pbits = 6;
- fixed32 eth_type = 7;
- bytes dst_mac = 8;
- bytes src_mac = 9;
- fixed32 ip_proto = 10;
- fixed32 dst_ip = 11;
- fixed32 src_ip = 12;
- fixed32 src_port = 13;
- fixed32 dst_port = 14;
- string pkt_tag_type = 15; // untagged, single_tag, double_tag
-}
-
-message ActionCmd {
- bool add_outer_tag = 1;
- bool remove_outer_tag = 2;
- bool trap_to_host = 3;
-}
-
-message Action {
- ActionCmd cmd = 1;
- fixed32 o_vid = 2;
- fixed32 o_pbits = 3;
- fixed32 o_tpid = 4;
- fixed32 i_vid = 5;
- fixed32 i_pbits = 6;
- fixed32 i_tpid = 7;
-}
-
-message Flow {
- sfixed32 access_intf_id = 1;
- sfixed32 onu_id = 2;
- sfixed32 uni_id = 11;
- fixed32 flow_id = 3;
- string flow_type = 4; // upstream, downstream, broadcast, multicast
- sfixed32 alloc_id = 10;
- sfixed32 network_intf_id = 5;
- sfixed32 gemport_id = 6;
- Classifier classifier = 7;
- Action action = 8;
- sfixed32 priority = 9;
- fixed64 cookie = 12; // must be provided for any flow with trap_to_host action. Returned in PacketIndication
- fixed32 port_no = 13; // must be provided for any flow with trap_to_host action. Returned in PacketIndication
-}
-
-message SerialNumber {
- bytes vendor_id = 1;
- bytes vendor_specific = 2;
-}
-
-message PortStatistics {
- fixed32 intf_id = 1;
- fixed64 rx_bytes = 2;
- fixed64 rx_packets = 3;
- fixed64 rx_ucast_packets = 4;
- fixed64 rx_mcast_packets = 5;
- fixed64 rx_bcast_packets = 6;
- fixed64 rx_error_packets = 7;
- fixed64 tx_bytes = 8;
- fixed64 tx_packets = 9;
- fixed64 tx_ucast_packets = 10;
- fixed64 tx_mcast_packets = 11;
- fixed64 tx_bcast_packets = 12;
- fixed64 tx_error_packets = 13;
- fixed64 rx_crc_errors = 14;
- fixed64 bip_errors = 15;
- fixed32 timestamp = 16;
-}
-
-message FlowStatistics {
- fixed32 flow_id = 1;
- fixed64 rx_bytes = 2;
- fixed64 rx_packets = 3;
- fixed64 tx_bytes = 8;
- fixed64 tx_packets = 9;
- fixed32 timestamp = 16;
-}
-
-message LosIndication {
- fixed32 intf_id = 1;
- string status = 2;
-}
-
-message DyingGaspIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
-}
-
-message OnuAlarmIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string los_status = 3;
- string lob_status = 4;
- string lopc_miss_status = 5;
- string lopc_mic_error_status = 6;
-}
-
-message OnuStartupFailureIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
-}
-
-message OnuSignalDegradeIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
- fixed32 inverse_bit_error_rate = 4;
-}
-
-message OnuDriftOfWindowIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
- fixed32 drift = 4;
- fixed32 new_eqd = 5;
-}
-
-message OnuLossOfOmciChannelIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
-}
-
-message OnuSignalsFailureIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
- fixed32 inverse_bit_error_rate = 4;
-}
-
-message OnuTransmissionInterferenceWarning {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- string status = 3;
- fixed32 drift = 4;
-}
-
-message OnuActivationFailureIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
-}
-
-message OnuProcessingErrorIndication {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
-}
-
-enum Direction {
- UPSTREAM = 0;
- DOWNSTREAM = 1;
- BIDIRECTIONAL = 2;
-}
-
-enum SchedulingPolicy {
- WRR = 0;
- StrictPriority = 1;
- Hybrid = 2;
-}
-
-enum AdditionalBW {
- AdditionalBW_None = 0;
- AdditionalBW_NA = 1;
- AdditionalBW_BestEffort = 2;
- AdditionalBW_Auto = 3;
-}
-
-enum DiscardPolicy {
- TailDrop = 0;
- WTailDrop = 1;
- Red = 2;
- WRed = 3;
-}
-
-enum InferredAdditionBWIndication {
- InferredAdditionBWIndication_None = 0;
- InferredAdditionBWIndication_Assured = 1;
- InferredAdditionBWIndication_BestEffort = 2;
-}
-
-message Scheduler {
- Direction direction = 1;
- AdditionalBW additional_bw = 2; // Valid on for “direction == Upstream”.
- fixed32 priority = 3;
- fixed32 weight = 4;
- SchedulingPolicy sched_policy = 5;
-}
-
-message TrafficShapingInfo {
- fixed32 cir = 1;
- fixed32 cbs = 2;
- fixed32 pir = 3;
- fixed32 pbs = 4;
- fixed32 gir = 5; // only if “direction == Upstream ”
- InferredAdditionBWIndication add_bw_ind = 6; // only if “direction == Upstream”
-}
-
-message Tcont {
- Direction direction = 1;
- fixed32 alloc_id = 2; // valid only if “direction == Upstream ”
- Scheduler scheduler = 3;
- TrafficShapingInfo traffic_shaping_info = 4;
-}
-
-message Tconts {
- fixed32 intf_id = 1;
- fixed32 onu_id = 2;
- fixed32 uni_id = 4;
- fixed32 port_no = 5;
- repeated Tcont tconts = 3;
-}
-
-message TailDropDiscardConfig {
- fixed32 queue_size = 1;
-}
-
-message RedDiscardConfig {
- fixed32 min_threshold = 1;
- fixed32 max_threshold = 2;
- fixed32 max_probability = 3;
-}
-
-message WRedDiscardConfig {
- RedDiscardConfig green = 1;
- RedDiscardConfig yellow = 2;
- RedDiscardConfig red = 3;
-}
-
-message DiscardConfig {
- DiscardPolicy discard_policy = 1;
- oneof discard_config {
- TailDropDiscardConfig tail_drop_discard_config = 2;
- RedDiscardConfig red_discard_config = 3;
- WRedDiscardConfig wred_discard_config = 4;
- }
-}
-
-message Empty {}
diff --git a/pyvoltha/protos/schema.proto b/pyvoltha/protos/schema.proto
deleted file mode 100644
index bb1f895..0000000
--- a/pyvoltha/protos/schema.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/schema";
-
-package schema;
-
-import "google/api/annotations.proto";
-import "google/protobuf/empty.proto";
-
-// Contains the name and content of a *.proto file
-message ProtoFile {
- string file_name = 1; // name of proto file
- string proto = 2; // content of proto file
- bytes descriptor = 3; // compiled descriptor for proto (zlib compressed)
-}
-
-// Proto files and compiled descriptors for this interface
-message Schemas {
-
- // Proto files
- repeated ProtoFile protos = 1;
-
- // Proto file name from which swagger.json shall be generated
- string swagger_from = 2;
-
- // Proto file name from which yang schemas shall be generated
- string yang_from = 3;
-}
-
-// Schema services
-service SchemaService {
-
- // Return active grpc schemas
- rpc GetSchema(google.protobuf.Empty) returns (Schemas) {
- option (google.api.http) = {
- get: "/schema"
- };
- }
-
-}
diff --git a/pyvoltha/protos/third_party/__init__.py b/pyvoltha/protos/third_party/__init__.py
deleted file mode 100644
index 4ad4c72..0000000
--- a/pyvoltha/protos/third_party/__init__.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright 2017 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-"""
-This helps loading http_pb2 and annotations_pb2.
-Without this, the Python importer will not be able to process the lines:
-from google.api import http_pb2 or
-from google.api import annotations_pb2
-(Without importing these, the protobuf loader will not recognize http options
-in the protobuf definitions.)
-"""
-
-from importlib import import_module
-import os
-import sys
-
-
-class GoogleApiImporter(object):
-
- def find_module(self, full_name, path=None):
- if full_name == 'google.api':
- self.path = [os.path.dirname(__file__)]
- return self
-
- def load_module(self, name):
- if name in sys.modules:
- return sys.modules[name]
- full_name = 'pyvoltha.protos.third_party.' + name
- import_module(full_name)
- module = sys.modules[full_name]
- sys.modules[name] = module
- return module
-
-
-sys.meta_path.append(GoogleApiImporter())
-try:
- from google.api import http_pb2, annotations_pb2
- _ = http_pb2, annotations_pb2
-except AssertionError:
- pass
diff --git a/pyvoltha/protos/third_party/google/LICENSE b/pyvoltha/protos/third_party/google/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/pyvoltha/protos/third_party/google/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/pyvoltha/protos/third_party/google/__init__.py b/pyvoltha/protos/third_party/google/__init__.py
deleted file mode 100644
index b0fb0b2..0000000
--- a/pyvoltha/protos/third_party/google/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
diff --git a/pyvoltha/protos/third_party/google/api/__init__.py b/pyvoltha/protos/third_party/google/api/__init__.py
deleted file mode 100644
index b0fb0b2..0000000
--- a/pyvoltha/protos/third_party/google/api/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
diff --git a/pyvoltha/protos/third_party/google/api/annotations.proto b/pyvoltha/protos/third_party/google/api/annotations.proto
deleted file mode 100644
index cbd18b8..0000000
--- a/pyvoltha/protos/third_party/google/api/annotations.proto
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2015, Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package google.api;
-
-import "google/api/http.proto";
-import "google/protobuf/descriptor.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "AnnotationsProto";
-option java_package = "com.google.api";
-
-extend google.protobuf.MethodOptions {
- // See `HttpRule`.
- HttpRule http = 72295728;
-}
diff --git a/pyvoltha/protos/third_party/google/api/http.proto b/pyvoltha/protos/third_party/google/api/http.proto
deleted file mode 100644
index ce07aa1..0000000
--- a/pyvoltha/protos/third_party/google/api/http.proto
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright (c) 2015, Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package google.api;
-
-option java_multiple_files = true;
-option java_outer_classname = "HttpProto";
-option java_package = "com.google.api";
-
-
-// `HttpRule` defines the mapping of an RPC method to one or more HTTP REST API
-// methods. The mapping determines what portions of the request message are
-// populated from the path, query parameters, or body of the HTTP request. The
-// mapping is typically specified as an `google.api.http` annotation, see
-// "google/api/annotations.proto" for details.
-//
-// The mapping consists of a mandatory field specifying a path template and an
-// optional `body` field specifying what data is represented in the HTTP request
-// body. The field name for the path indicates the HTTP method. Example:
-//
-// ```
-// package google.storage.v2;
-//
-// import "google/api/annotations.proto";
-//
-// service Storage {
-// rpc CreateObject(CreateObjectRequest) returns (Object) {
-// option (google.api.http) {
-// post: "/v2/{bucket_name=buckets/*}/objects"
-// body: "object"
-// };
-// };
-// }
-// ```
-//
-// Here `bucket_name` and `object` bind to fields of the request message
-// `CreateObjectRequest`.
-//
-// The rules for mapping HTTP path, query parameters, and body fields
-// to the request message are as follows:
-//
-// 1. The `body` field specifies either `*` or a field path, or is
-// omitted. If omitted, it assumes there is no HTTP body.
-// 2. Leaf fields (recursive expansion of nested messages in the
-// request) can be classified into three types:
-// (a) Matched in the URL template.
-// (b) Covered by body (if body is `*`, everything except (a) fields;
-// else everything under the body field)
-// (c) All other fields.
-// 3. URL query parameters found in the HTTP request are mapped to (c) fields.
-// 4. Any body sent with an HTTP request can contain only (b) fields.
-//
-// The syntax of the path template is as follows:
-//
-// Template = "/" Segments [ Verb ] ;
-// Segments = Segment { "/" Segment } ;
-// Segment = "*" | "**" | LITERAL | Variable ;
-// Variable = "{" FieldPath [ "=" Segments ] "}" ;
-// FieldPath = IDENT { "." IDENT } ;
-// Verb = ":" LITERAL ;
-//
-// `*` matches a single path component, `**` zero or more path components, and
-// `LITERAL` a constant. A `Variable` can match an entire path as specified
-// again by a template; this nested template must not contain further variables.
-// If no template is given with a variable, it matches a single path component.
-// The notation `{var}` is henceforth equivalent to `{var=*}`.
-//
-// Use CustomHttpPattern to specify any HTTP method that is not included in the
-// pattern field, such as HEAD, or "*" to leave the HTTP method unspecified for
-// a given URL path rule. The wild-card rule is useful for services that provide
-// content to Web (HTML) clients.
-message HttpRule {
-
- // Determines the URL pattern is matched by this rules. This pattern can be
- // used with any of the {get|put|post|delete|patch} methods. A custom method
- // can be defined using the 'custom' field.
- oneof pattern {
- // Used for listing and getting information about resources.
- string get = 2;
-
- // Used for updating a resource.
- string put = 3;
-
- // Used for creating a resource.
- string post = 4;
-
- // Used for deleting a resource.
- string delete = 5;
-
- // Used for updating a resource.
- string patch = 6;
-
- // Custom pattern is used for defining custom verbs.
- CustomHttpPattern custom = 8;
- }
-
- // The name of the request field whose value is mapped to the HTTP body, or
- // `*` for mapping all fields not captured by the path pattern to the HTTP
- // body.
- string body = 7;
-
- // Additional HTTP bindings for the selector. Nested bindings must not
- // specify a selector and must not contain additional bindings.
- repeated HttpRule additional_bindings = 11;
-}
-
-// A custom pattern is used for defining custom HTTP verb.
-message CustomHttpPattern {
- // The name of this custom HTTP verb.
- string kind = 1;
-
- // The path matched by this custom verb.
- string path = 2;
-}
diff --git a/pyvoltha/protos/voltha.proto b/pyvoltha/protos/voltha.proto
deleted file mode 100644
index e344bf6..0000000
--- a/pyvoltha/protos/voltha.proto
+++ /dev/null
@@ -1,581 +0,0 @@
-/*
- * Top-level Voltha API definition
- *
- * For details, see individual definition files.
- */
-
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/voltha";
-
-package voltha;
-
-import "google/protobuf/empty.proto";
-import "google/api/annotations.proto";
-
-import "yang_options.proto";
-
-import public "meta.proto";
-import public "common.proto";
-import public "health.proto";
-import public "logical_device.proto";
-import public "device.proto";
-import public "adapter.proto";
-import public "openflow_13.proto";
-import "omci_mib_db.proto";
-import "omci_alarm_db.proto";
-
-
-option java_package = "org.opencord.voltha";
-option java_outer_classname = "VolthaProtos";
-option csharp_namespace = "Opencord.Voltha.Voltha";
-
-message DeviceGroup {
-
- string id = 1 [(access) = READ_ONLY];
-
- repeated LogicalDevice logical_devices = 2 [(child_node) = {key: "id"}];
-
- repeated Device devices = 3 [(child_node) = {key: "id"}];
-}
-
-message DeviceGroups {
- repeated DeviceGroup items = 1;
-}
-
-
-message AlarmFilterRuleKey {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
- enum AlarmFilterRuleKey {
- id = 0;
- type = 1;
- severity = 2;
- resource_id = 3;
- category = 4;
- device_id = 5;
- }
-}
-
-message AlarmFilterRule {
- AlarmFilterRuleKey.AlarmFilterRuleKey key = 1;
- string value = 2;
-}
-message AlarmFilter {
- string id = 1 [(access) = READ_ONLY];
-
- repeated AlarmFilterRule rules = 2;
-}
-
-message AlarmFilters {
- repeated AlarmFilter filters = 1;
-}
-
-message Logging {
- LogLevel.LogLevel level = 1;
- string package_name = 2;
-}
-
-// CoreInstance represents a core instance. It is data held in memory when a core
-// is running. This data is not persistent.
-message CoreInstance {
- option (yang_message_rule) = CREATE_BOTH_GROUPING_AND_CONTAINER;
-
- string instance_id = 1 [(access) = READ_ONLY];
-
- HealthStatus health = 2 [(child_node) = {}];
-
-}
-
-message CoreInstances {
- option (yang_message_rule) = CREATE_BOTH_GROUPING_AND_CONTAINER;
- repeated CoreInstance items = 1;
-}
-
-// Voltha represents the Voltha cluster data. Each Core instance will hold a subset of
-// the entire cluster. However, some items (e.g. adapters) will be held by all cores
-// for better performance
-message Voltha {
- option (yang_message_rule) = CREATE_BOTH_GROUPING_AND_CONTAINER;
-
- string version = 1 [(access) = READ_ONLY];
-
- repeated Adapter adapters = 2 [(child_node) = {key: "id"}];
-
- repeated LogicalDevice logical_devices = 3 [(child_node) = {key: "id"}];
-
- repeated Device devices = 4 [(child_node) = {key: "id"}];
-
- repeated DeviceType device_types = 5 [(child_node) = {key: "id"}];
-
- repeated DeviceGroup device_groups = 6 [(child_node) = {key: "id"}];
-
- repeated AlarmFilter alarm_filters = 7 [(child_node) = {key: "id"}];
-
- repeated
- omci.MibDeviceData omci_mib_database = 28
- [(child_node) = {key: "device_id"}];
-
- repeated
- alarm.AlarmDeviceData omci_alarm_database = 29
- [(child_node) = {key: "device_id"}];
-}
-
-// Device Self Test Response
-message SelfTestResponse {
- option (yang_child_rule) = MOVE_TO_PARENT_LEVEL;
-
- enum SelfTestResult {
- SUCCESS = 0;
- FAILURE = 1;
- NOT_SUPPORTED = 2;
- UNKNOWN_ERROR = 3;
- }
- SelfTestResult result = 1;
-}
-
-message OfAgentSubscriber {
- // ID of ofagent instance
- string ofagent_id = 1;
-
- // ID of voltha instance to which the ofagent is subscribed
- string voltha_id = 2;
-}
-
-/*
- * Voltha APIs
- *
- */
-service VolthaService {
-
- // Get more information on a given physical device
- rpc UpdateLogLevel(Logging) returns(google.protobuf.Empty) {
- option (google.api.http) = {
- get: "/api/v1/logs"
- };
- }
-
- // Get high level information on the Voltha cluster
- rpc GetVoltha(google.protobuf.Empty) returns(Voltha) {
- option (google.api.http) = {
- get: "/api/v1"
- };
- }
-
- // List all Voltha cluster core instances
- rpc ListCoreInstances(google.protobuf.Empty) returns(CoreInstances) {
- option (google.api.http) = {
- get: "/api/v1/instances"
- };
- option (voltha.yang_xml_tag).xml_tag = 'items';
- option (voltha.yang_xml_tag).list_items_name = 'items';
- }
-
- // Get details on a Voltha cluster instance
- rpc GetCoreInstance(ID) returns(CoreInstance) {
- option (google.api.http) = {
- get: "/api/v1/instances/{id}"
- };
- }
-
- // List all active adapters (plugins) in the Voltha cluster
- rpc ListAdapters(google.protobuf.Empty) returns(Adapters) {
- option (google.api.http) = {
- get: "/api/v1/adapters"
- };
- option (voltha.yang_xml_tag).xml_tag = 'adapters';
- }
-
-
- // List all logical devices managed by the Voltha cluster
- rpc ListLogicalDevices(google.protobuf.Empty) returns(LogicalDevices) {
- option (google.api.http) = {
- get: "/api/v1/logical_devices"
- };
- option (voltha.yang_xml_tag).xml_tag = 'logical_devices';
- }
-
- // Get additional information on a given logical device
- rpc GetLogicalDevice(ID) returns(LogicalDevice) {
- option (google.api.http) = {
- get: "/api/v1/logical_devices/{id}"
- };
- }
-
- // List ports of a logical device
- rpc ListLogicalDevicePorts(ID) returns(LogicalPorts) {
- option (google.api.http) = {
- get: "/api/v1/logical_devices/{id}/ports"
- };
- option (voltha.yang_xml_tag).xml_tag = 'ports';
- }
-
- // Gets a logical device port
- rpc GetLogicalDevicePort(LogicalPortId) returns(LogicalPort) {
- option (google.api.http) = {
- get: "/api/v1/logical_devices/{id}/ports/{port_id}"
- };
- option (voltha.yang_xml_tag).xml_tag = 'port';
- }
-
- // Enables a logical device port
- rpc EnableLogicalDevicePort(LogicalPortId) returns(google.protobuf.Empty) {
- option (google.api.http) = {
- post: "/api/v1/logical_devices/{id}/ports/{port_id}/enable"
- };
- }
-
- // Disables a logical device port
- rpc DisableLogicalDevicePort(LogicalPortId) returns(google.protobuf.Empty) {
- option (google.api.http) = {
- post: "/api/v1/logical_devices/{id}/ports/{port_id}/disable"
- };
- }
-
- // List all flows of a logical device
- rpc ListLogicalDeviceFlows(ID) returns(openflow_13.Flows) {
- option (google.api.http) = {
- get: "/api/v1/logical_devices/{id}/flows"
- };
- option (voltha.yang_xml_tag).xml_tag = 'flows';
- option (voltha.yang_xml_tag).list_items_name = 'items';
- }
-
- // Update flow table for logical device
- rpc UpdateLogicalDeviceFlowTable(openflow_13.FlowTableUpdate)
- returns(google.protobuf.Empty) {
- option (google.api.http) = {
- post: "/api/v1/logical_devices/{id}/flows"
- body: "*"
- };
- }
-
- // Update meter table for logical device
- rpc UpdateLogicalDeviceMeterTable(openflow_13.MeterModUpdate)
- returns(google.protobuf.Empty) {
- option (google.api.http) = {
- post: "/api/v1/logical_devices/{id}/meters"
- body: "*"
- };
- }
-
- // Get all meter stats for logical device
- rpc GetMeterStatsOfLogicalDevice(ID)
- returns(openflow_13.MeterStatsReply) {
- option (google.api.http) = {
- get: "/api/v1/logical_devices/{id}/meters_stats"
- };
- }
-
- // List all flow groups of a logical device
- rpc ListLogicalDeviceFlowGroups(ID) returns(openflow_13.FlowGroups) {
- option (google.api.http) = {
- get: "/api/v1/logical_devices/{id}/flow_groups"
- };
- option (voltha.yang_xml_tag).xml_tag = 'flow_groups';
- option (voltha.yang_xml_tag).list_items_name = 'items';
- }
-
- // Update group table for device
- rpc UpdateLogicalDeviceFlowGroupTable(openflow_13.FlowGroupTableUpdate)
- returns(google.protobuf.Empty) {
- option (google.api.http) = {
- post: "/api/v1/logical_devices/{id}/flow_groups"
- body: "*"
- };
- }
-
- // List all physical devices controlled by the Voltha cluster
- rpc ListDevices(google.protobuf.Empty) returns(Devices) {
- option (google.api.http) = {
- get: "/api/v1/devices"
- };
- option (voltha.yang_xml_tag).xml_tag = 'devices';
- }
-
- // List all physical devices IDs controlled by the Voltha cluster
- rpc ListDeviceIds(google.protobuf.Empty) returns(IDs) {
- option (google.api.http) = {
- get: "/api/v1/deviceids"
- };
- option (voltha.yang_xml_tag).xml_tag = 'id';
- option (voltha.yang_xml_tag).list_items_name = 'items';
- }
-
- // Request to a voltha Core to reconcile a set of devices based on their IDs
- rpc ReconcileDevices(IDs) returns(google.protobuf.Empty) {
- option (google.api.http) = {
- post: "/api/v1/deviceids"
- body: "*"
- };
- }
-
- // Get more information on a given physical device
- rpc GetDevice(ID) returns(Device) {
- option (google.api.http) = {
- get: "/api/v1/devices/{id}"
- };
- }
-
- // Pre-provision a new physical device
- rpc CreateDevice(Device) returns(Device) {
- option (google.api.http) = {
- post: "/api/v1/devices"
- body: "*"
- };
- }
-
- // Enable a device. If the device was in pre-provisioned state then it
- // will transition to ENABLED state. If it was is DISABLED state then it
- // will transition to ENABLED state as well.
- rpc EnableDevice(ID) returns(google.protobuf.Empty) {
- option (google.api.http) = {
- post: "/api/v1/devices/{id}/enable"
- };
- }
-
- // Disable a device
- rpc DisableDevice(ID) returns(google.protobuf.Empty) {
- option (google.api.http) = {
- post: "/api/v1/devices/{id}/disable"
- };
- }
-
- // Reboot a device
- rpc RebootDevice(ID) returns(google.protobuf.Empty) {
- option (google.api.http) = {
- post: "/api/v1/devices/{id}/reboot"
- };
- }
-
- // Delete a device
- rpc DeleteDevice(ID) returns(google.protobuf.Empty) {
- option (google.api.http) = {
- delete: "/api/v1/devices/{id}/delete"
- };
- }
-
- // Request an image download to the standby partition
- // of a device.
- // Note that the call is expected to be non-blocking.
- rpc DownloadImage(ImageDownload) returns(OperationResp) {
- option (google.api.http) = {
- post: "/api/v1/devices/{id}/image_downloads/{name}"
- body: "*"
- };
- }
-
- // Get image download status on a device
- // The request retrieves progress on device and updates db record
- rpc GetImageDownloadStatus(ImageDownload) returns(ImageDownload) {
- option (google.api.http) = {
- get: "/api/v1/devices/{id}/image_downloads/{name}/status"
- };
- }
-
- // Get image download db record
- rpc GetImageDownload(ImageDownload) returns(ImageDownload) {
- option (google.api.http) = {
- get: "/api/v1/devices/{id}/image_downloads/{name}"
- };
- }
-
- // List image download db records for a given device
- rpc ListImageDownloads(ID) returns(ImageDownloads) {
- option (google.api.http) = {
- get: "/api/v1/devices/{id}/image_downloads"
- };
- }
-
- // Cancel an existing image download process on a device
- rpc CancelImageDownload(ImageDownload) returns(OperationResp) {
- option (google.api.http) = {
- delete: "/api/v1/devices/{id}/image_downloads/{name}"
- };
- }
-
- // Activate the specified image at a standby partition
- // to active partition.
- // Depending on the device implementation, this call
- // may or may not cause device reboot.
- // If no reboot, then a reboot is required to make the
- // activated image running on device
- // Note that the call is expected to be non-blocking.
- rpc ActivateImageUpdate(ImageDownload) returns(OperationResp) {
- option (google.api.http) = {
- post: "/api/v1/devices/{id}/image_downloads/{name}/image_update"
- body: "*"
- };
- }
-
- // Revert the specified image at standby partition
- // to active partition, and revert to previous image
- // Depending on the device implementation, this call
- // may or may not cause device reboot.
- // If no reboot, then a reboot is required to make the
- // previous image running on device
- // Note that the call is expected to be non-blocking.
- rpc RevertImageUpdate(ImageDownload) returns(OperationResp) {
- option (google.api.http) = {
- post: "/api/v1/devices/{id}/image_downloads/{name}/image_revert"
- body: "*"
- };
- }
-
- // List ports of a device
- rpc ListDevicePorts(ID) returns(Ports) {
- option (google.api.http) = {
- get: "/api/v1/devices/{id}/ports"
- };
- option (voltha.yang_xml_tag).xml_tag = 'ports';
- }
-
- // List pm config of a device
- rpc ListDevicePmConfigs(ID) returns(PmConfigs) {
- option (google.api.http) = {
- get: "/api/v1/devices/{id}/pm_configs"
- };
- }
-
- // Update the pm config of a device
- rpc UpdateDevicePmConfigs(voltha.PmConfigs) returns(google.protobuf.Empty) {
- option (google.api.http) = {
- post: "/api/v1/devices/{id}/pm_configs"
- body: "*"
- };
- }
-
- // List all flows of a device
- rpc ListDeviceFlows(ID) returns(openflow_13.Flows) {
- option (google.api.http) = {
- get: "/api/v1/devices/{id}/flows"
- };
- option (voltha.yang_xml_tag).xml_tag = 'flows';
- option (voltha.yang_xml_tag).list_items_name = 'items';
- }
-
- // List all flow groups of a device
- rpc ListDeviceFlowGroups(ID) returns(openflow_13.FlowGroups) {
- option (google.api.http) = {
- get: "/api/v1/devices/{id}/flow_groups"
- };
- option (voltha.yang_xml_tag).xml_tag = 'flow_groups';
- option (voltha.yang_xml_tag).list_items_name = 'items';
- }
-
- // List device types known to Voltha
- rpc ListDeviceTypes(google.protobuf.Empty) returns(DeviceTypes) {
- option (google.api.http) = {
- get: "/api/v1/device_types"
- };
- option (voltha.yang_xml_tag).xml_tag = 'device_types';
- }
-
- // Get additional information on a device type
- rpc GetDeviceType(ID) returns(DeviceType) {
- option (google.api.http) = {
- get: "/api/v1/device_types/{id}"
- };
- }
-
- // List all device sharding groups
- rpc ListDeviceGroups(google.protobuf.Empty) returns(DeviceGroups) {
- option (google.api.http) = {
- get: "/api/v1/device_groups"
- };
- option (voltha.yang_xml_tag).xml_tag = 'device_groups';
- }
-
- // Stream control packets to the dataplane
- rpc StreamPacketsOut(stream openflow_13.PacketOut)
- returns(google.protobuf.Empty) {
- // This does not have an HTTP representation
- }
-
- // Receive control packet stream
- rpc ReceivePacketsIn(google.protobuf.Empty)
- returns(stream openflow_13.PacketIn) {
- // This does not have an HTTP representation
- }
-
- rpc ReceiveChangeEvents(google.protobuf.Empty)
- returns(stream openflow_13.ChangeEvent) {
- // This does not have an HTTP representation
- }
-
- // Get additional information on a device group
- rpc GetDeviceGroup(ID) returns(DeviceGroup) {
- option (google.api.http) = {
- get: "/api/v1/device_groups/{id}"
- };
- }
-
- rpc CreateAlarmFilter(AlarmFilter) returns(AlarmFilter) {
- option (google.api.http) = {
- post: "/api/v1/alarm_filters"
- body: "*"
- };
- }
-
- rpc GetAlarmFilter(ID) returns(AlarmFilter) {
- option (google.api.http) = {
- get: "/api/v1/alarm_filters/{id}"
- };
- }
-
- rpc UpdateAlarmFilter(AlarmFilter) returns(AlarmFilter) {
- option (google.api.http) = {
- put: "/api/v1/alarm_filters/{id}"
- body: "*"
- };
- }
-
- rpc DeleteAlarmFilter(ID) returns(google.protobuf.Empty) {
- option (google.api.http) = {
- delete: "/api/v1/alarm_filters/{id}"
- };
- }
-
- rpc ListAlarmFilters(google.protobuf.Empty) returns(AlarmFilters) {
- option (google.api.http) = {
- get: "/api/v1/alarm_filters"
- };
- }
-
- rpc GetImages(ID) returns(Images) {
- option (google.api.http) = {
- get: "/api/v1/devices/{id}/images"
- };
- }
-
- rpc SelfTest(ID) returns(SelfTestResponse) {
- option (google.api.http) = {
- post: "/api/v1/devices/{id}/self_test"
- };
- }
-
- // OpenOMCI MIB information
- rpc GetMibDeviceData(ID) returns(omci.MibDeviceData) {
- option (google.api.http) = {
- get: "/api/v1/openomci/{id}/mib"
- };
- }
-
- // OpenOMCI ALARM information
- rpc GetAlarmDeviceData(ID) returns(alarm.AlarmDeviceData) {
- option (google.api.http) = {
- get: "/api/v1/openomci/{id}/alarm"
- };
- }
-
- // Simulate an Alarm
- rpc SimulateAlarm(SimulateAlarmRequest) returns(OperationResp) {
- option (google.api.http) = {
- post: "/api/v1/devices/{id}/simulate_larm"
- body: "*"
- };
- }
- rpc Subscribe (OfAgentSubscriber) returns (OfAgentSubscriber) {
- }
-}
-
diff --git a/pyvoltha/protos/yang_options.proto b/pyvoltha/protos/yang_options.proto
deleted file mode 100644
index 25f70a8..0000000
--- a/pyvoltha/protos/yang_options.proto
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) 2015, Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// This file contains annotation definitions that can be used to describe
-// a configuration tree.
-
-syntax = "proto3";
-
-option go_package = "github.com/opencord/voltha-go/protos/common";
-
-package voltha;
-
-import "google/protobuf/descriptor.proto";
-
-enum MessageParserOption {
- // Move any enclosing child enum/message definition to the same level
- // as the parent (this message) in the yang generated file
- MOVE_TO_PARENT_LEVEL= 0;
-
- // Create both a grouping and a container for this message. The container
- // name will be the message name. The grouping name will be the message
- // name prefixed with "grouping_"
- CREATE_BOTH_GROUPING_AND_CONTAINER = 1;
-}
-
-message InlineNode {
- string id = 1;
- string type = 2;
-}
-
-message RpcReturnDef {
- // The gRPC methods return message types. NETCONF expects an actual
- // attribute as defined in the YANG schema. The xnl_tag will be used
- // as the top most tag when translating a gRPC response into an xml
- // response
- string xml_tag = 1;
-
- // When the gRPC response is a list of items, we need to differentiate
- // between a YANG schema attribute whose name is "items" and when "items"
- // is used only to indicate a list of items is being returned. The default
- // behavior assumes a list is returned when "items" is present in
- // the response. This option will therefore be used when the attribute
- // name in the YANG schema is 'items'
- string list_items_name = 2;
-}
-
-extend google.protobuf.MessageOptions {
- // This annotation is used to indicate how a message is parsed when
- // converting from proto to yang format.
- MessageParserOption yang_child_rule = 7761774;
-
- MessageParserOption yang_message_rule = 7761775;
-}
-
-extend google.protobuf.FieldOptions {
- // If present, the field (a message reference) should be replaced by the
- // message itself. For now, this applies only to non-repeated fields.
- InlineNode yang_inline_node = 7761776;
-}
-
-extend google.protobuf.MethodOptions {
- RpcReturnDef yang_xml_tag = 7761777;
-}
diff --git a/requirements.txt b/requirements.txt
index 205d524..8b1a953 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -50,4 +50,5 @@
Twisted==18.7.0
txaioetcd==0.3.0
urllib3==1.22
+voltha-protos==0.1.0
afkak==3.0.0.dev20181106