Update Tutorial Documentation

Point to actual code and remove the eclipse instructions as
developers should look elsewhere for these instructions.

Adding enforcement tutorial.

Issue-ID: POLICY-2876
Change-Id: I793c1fae72f832afe7098be57a94f4929e9deb9a
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

1 files changed, 155 insertions, 111 deletions

diff --git a/docs/xacml/xacml-tutorial.rst b/docs/xacml/xacml-tutorial.rst
index e9eee0e2..e50728ab 100644
--- a/docs/xacml/xacml-tutorial.rst
+++ b/docs/xacml/xacml-tutorial.rst
@@ -11,23 +11,22 @@ Policy XACML - Custom Application Tutorial
 This tutorial shows how to build a XACML application for a Policy Type. Please be sure to clone the
 policy repositories before going through the tutorial. See :ref:`policy-development-tools-label` for details.
 
-
 Design a Policy Type
 ********************
 Follow :ref:`TOSCA Policy Primer <tosca-label>` for more information. For the tutorial, we will use
 this example Policy Type in which an ONAP PEP client would like to enforce an action **authorize**
-for a *user* to execute a *permission* on an *entity*.
+for a *user* to execute a *permission* on an *entity*. `See here for latest Tutorial Policy Type <https://github.com/onap/policy-xacml-pdp/blob/master/tutorials/tutorial-xacml-application/src/test/resources/tutorial-policy-type.yaml>`_.
 
-.. literalinclude:: tutorial/app/src/test/resources/tutorial-policy-type.yaml
+.. literalinclude:: tutorial/tutorial-policy-type.yaml
   :language: yaml
   :caption: Example Tutorial Policy Type
   :linenos:
 
 We would expect then to be able to create the following policies to allow the demo user to Read/Write
 an entity called foo, while the audit user can only read the entity called foo. Neither user has Delete
-permission.
+permission. `See here for latest Tutorial Policies <https://github.com/onap/policy-xacml-pdp/blob/master/tutorials/tutorial-xacml-application/src/test/resources/tutorial-policies.yaml>`_.
 
-.. literalinclude:: tutorial/app/src/test/resources/tutorial-policies.yaml
+.. literalinclude:: tutorial/tutorial-policies.yaml
   :language: yaml
   :caption: Example Policies Derived From Tutorial Policy Type
   :linenos:
@@ -37,7 +36,7 @@ Design Decision Request and expected Decision Response
 For the PEP (Policy Enforcement Point) client applications that call the Decision API, you need
 to design how the Decision API Request resource fields will be sent via the PEP.
 
-.. literalinclude:: tutorial/app/src/test/resources/tutorial-decision-request.json
+.. literalinclude:: tutorial/tutorial-decision-request.json
   :language: JSON
   :caption: Example Decision Request
   :linenos:
@@ -52,19 +51,7 @@ customize the Decision Response object and send back whatever information is des
 
 Create A Maven Project
 **********************
-This part of the tutorial assumes you understand how to use Eclipse to create a Maven
-project. Please follow any examples for the Eclipse installation you have to create
-an empty application. For the tutorial, use groupId *org.onap.policy.tutorial* and artifactId
-*tutorial*. If you wish to go directly to the source code, please see the
-:ref:`Download Tutorial Application Example` below to download it.
-
-.. image:: tutorial/images/eclipse-create-maven.png
-
-.. image:: tutorial/images/eclipse-maven-project.png
-
-Be sure to import the policy/xacml-pdp project into Eclipse.
-
-.. image:: tutorial/images/eclipse-import.png
+Use whatever tool or environment to create your application project. This tutorial assumes you use Maven to build it.
 
 Add Dependencies Into Application pom.xml
 *****************************************
@@ -78,12 +65,12 @@ we are importing a testing dependency that has common code for producing a JUnit
     <dependency>
       <groupId>org.onap.policy.xacml-pdp.applications</groupId>
       <artifactId>common</artifactId>
-      <version>2.2.2</version>
+      <version>2.3.3</version>
     </dependency>
     <dependency>
       <groupId>org.onap.policy.xacml-pdp</groupId>
       <artifactId>xacml-test</artifactId>
-      <version>2.2.2</version>
+      <version>2.3.3</version>
       <scope>test</scope>
     </dependency>
 
@@ -96,7 +83,11 @@ declaring the class that implements the service.
 The name of the file must match **org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider**
 and the contents of the file is one line **org.onap.policy.tutorial.tutorial.TutorialApplication**.
 
-.. image:: tutorial/images/eclipse-meta-inf.png
+.. code-block:: java
+  :caption: META-INF/services/org.onap.policy.pdp.xacml.application.common.XacmlApplicationServiceProvider
+
+    org.onap.policy.tutorial.tutorial.TutorialApplication
+
 
 Create A Java Class That Extends **StdXacmlApplicationServiceProvider**
 ***********************************************************************
@@ -105,8 +96,6 @@ for simplicity if you just extend **StdXacmlApplicationServiceProvider** you
 will get a lot of implementation done for your application up front. All
 that needs to be implemented is providing a custom translator.
 
-.. image:: tutorial/images/eclipse-inherit-app.png
-
 .. code-block:: java
   :caption: Custom Tutorial Application Service Provider
   :emphasize-lines: 6
@@ -228,110 +217,159 @@ For the tutorial, we will build code that translates the TOSCA Policy into one X
 on the user and action. It will then have one or more rules for each entity and permission combination. The
 default combining algorithm for the XACML Rules are to "Deny Unless Permit".
 
+`See the tutorial example for details on how the translator is implemented <https://github.com/onap/policy-xacml-pdp/blob/master/tutorials/tutorial-xacml-application/src/main/java/org/onap/policy/tutorial/tutorial/TutorialTranslator.java>`_
+
 .. Note::
   There are many ways to build the policy based on the attributes. How to do so is a matter of experience and
   fine tuning using the many options for combining algorithms, target and/or condition matching and the rich set of
   functions available.
 
-Here is one implementation example:
-
-.. literalinclude:: tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialTranslator.java
-  :caption: Example Translator Implementation
-  :linenos:
-
 Use the TutorialTranslator in the TutorialApplication
 *****************************************************
 Be sure to go back to the TutorialApplication and create an instance of the translator to return to the
 StdXacmlApplicationServiceProvider. The StdXacmlApplicationServiceProvider uses the translator to convert
-a policy when a new policy is deployed to the ONAP XACML PDP Engine.
+a policy when a new policy is deployed to the ONAP XACML PDP Engine. `See the Tutorial Application Example <https://github.com/onap/policy-xacml-pdp/blob/master/tutorials/tutorial-xacml-application/src/main/java/org/onap/policy/tutorial/tutorial/TutorialApplication.java>`_.
 
 .. code-block:: java
   :caption: Final TutorialApplication Class
   :linenos:
-  :emphasize-lines: 37
-
-  package org.onap.policy.tutorial.tutorial;
-
-  import java.util.Arrays;
-  import java.util.List;
-
-  import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
-  import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator;
-  import org.onap.policy.pdp.xacml.application.common.std.StdXacmlApplicationServiceProvider;
-
-  public class TutorialApplication extends StdXacmlApplicationServiceProvider {
-	
-    private final ToscaPolicyTypeIdentifier supportedPolicyType = new ToscaPolicyTypeIdentifier();
-    private final TutorialTranslator translator = new TutorialTranslator();
-
-    @Override
-    public String applicationName() {
-        return "tutorial";
-    }
-
-    @Override
-    public List<String> actionDecisionsSupported() {
-        return Arrays.asList("authorize");
-    }
-
-    @Override
-    public synchronized List<ToscaPolicyTypeIdentifier> supportedPolicyTypes() {
-        return Arrays.asList(supportedPolicyType);
-    }
-
-    @Override
-    public boolean canSupportPolicyType(ToscaPolicyTypeIdentifier policyTypeId) {
-    	return supportedPolicyType.equals(policyTypeId);
+  :emphasize-lines: 38
+
+    package org.onap.policy.tutorial.tutorial;
+
+    import java.util.Arrays;
+    import java.util.List;
+    import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifier;
+    import org.onap.policy.pdp.xacml.application.common.ToscaPolicyTranslator;
+    import org.onap.policy.pdp.xacml.application.common.std.StdXacmlApplicationServiceProvider;
+    
+    public class TutorialApplication extends StdXacmlApplicationServiceProvider {
+    
+        private final ToscaPolicyTypeIdentifier supportedPolicyType =
+                new ToscaPolicyTypeIdentifier("onap.policies.Authorization", "1.0.0");
+        private final TutorialTranslator translator = new TutorialTranslator();
+    
+        @Override
+        public String applicationName() {
+            return "tutorial";
+        }
+    
+        @Override
+        public List<String> actionDecisionsSupported() {
+            return Arrays.asList("authorize");
+        }
+    
+        @Override
+        public synchronized List<ToscaPolicyTypeIdentifier> supportedPolicyTypes() {
+            return Arrays.asList(supportedPolicyType);
+        }
+    
+        @Override
+        public boolean canSupportPolicyType(ToscaPolicyTypeIdentifier policyTypeId) {
+            return supportedPolicyType.equals(policyTypeId);
+        }
+    
+        @Override
+        protected ToscaPolicyTranslator getTranslator(String type) {
+            return translator;
+        }
+    
     }
 
-    @Override
-    protected ToscaPolicyTranslator getTranslator(String type) {
-        return translator;
-     }
-
-  }
-
 Create a XACML Request from ONAP Decision Request
 *************************************************
 The easiest way to do this is to use the annotations feature from XACML PDP library to create an example XACML
 request. Then create an instance and simply populate it from an incoming ONAP Decision Request.
 
-.. image: tutorial/images/eclipse-create-request.png
-
-.. literalinclude:: tutorial/app/src/main/java/org/onap/policy/tutorial/tutorial/TutorialRequest.java
-  :caption: Example Decision Request to Decision Response Implementation
+.. code-block:: java
+  :caption: Final TutorialApplication Class
   :linenos:
+    import com.att.research.xacml.std.annotations.XACMLAction;
+    import com.att.research.xacml.std.annotations.XACMLRequest;
+    import com.att.research.xacml.std.annotations.XACMLResource;
+    import com.att.research.xacml.std.annotations.XACMLSubject;
+    import java.util.Map;
+    import java.util.Map.Entry;
+    import lombok.Getter;
+    import lombok.Setter;
+    import lombok.ToString;
+    import org.onap.policy.models.decisions.concepts.DecisionRequest;
+    
+    @Getter
+    @Setter
+    @ToString
+    @XACMLRequest(ReturnPolicyIdList = true)
+    public class TutorialRequest {
+        @XACMLSubject(includeInResults = true)
+        private String onapName;
+
+        @XACMLSubject(attributeId = "urn:org:onap:onap-component", includeInResults = true)
+        private String onapComponent;
+
+        @XACMLSubject(attributeId = "urn:org:onap:onap-instance", includeInResults = true)
+        private String onapInstance;
+
+        @XACMLAction()
+        private String action;
+
+        @XACMLResource(attributeId = "urn:org:onap:tutorial-user", includeInResults = true)
+        private String user;
+
+        @XACMLResource(attributeId = "urn:org:onap:tutorial-entity", includeInResults = true)
+        private String entity;
+
+        @XACMLResource(attributeId = "urn:org:onap:tutorial-permission", includeInResults = true)
+        private String permission;
+
+        /**
+         * createRequest.
+         *
+         * @param decisionRequest Incoming
+         * @return TutorialRequest object
+         */
+        public static TutorialRequest createRequest(DecisionRequest decisionRequest) {
+            //
+            // Create our object
+            //
+            TutorialRequest request = new TutorialRequest();
+            //
+            // Add the subject attributes
+            //
+            request.onapName = decisionRequest.getOnapName();
+            request.onapComponent = decisionRequest.getOnapComponent();
+            request.onapInstance = decisionRequest.getOnapInstance();
+            //
+            // Add the action attribute
+            //
+            request.action = decisionRequest.getAction();
+            //
+            // Add the resource attributes
+            //
+            Map<String, Object> resources = decisionRequest.getResource();
+            for (Entry<String, Object> entrySet : resources.entrySet()) {
+                if ("user".equals(entrySet.getKey())) {
+                    request.user = entrySet.getValue().toString();
+                }
+                if ("entity".equals(entrySet.getKey())) {
+                    request.entity = entrySet.getValue().toString();
+                }
+                if ("permission".equals(entrySet.getKey())) {
+                    request.permission = entrySet.getValue().toString();
+                }
+            }
+
+            return request;
+        }
+    }
 
-
-Create xacml.properties for the XACML PDP engine to use
-*******************************************************
-In the applications *src/test/resources* directory, create a xacml.properties file that will be used by the embedded
-XACML PDP Engine when loading.
-
-.. literalinclude:: tutorial/app/src/test/resources/xacml.properties
-  :caption: Example xacml.properties file
-  :linenos:
-  :emphasize-lines: 20, 25
+`See the Tutorial Request <https://github.com/onap/policy-xacml-pdp/blob/master/tutorials/tutorial-xacml-application/src/main/java/org/onap/policy/tutorial/tutorial/TutorialRequest.java>`_
 
 Create a JUnit and use the TestUtils.java class in xacml-test dependency
 ************************************************************************
-Using Eclipse, create a JUnit and be sure to add a setup() method stub. Here you will be utilizing a TestUtils.java
+Be sure to create a JUnit that will test your translator and application code. You can utilize a TestUtils.java
 class from the policy/xamcl-pdp repo's xacml-test submodule to use some utility methods for building the JUnit test.
 
-.. image: tutorial/images/eclipse-junit-create.png
-
-Copy the TOSCA Policy Type :download:`link <tutorial/app/src/test/resources/tutorial-policy-type.yaml>` and the TOSCA Policies :download:`link <tutorial/app/src/test/resources/tutorial-policies.yaml>`
-into the src/test/resources directory.
-
-We will create a temporary folder which is used by the **StdXacmlApplicationServiceProvider** to store working copies of policies as they are loaded
-into the application.
-
-.. literalinclude:: tutorial/app/src/test/java/org/onap/policy/tutorial/tutorial/TutorialApplicationTest.java
-  :caption: Example Translator Implementation
-  :linenos:
-
-Run the JUnit test. Its easiest to run it via a terminal command line using maven commands.
-
+Build the code and run the JUnit test. Its easiest to run it via a terminal command line using maven commands.
 
 .. code-block:: bash
    :caption: Running Maven Commands
@@ -341,30 +379,36 @@ Run the JUnit test. Its easiest to run it via a terminal command line using mave
 
 Building Docker Image
 *********************
-Once you have created enough JUnit tests that test the TutorialTranslator.java and TutorialRequest.java classes, you are ready to now make your
-application build a docker image that incorporates your application with the XACML PDP Engine. The XACML PDP Engine
+To build a docker image that incorporates your application with the XACML PDP Engine. The XACML PDP Engine
 must be able to *find* your Java.Service in the classpath. This is easy to do, just create a jar file for your application
 and copy into the same directory used to startup the XACML PDP.
 
 Here is a Dockerfile as an example:
 
-.. literalinclude:: tutorial/app/src/main/docker/Dockerfile
+.. code-block:: bash
   :caption: Dockerfile
   :linenos:
 
+    FROM onap/policy-xacml-pdp
+
+    ADD maven/${project.build.finalName}.jar /opt/app/policy/pdpx/lib/${project.build.finalName}.jar
+
+    RUN mkdir -p /opt/app/policy/pdpx/apps/tutorial
+
+    COPY --chown=policy:policy xacml.properties /opt/app/policy/pdpx/apps/tutorial
+
 Download Tutorial Application Example
 *************************************
 
-If you don't wish to use Eclipse, or go through the steps outlined above. The tutorial is
-available for download:
+If you clone the XACML-PDP repo, the tutorial is included for local testing without building your own.
 
-:download:`Download tutorial tar <tutorial/tutorial.tar>`
+`Tutorial code located in xacml-pdp repo <https://github.com/onap/policy-xacml-pdp/tree/master/tutorials/tutorial-xacml-application>`_
 
-After you tar xf tutorial.jar, you can import it into Eclipse or your favorite editor. Or simply
-use a terminal command line to build, test and run the tutorial.
+There is an example Docker compose script that you can use to run the Policy Framework components locally and test the tutorial out.
+
+`Docker compose script <https://github.com/onap/policy-xacml-pdp/blob/master/tutorials/tutorial-xacml-application/src/main/docker/docker-compose.yml>`_
 
 In addition, there is a POSTMAN collection available for setting up and running tests against a
 running instance of ONAP Policy Components (api, pap, dmaap-simulator, tutorial-xacml-pdp).
 
-:download:`Download tutorial POSTMAN Collection <tutorial/PolicyApplicationTutorial.postman_collection.json>`
-
+`POSTMAN collection for testing <https://github.com/onap/policy-xacml-pdp/blob/master/tutorials/tutorial-xacml-application/postman/PolicyApplicationTutorial.postman_collection.json>`_