Merge branch 'develop' into feature/apiddubny_rename_cloud_provider_m…

…odel
QualiSystems · Dec 21, 2016 · 692cce3 · 692cce3
2 parents 55c7e77 + 3b301ee
commit 692cce3
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 3 deletions.
diff --git a/drivers/azure_shellPackage/DataModel/Azure.png b/drivers/azure_shellPackage/DataModel/Azure.png
diff --git a/drivers/azure_shellPackage/DataModel/AzureCustomImage.png b/drivers/azure_shellPackage/DataModel/AzureCustomImage.png
diff --git a/drivers/azure_shellPackage/DataModel/AzureMarketplaceImage.png b/drivers/azure_shellPackage/DataModel/AzureMarketplaceImage.png
diff --git a/drivers/azure_shellPackage/DataModel/DeploymentTypes-AWS-EC2.png b/drivers/azure_shellPackage/DataModel/DeploymentTypes-AWS-EC2.png
diff --git a/drivers/azure_shellPackage/DataModel/datamodel.xml b/drivers/azure_shellPackage/DataModel/datamodel.xml
@@ -251,8 +251,7 @@
       <AttachedAttributes />
       <AttributeValues />
       <Models>
-        <ResourceModel Description="" Name="Azure VM from Marketplace" ImagePath="" SupportsConcurrentCommands="false">
-          <AttachedAttributes>
+        <ResourceModel Description="" Name="Azure VM From Marketplace" ImagePath="AzureMarketplaceImage.png" SupportsConcurrentCommands="false">          <AttachedAttributes>
             <AttachedAttribute IsLocal="true" IsOverridable="true" Name="Cloud Provider" UserInput="true">
               <AllowedValues />
             </AttachedAttribute>
@@ -304,7 +303,7 @@
             <DriverName>Azure Deploy VM Driver</DriverName>
           </Drivers>
         </ResourceModel>
-        <ResourceModel Description="" Name="Azure VM From Custom Image" ImagePath="" SupportsConcurrentCommands="false">
+        <ResourceModel Description="" Name="Azure VM From Custom Image" ImagePath="AzureCustomImage.png" SupportsConcurrentCommands="false">
           <AttachedAttributes>
             <AttachedAttribute IsLocal="true" IsOverridable="true" Name="Cloud Provider" UserInput="true">
               <AllowedValues />