Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr…

… into RMRestArticles

.openpublishing.redirection.json

@@ -11592,6 +11592,11 @@
       "redirect_url": "/azure/lab-services/tutorial-create-custom-lab#add-a-vm-to-the-lab",
       "redirect_document_id": false
     }, 
+    {
+      "source_path": "articles/lab-services/compare-lab-types.md",
+      "redirect_url": "/azure/lab-services/lab-services-overview#types-of-labs",
+      "redirect_document_id": false
+    },    
     {
       "source_path": "articles/lab-services/how-to-manage-classroom-labs.md",
       "redirect_url": "/azure/lab-services/classroom-labs/how-to-manage-classroom-labs",

articles/active-directory/saas-apps/netop-portal-tutorial.md

@@ -0,0 +1,222 @@
+---
+title: 'Tutorial: Azure Active Directory integration with Netop Portal | Microsoft Docs'
+description: Learn how to configure single sign-on between Azure Active Directory and Netop Portal.
+services: active-directory
+documentationCenter: na
+author: jeevansd
+manager: mtillman
+ms.reviewer: barbkess
+
+ms.assetid: 63f7eab5-412a-4a5c-84bc-7473087abb49
+ms.service: Azure-Active-Directory
+ms.workload: identity
+ms.tgt_pltfrm: na
+ms.devlang: na
+ms.topic: tutorial
+ms.date: 02/20/2019
+ms.author: jeedes
+
+---
+# Tutorial: Azure Active Directory integration with Netop Portal
+
+In this tutorial, you learn how to integrate Netop Portal with Azure Active Directory (Azure AD).
+Integrating Netop Portal with Azure AD provides you with the following benefits:
+
+* You can control in Azure AD who has access to Netop Portal.
+* You can enable your users to be automatically signed-in to Netop Portal (Single Sign-On) with their Azure AD accounts.
+* You can manage your accounts in one central location - the Azure portal.
+
+If you want to know more details about SaaS app integration with Azure AD, see [What is application access and single sign-on with Azure Active Directory](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis).
+If you don't have an Azure subscription, [create a free account](https://azure.microsoft.com/free/) before you begin.
+
+## Prerequisites
+
+To configure Azure AD integration with Netop Portal, you need the following items:
+
+* An Azure AD subscription. If you don't have an Azure AD environment, you can get one-month trial [here](https://azure.microsoft.com/pricing/free-trial/)
+* Netop Portal single sign-on enabled subscription
+
+## Scenario description
+
+In this tutorial, you configure and test Azure AD single sign-on in a test environment.
+
+* Netop Portal supports **IDP** initiated SSO
+
+## Adding Netop Portal from the gallery
+
+To configure the integration of Netop Portal into Azure AD, you need to add Netop Portal from the gallery to your list of managed SaaS apps.
+
+**To add Netop Portal from the gallery, perform the following steps:**
+
+1. In the **[Azure portal](https://portal.azure.com)**, on the left navigation panel, click **Azure Active Directory** icon.
+
+	![The Azure Active Directory button](common/select-azuread.png)
+
+2. Navigate to **Enterprise Applications** and then select the **All Applications** option.
+
+	![The Enterprise applications blade](common/enterprise-applications.png)
+
+3. To add new application, click **New application** button on the top of dialog.
+
+	![The New application button](common/add-new-app.png)
+
+4. In the search box, type **Netop Portal**, select **Netop Portal** from result panel then click **Add** button to add the application.
+
+	 ![Netop Portal in the results list](common/search-new-app.png)
+
+## Configure and test Azure AD single sign-on
+
+In this section, you configure and test Azure AD single sign-on with Netop Portal based on a test user called **Britta Simon**.
+For single sign-on to work, a link relationship between an Azure AD user and the related user in Netop Portal needs to be established.
+
+To configure and test Azure AD single sign-on with Netop Portal, you need to complete the following building blocks:
+
+1. **[Configure Azure AD Single Sign-On](#configure-azure-ad-single-sign-on)** - to enable your users to use this feature.
+2. **[Configure Netop Portal Single Sign-On](#configure-netop-portal-single-sign-on)** - to configure the Single Sign-On settings on application side.
+3. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with Britta Simon.
+4. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable Britta Simon to use Azure AD single sign-on.
+5. **[Create Netop Portal test user](#create-netop-portal-test-user)** - to have a counterpart of Britta Simon in Netop Portal that is linked to the Azure AD representation of user.
+6. **[Test single sign-on](#test-single-sign-on)** - to verify whether the configuration works.
+
+### Configure Azure AD single sign-on
+
+In this section, you enable Azure AD single sign-on in the Azure portal.
+
+To configure Azure AD single sign-on with Netop Portal, perform the following steps:
+
+1. In the [Azure portal](https://portal.azure.com/), on the **Netop Portal** application integration page, select **Single sign-on**.
+
+    ![Configure single sign-on link](common/select-sso.png)
+
+2. On the **Select a Single sign-on method** dialog, select **SAML/WS-Fed** mode to enable single sign-on.
+
+    ![Single sign-on select mode](common/select-saml-option.png)
+
+3. On the **Set up Single Sign-On with SAML** page, click **Edit** icon to open **Basic SAML Configuration** dialog.
+
+	![Edit Basic SAML Configuration](common/edit-urls.png)
+
+4. On the **Basic SAML Configuration** section, the user does not have to perform any step as the app is already pre-integrated with Azure.
+
+    ![Netop Portal Domain and URLs single sign-on information](common/preintegrated.png)
+
+5. Your Netop Portal application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your SAML token attributes configuration. The following screenshot shows the list of default attributes. Click **Edit** icon to open User Attributes dialog.
+
+	![image](common/edit-attribute.png)
+
+6. In addition to above, Netop Portal application expects few more attributes to be passed back in SAML response. In the **User Claims** section on the **User Attributes** dialog, perform the following steps to add SAML token attribute as shown in the below table:
+
+	| Name |  Source Attribute|
+	| ---------------| --------- |
+	| NRC-ACCOUNT-ID | "adfs-demo" |
+	| NRC-EMAIL | user.userprincipalname |
+	| NRC-GIVEN-NAME | user.givenname |
+	| NRC-SURNAME | user.surname |
+	| NRC-USERNAME | user.userprincipalname |
+	| nameidentifier | user.userprincipalname |
+	| | |
+
+	a. Click **Add new claim** to open the **Manage user claims** dialog.
+
+	![image](common/new-save-attribute.png)
+
+	![image](common/new-attribute-details.png)
+
+	b. In the **Name** textbox, type the attribute name shown for that row.
+
+	c. Leave the **Namespace** blank.
+
+	d. Select Source as **Attribute**.
+
+	e. From the **Source attribute** list, type the attribute value shown for that row.
+
+	f. Click **Ok**
+
+	g. Click **Save**.
+
+7. On the **Set up Single Sign-On with SAML** page, in the **SAML Signing Certificate** section, click **Download** to download the **Federation Metadata XML** from the given options as per your requirement and save it on your computer.
+
+	![The Certificate download link](common/metadataxml.png)
+
+8. On the **Set up Netop Portal** section, copy the appropriate URL(s) as per your requirement.
+
+	![Copy configuration URLs](common/copy-configuration-urls.png)
+
+	a. Login URL
+
+	b. Azure Ad Identifier
+
+	c. Logout URL
+
+### Configure Netop Portal Single Sign-On
+
+To configure single sign-on on **Netop Portal** side, you need to send the downloaded **Federation Metadata XML** and appropriate copied URLs from Azure portal to [Netop Portal support team](mailto:casemanager@netop.com). They set this setting to have the SAML SSO connection set properly on both sides.
+
+### Create an Azure AD test user
+
+The objective of this section is to create a test user in the Azure portal called Britta Simon.
+
+1. In the Azure portal, in the left pane, select **Azure Active Directory**, select **Users**, and then select **All users**.
+
+    ![The "Users and groups" and "All users" links](common/users.png)
+
+2. Select **New user** at the top of the screen.
+
+    ![New user Button](common/new-user.png)
+
+3. In the User properties, perform the following steps.
+
+    ![The User dialog box](common/user-properties.png)
+
+    a. In the **Name** field, enter **BrittaSimon**.
+
+    b. In the **User name** field, type **brittasimon@yourcompanydomain.extension**  
+    For example, BrittaSimon@contoso.com
+
+    c. Select **Show password** check box, and then write down the value that's displayed in the Password box.
+
+    d. Click **Create**.
+
+### Assign the Azure AD test user
+
+In this section, you enable Britta Simon to use Azure single sign-on by granting access to Netop Portal.
+
+1. In the Azure portal, select **Enterprise Applications**, select **All applications**, then select **Netop Portal**.
+
+	![Enterprise applications blade](common/enterprise-applications.png)
+
+2. In the applications list, select **Netop Portal**.
+
+	![The Netop Portal link in the Applications list](common/all-applications.png)
+
+3. In the menu on the left, select **Users and groups**.
+
+    ![The "Users and groups" link](common/users-groups-blade.png)
+
+4. Click the **Add user** button, then select **Users and groups** in the **Add Assignment** dialog.
+
+    ![The Add Assignment pane](common/add-assign-user.png)
+
+5. In the **Users and groups** dialog, select **Britta Simon** in the Users list, then click the **Select** button at the bottom of the screen.
+
+6. If you are expecting any role value in the SAML assertion then in the **Select Role** dialog select the appropriate role for the user from the list, then click the **Select** button at the bottom of the screen.
+
+7. In the **Add Assignment** dialog, click the **Assign** button.
+
+### Create Netop Portal test user
+
+In this section, you create a user called Britta Simon in Netop Portal. Work with [Netop Portal support team](mailto:casemanager@netop.com) to add the users in the Netop Portal platform. Users must be created and activated before you use single sign-on.
+
+### Test single sign-on
+
+In this section, you test your Azure AD single sign-on configuration using the Access Panel.
+
+When you click the Netop Portal tile in the Access Panel, you should be automatically signed in to the Netop Portal for which you set up SSO. For more information about the Access Panel, see [Introduction to the Access Panel](https://docs.microsoft.com/azure/active-directory/active-directory-saas-access-panel-introduction).
+
+## Additional Resources
+
+- [ List of Tutorials on How to Integrate SaaS Apps with Azure Active Directory ](https://docs.microsoft.com/azure/active-directory/active-directory-saas-tutorial-list)
+
+- [What is application access and single sign-on with Azure Active Directory? ](https://docs.microsoft.com/azure/active-directory/active-directory-appssoaccess-whatis)
+
+- [What is conditional access in Azure Active Directory?](https://docs.microsoft.com/azure/active-directory/conditional-access/overview)