Use platform version to determine compatibility

Change-Id: I75ae8d5dbfa1c8cc10d444674a1be03fb8a178cd
(cherry picked from commit fcb6739083)

deployment_scripts/compute_post_deployment.py

@@ -214,9 +214,9 @@ def check_host_compatibility(himn, username):
                     'xe patch-list name-label=%s --minimal' % hotfix)
     ver = ssh(himn, username,
               ('xe host-param-get uuid=$(xe host-list --minimal) '
-               'param-name=software-version param-key=product_version_text'))
+               'param-name=software-version param-key=platform_version'))
 
-    if not installed and ver == "6.5":
+    if not installed and ver[:3] == "1.8":
         reportError(('Hotfix %s has not been installed '
                      'and product version is %s') % (hotfix, ver))
 
@@ -462,8 +462,8 @@ def patch_neutron_ovs_agent():
 def apply_sm_patch(himn, username):
     ver = ssh(himn, username,
               ('xe host-param-get uuid=$(xe host-list --minimal) '
-               'param-name=software-version param-key=product_version_text'))
-    if ver == "6.5":
+               'param-name=software-version param-key=platform_version'))
+    if ver[:3] == "1.8":
         ssh(himn, username,
             "sed -i s/\\'phy\\'/\\'aio\\'/g /opt/xensource/sm/ISCSISR.py")
 

deployment_scripts/fuelplugin-utils/build-xenserver-suppack.sh

@@ -27,7 +27,7 @@ mkdir -p xenserver-suppack && cd xenserver-suppack
 # Configurable items
 
 # xenserver version info
-XS_VERSION=${1:-"6.5"}
+PLATFORM_VERSION=${1:-"1.8"}
 XS_BUILD=${2:-"90233c"}
 
 # branch info
@@ -117,13 +117,13 @@ parser.add_option('--bld', dest="build")
 parser.add_option('--out', dest="outdir")
 (options, args) = parser.parse_args()
 
-xs = Requires(originator='xs', name='main', test='ge',
-               product='XenServer', version='$XS_VERSION',
+xcp = Requires(originator='xcp', name='main', test='ge',
+               product='XenServer', version='$PLATFORM_VERSION',
                build='$XS_BUILD')
 
-setup(originator='xs', name='xenserverplugins-$OS_RELEASE', product='XenServer',
+setup(originator='xcp', name='xenserverplugins-$OS_RELEASE', product='XenServer',
       version=options.product_version, build=options.build, vendor='Citrix Systems, Inc.',
-      description="OpenStack XenServer Plugins", packages=args, requires=[xs],
+      description="OpenStack XenServer Plugins", packages=args, requires=[xcp],
       outdir=options.outdir, output=['iso'])
 EOF
 

metadata.yaml

@@ -3,7 +3,7 @@ name: fuel-plugin-xenserver
 # Human-readable name for your plugin
 title: XenServer Plugin
 # Plugin version
-version: '3.90.3'
+version: '3.90.4'
 # Description
 description: Enable Mirantis OpenStack to integrate with Xenserver
 # Required fuel version