AMBARI-18597. Rename service to "Microsoft R Server" and component to "Microsoft R Node Client". (Balazs Bence Sari via stoader)

15 files changed, 42 insertions, 42 deletions

diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
index 2c084d6887..f5273fc778 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py
@@ -177,7 +177,7 @@ def create_dirs():
 
 def create_microsoft_r_dir():
   import params
-  if 'MICROSOFT_R_SERVER_CLIENT' in params.component_list and params.default_fs:
+  if 'MICROSOFT_R_NODE_CLIENT' in params.component_list and params.default_fs:
     directory = '/user/RevoShare'
     try:
       params.HdfsResource(directory,
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/role_command_order.json b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/role_command_order.json
deleted file mode 100755
index 6edbc2c11e..0000000000
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/role_command_order.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "general_deps" : {
-    "_comment" : "dependencies for Microsoft R",
-    "MICROSOFT_R_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START"]
-  }
-}
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/kerberos.json b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/kerberos.json
index 86fab2df0e..6e4aa4caa0 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/kerberos.json
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/kerberos.json
@@ -1,7 +1,7 @@
 {
   "services": [
     {
-      "name": "MICROSOFT_R",
+      "name": "MICROSOFT_R_SERVER",
       "identities": [
         {
           "name": "/HDFS/NAMENODE/hdfs"
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/metainfo.xml b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/metainfo.xml
index 6c5f062716..9f29864396 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/metainfo.xml
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/metainfo.xml
@@ -20,19 +20,19 @@
   <schemaVersion>2.0</schemaVersion>
   <services>
     <service>
-      <name>MICROSOFT_R</name>
-      <displayName>Microsoft R</displayName>
+      <name>MICROSOFT_R_SERVER</name>
+      <displayName>Microsoft R Server</displayName>
       <comment>Microsoft R Server</comment>
       <version>8.0.5</version>
 
       <components>
         <component>
-          <name>MICROSOFT_R_SERVER_CLIENT</name>
-          <displayName>Microsoft R Server Client</displayName>
+          <name>MICROSOFT_R_NODE_CLIENT</name>
+          <displayName>Microsoft R Node Client</displayName>
           <category>CLIENT</category>
           <cardinality>1+</cardinality>
           <commandScript>
-            <script>scripts/microsoft_r.py</script>
+            <script>scripts/microsoft_r_server.py</script>
             <scriptType>PYTHON</scriptType>
             <timeout>1200</timeout>
           </commandScript>
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/files/microsoft_r_serviceCheck.r b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/files/microsoft_r_server_serviceCheck.r
index e75c598eeb..e75c598eeb 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/files/microsoft_r_serviceCheck.r
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/files/microsoft_r_server_serviceCheck.r
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/microsoft_r.py b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/microsoft_r_server.py
index f6eb33ec7c..223cbd8871 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/microsoft_r.py
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/microsoft_r_server.py
@@ -22,17 +22,17 @@ from resource_management.core.logger import Logger
 from resource_management.core.resources import Package
 
 
-class MicrosoftR(Script):
+class MicrosoftRServer(Script):
 
   def install(self, env):
-    Logger.info('Installing R Server Client...')
+    Logger.info('Installing R Node Client...')
     tmp_dir = Script.tmp_dir
     Logger.debug('Using temp dir: {0}'.format(tmp_dir))
     self.install_packages(env)
-    Logger.info('Installed R Server')
+    Logger.info('Installed R Node Client')
 
   def configure(self, env):
     Logger.info('Configure R Server. Nothing to do.')
 
 if __name__ == "__main__":
-  MicrosoftR().execute()
+  MicrosoftRServer().execute()
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params.py b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/params.py
index aa207979f1..aa207979f1 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params.py
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/params.py
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params_linux.py b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/params_linux.py
index 71f17b6664..71f17b6664 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params_linux.py
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/params_linux.py
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params_windows.py b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/params_windows.py
index 3eca213611..3eca213611 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params_windows.py
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/params_windows.py
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/service_check.py b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/service_check.py
index 5368e940ab..57b668180e 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/service_check.py
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/package/scripts/service_check.py
@@ -30,11 +30,11 @@ from resource_management.libraries.script.script import Script
 from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
 
 
-class MicrosoftRServiceCheck(Script):
+class MicrosoftRServerServiceCheck(Script):
   pass
 
 @OsFamilyImpl(os_family=OsFamilyImpl.DEFAULT)
-class MicrosoftRServiceCheckLinux(MicrosoftRServiceCheck):
+class MicrosoftRServerServiceCheckLinux(MicrosoftRServerServiceCheck):
   def service_check(self, env):
     import params
     env.set_params(params)
@@ -55,14 +55,14 @@ class MicrosoftRServiceCheckLinux(MicrosoftRServiceCheck):
         user=params.smokeuser
       )
 
-    output_file = format('{tmp_dir}/microsoft_r_serviceCheck.out')
+    output_file = format('{tmp_dir}/microsoft_r_server_serviceCheck.out')
 
-    File( format("{tmp_dir}/microsoft_r_serviceCheck.r"),
-      content = StaticFile("microsoft_r_serviceCheck.r"),
+    File( format("{tmp_dir}/microsoft_r_server_serviceCheck.r"),
+      content = StaticFile("microsoft_r_server_serviceCheck.r"),
       mode = 0755
     )
 
-    Execute( format("Revo64 --no-save  < {tmp_dir}/microsoft_r_serviceCheck.r | tee {output_file}"),
+    Execute( format("Revo64 --no-save  < {tmp_dir}/microsoft_r_server_serviceCheck.r | tee {output_file}"),
       tries     = 1,
       try_sleep = 1,
       path      = format('/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin'),
@@ -86,4 +86,4 @@ class MicrosoftRServiceCheckLinux(MicrosoftRServiceCheck):
 
 
 if __name__ == "__main__":
-  MicrosoftRServiceCheck().execute()
+  MicrosoftRServerServiceCheck().execute()
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/role_command_order.json b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/role_command_order.json
new file mode 100755
index 0000000000..c24ae3123b
--- /dev/null
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/role_command_order.json
@@ -0,0 +1,6 @@
+{
+  "general_deps" : {
+    "_comment" : "dependencies for Microsoft R Server",
+    "MICROSOFT_R_SERVER_SERVICE_CHECK-SERVICE_CHECK": ["NODEMANAGER-START"]
+  }
+}
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/service_advisor.py b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/service_advisor.py
index d48afec000..0ecc3103c6 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/service_advisor.py
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R_SERVER/8.0.5/service_advisor.py
@@ -34,22 +34,22 @@ except Exception as e:
   traceback.print_exc()
   print "Failed to load parent"
 
-class MICROSOFT_R805ServiceAdvisor(service_advisor.ServiceAdvisor):
+class MICROSOFT_R_SERVER805ServiceAdvisor(service_advisor.ServiceAdvisor):
 
   def colocateService(self, hostsComponentsMap, serviceComponents):
-    # colocate R_SERVER_CLIENT with NODEMANAGERs and YARN_CLIENTs
-    rClientComponent = [component for component in serviceComponents if component["StackServiceComponents"]["component_name"] == "MICROSOFT_R_SERVER_CLIENT"]
+    # colocate R_NODE_CLIENT with NODEMANAGERs and YARN_CLIENTs
+    rClientComponent = [component for component in serviceComponents if component["StackServiceComponents"]["component_name"] == "MICROSOFT_R_NODE_CLIENT"]
     traceback.print_tb(None)
     rClientComponent = rClientComponent[0]
     if not self.isComponentHostsPopulated(rClientComponent):
       for hostName in hostsComponentsMap.keys():
         hostComponents = hostsComponentsMap[hostName]
         if ({"name": "NODEMANAGER"} in hostComponents or {"name": "YARN_CLIENT"} in hostComponents) \
-            and {"name": "MICROSOFT_R_SERVER_CLIENT"} not in hostComponents:
-          hostsComponentsMap[hostName].append({ "name": "MICROSOFT_R_SERVER_CLIENT" })
+            and {"name": "MICROSOFT_R_NODE_CLIENT"} not in hostComponents:
+          hostsComponentsMap[hostName].append({ "name": "MICROSOFT_R_NODE_CLIENT" })
         if ({"name": "NODEMANAGER"} not in hostComponents and {"name": "YARN_CLIENT"} not in hostComponents) \
-            and {"name": "MICROSOFT_R_SERVER_CLIENT"} in hostComponents:
-          hostsComponentsMap[hostName].remove({"name": "MICROSOFT_R_SERVER_CLIENT"})
+            and {"name": "MICROSOFT_R_NODE_CLIENT"} in hostComponents:
+          hostsComponentsMap[hostName].remove({"name": "MICROSOFT_R_NODE_CLIENT"})
 
   def getServiceComponentLayoutValidations(self, services, hosts):
     componentsListList = [service["components"] for service in services["services"]]
@@ -57,17 +57,17 @@ class MICROSOFT_R805ServiceAdvisor(service_advisor.ServiceAdvisor):
     hostsList = [host["Hosts"]["host_name"] for host in hosts["items"]]
     hostsCount = len(hostsList)
 
-    rClientHosts = self.getHosts(componentsList, "MICROSOFT_R_SERVER_CLIENT")
+    rClientHosts = self.getHosts(componentsList, "MICROSOFT_R_NODE_CLIENT")
     expectedrClientHosts = set(self.getHosts(componentsList, "NODEMANAGER")) | set(self.getHosts(componentsList, "YARN_CLIENT"))
 
     items = []
 
-    # Generate WARNING if any R_SERVER_CLIENT is not colocated with NODEMANAGER or YARN_CLIENT
+    # Generate WARNING if any R_NODE_CLIENT is not colocated with NODEMANAGER or YARN_CLIENT
     mismatchHosts = sorted(expectedrClientHosts.symmetric_difference(set(rClientHosts)))
     if len(mismatchHosts) > 0:
       hostsString = ', '.join(mismatchHosts)
-      message = "Microsoft R Server Client must be installed on NodeManagers and YARN Clients. " \
+      message = "Microsoft R Node Client must be installed on NodeManagers and YARN Clients. " \
                 "The following {0} host(s) do not satisfy the colocation recommendation: {1}".format(len(mismatchHosts), hostsString)
-      items.append( { "type": 'host-component', "level": 'WARN', "message": message, "component-name": 'MICROSOFT_R_SERVER_CLIENT' } )
+      items.append( { "type": 'host-component', "level": 'WARN', "message": message, "component-name": 'MICROSOFT_R_NODE_CLIENT' } )
 
     return items
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/metainfo.xml b/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R_SERVER/8.0.5/metainfo.xml
index 9470d22bd8..9d4f920f0f 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/metainfo.xml
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R_SERVER/8.0.5/metainfo.xml
@@ -20,8 +20,8 @@
   <schemaVersion>2.0</schemaVersion>
   <services>
     <service>
-      <name>MICROSOFT_R</name>
-      <extends>common-services/MICROSOFT_R/8.0.5</extends>
+      <name>MICROSOFT_R_SERVER</name>
+      <extends>common-services/MICROSOFT_R_SERVER/8.0.5</extends>
       <version>8.0.5.0</version>
       <osSpecifics>
         <osSpecific>
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/repos/repoinfo.xml b/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R_SERVER/8.0.5/repos/repoinfo.xml
index fac533d9cf..fac533d9cf 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/repos/repoinfo.xml
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R_SERVER/8.0.5/repos/repoinfo.xml
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json b/contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json
index eb7076c300..d874db34a4 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json
@@ -1,8 +1,8 @@
 {
   "type": "full-release",
-  "name": "microsoft_r-ambari.mpack",
+  "name": "microsoft_r_server-ambari.mpack",
   "version": "1.0.0.0",
-  "description": "Ambari Management Pack for Microsoft R",
+  "description": "Ambari Management Pack for Microsoft R Server",
   "prerequisites": {
     "min-ambari-version": "2.2.0.0",
     "min-stack-versions": [
@@ -14,17 +14,17 @@
   },
   "artifacts": [
     {
-      "name": "MICROSOFT_R-common-services",
+      "name": "MICROSOFT_R_SERVER-common-services",
       "type" : "service-definitions",
       "source_dir" : "common-services"
     },
     {
-      "name" : "MICROSOFT_R-custom-services",
+      "name" : "MICROSOFT_R_SERVER-custom-services",
       "type" : "stack-addon-service-definitions",
       "source_dir": "custom-services",
       "service_versions_map": [
         {
-          "service_name" : "MICROSOFT_R",
+          "service_name" : "MICROSOFT_R_SERVER",
           "service_version" : "8.0.5",
           "applicable_stacks" : [
             {