summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--UPSTREAM39
-rw-r--r--docs/requirements/02-use_cases.rst2
-rw-r--r--docs/requirements/03-architecture.rst4
-rw-r--r--[-rwxr-xr-x]docs/requirements/images/figure1.pngbin977880 -> 79420 bytes
-rw-r--r--[-rwxr-xr-x]docs/requirements/images/figure2.pngbin1043699 -> 82010 bytes
5 files changed, 42 insertions, 3 deletions
diff --git a/UPSTREAM b/UPSTREAM
new file mode 100644
index 00000000..d8810404
--- /dev/null
+++ b/UPSTREAM
@@ -0,0 +1,39 @@
+# Upstream contributions, bitergia will crawl this and extract the relevant information
+# system is one of Gerrit, Bugzilla, Launchpad (insert more)
+---
+-
+ url: https://blueprints.launchpad.net/ceilometer/+spec/event-alarm-evaluator
+ system: Launchpad
+-
+ url: https://blueprints.launchpad.net/nova/+spec/mark-host-down
+ system: Launchpad
+-
+ url: https://blueprints.launchpad.net/python-novaclient/+spec/support-force-down-service
+ system: Launchpad
+-
+ url: https://blueprints.launchpad.net/nova/+spec/get-valid-server-state
+ system: Launchpad
+-
+ url: https://blueprints.launchpad.net/nova/+spec/servers-by-host-status
+ system: Launchpad
+-
+ url: https://blueprints.launchpad.net/nova/+spec/maintenance-reason-to-server
+ system: Launchpad
+-
+ url: https://blueprints.launchpad.net/nova/+spec/service-status-notification
+ system: Launchpad
+-
+ url: https://blueprints.launchpad.net/congress/+spec/push-type-datasource-driver
+ system: Launchpad
+#-
+# url: https://review.openstack.org/#/c/314915/
+# system: Gerrit
+-
+ url: https://blueprints.launchpad.net/cinder/+spec/mark-services-down
+ system: Launchpad
+-
+ url: https://blueprints.launchpad.net/python-cinderclient/+spec/mark-service-down-cli
+ system: Launchpad
+#-
+# url: https://bugs.launchpad.net/neutron/+bug/1513144
+# system: Launchpad-bug
diff --git a/docs/requirements/02-use_cases.rst b/docs/requirements/02-use_cases.rst
index 424a3c6e..0a1f6413 100644
--- a/docs/requirements/02-use_cases.rst
+++ b/docs/requirements/02-use_cases.rst
@@ -136,7 +136,7 @@ the same as in the "Fault management using ACT-STBY configuration" use case,
except in this case, the Consumer of a VM/VNF switches to STBY configuration
based on a predicted fault, rather than an occurred fault.
-NVFI Maintenance
+NFVI Maintenance
----------------
VM Retirement
diff --git a/docs/requirements/03-architecture.rst b/docs/requirements/03-architecture.rst
index 8ff5dacf..9f620e68 100644
--- a/docs/requirements/03-architecture.rst
+++ b/docs/requirements/03-architecture.rst
@@ -217,7 +217,7 @@ restart of the VM, migration/evacuation of the VM, or no action.
High level northbound interface specification
---------------------------------------------
-Fault management
+Fault Management
^^^^^^^^^^^^^^^^
This interface allows the Consumer to subscribe to fault notification from the
@@ -321,7 +321,7 @@ An example of a high level message flow to cover the failed NFVI maintenance cas
shown in :numref:`figure5c`.
It consists of the following steps:
-5. The Consumer C3 switches to standby configuration (STDBY).
+5. The Consumer C3 switches to standby configuration (STBY).
6. Instructions from Consumers C2/C3 are shared to VIM requesting certain actions to be performed (steps 6a, 6b).
The VIM executes the requested actions and sends back a NACK to consumer C2 (step 6d) as the
migration of the virtual resource(s) is not completed by the given timeout.
diff --git a/docs/requirements/images/figure1.png b/docs/requirements/images/figure1.png
index dacf0dd4..267ddddc 100755..100644
--- a/docs/requirements/images/figure1.png
+++ b/docs/requirements/images/figure1.png
Binary files differ
diff --git a/docs/requirements/images/figure2.png b/docs/requirements/images/figure2.png
index 3c8a2bf1..9a3b166d 100755..100644
--- a/docs/requirements/images/figure2.png
+++ b/docs/requirements/images/figure2.png
Binary files differ