VNFRQTS Moved R-01427 and R-894004 to Monitoring

Change-Id: Ie8cdb7a2372c860f40769eed9ce8dfebe72f01c2
Issue-ID: VNFRQTS-487
Signed-off-by: Lovett, Trevor <trevor.lovett@att.com>

2 files changed, 32 insertions, 30 deletions

diff --git a/docs/Chapter7/Monitoring-And-Management.rst b/docs/Chapter7/Monitoring-And-Management.rst
index 38295ab..d6fd80e 100755
--- a/docs/Chapter7/Monitoring-And-Management.rst
+++ b/docs/Chapter7/Monitoring-And-Management.rst
@@ -874,6 +874,38 @@ Security
     Information (SPI) or certain proprietary data, in addition to applying the
     regular procedures for securing access and delivery.
 
+.. req::
+    :id: R-01427
+    :target: XNF
+    :keyword: MUST
+    :introduced: casablanca
+    :updated: dublin
+
+    The xNF **MUST** support the provisioning of security and authentication
+    parameters (HTTP username and password) in order to be able to authenticate
+    with DCAE (in ONAP).
+
+    Note: In R3, a username and password are used with the DCAE VES Event
+    Listener which are used for HTTP Basic Authentication.
+
+    Note: The configuration management and provisioning software are specific
+    to a vendor architecture.
+
+.. req::
+    :id: R-894004
+    :target: XNF
+    :keyword: MUST
+    :introduced: casablanca
+    :updated: dublin
+
+    When the xNF sets up a HTTP or HTTPS connection to the collector, it **MUST**
+    provide a username and password to the DCAE VES Collector for HTTP Basic
+    Authentication.
+
+    Note: HTTP Basic Authentication has 4 steps: Request, Authenticate,
+    Authorization with Username/Password Credentials, and Authentication Status
+    as per RFC7617 and RFC 2617.
+
 Bulk Performance Measurement
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/Chapter7/PNF-Plug-and-Play.rst b/docs/Chapter7/PNF-Plug-and-Play.rst
index 83a8044..a8167d3 100644
--- a/docs/Chapter7/PNF-Plug-and-Play.rst
+++ b/docs/Chapter7/PNF-Plug-and-Play.rst
@@ -79,36 +79,6 @@ The following are the requirements related to PNF Plug and Play.
     functions.
 
 .. req::
-    :id: R-01427
-    :target: PNF
-    :keyword: MUST
-    :introduced: casablanca
-
-    The PNF **MUST** support the provisioning of security and authentication
-    parameters (HTTP username and password) in order to be able to authenticate
-    with DCAE (in ONAP).
-
-    Note: In R3, a username and password are used with the DCAE VES Event
-    Listener which are used for HTTP Basic Authentication.
-
-    Note: The configuration management and provisioning software are specific
-    to a vendor architecture.
-
-.. req::
-    :id: R-894004
-    :target: PNF
-    :keyword: MUST
-    :introduced: casablanca
-
-    When the PNF sets up a HTTP or HTTPS connection, it **MUST** provide a
-    username and password to the DCAE VES Collector for HTTP Basic
-    Authentication.
-
-    Note: HTTP Basic Authentication has 4 steps: Request, Authenticate,
-    Authorization with Username/Password Credentials, and Authentication Status
-    as per RFC7617 and RFC 2617.
-
-.. req::
     :id: R-952314
     :target: PNF
     :keyword: MUST