ambari git commit: AMBARI-21854 Adapt Repository Files For Existing Deployments (dgrinenko)

[hapylestat]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 415862712 -> 6bfcb838e


AMBARI-21854 Adapt Repository Files For Existing Deployments (dgrinenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6bfcb838
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6bfcb838
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6bfcb838

Branch: refs/heads/branch-2.6
Commit: 6bfcb838e710c3389f7a804a7cdb620a3e465e15
Parents: 4158627
Author: Dmytro Grinenko 
Authored: Fri Oct 6 11:43:26 2017 +0300
Committer: Dmytro Grinenko 
Committed: Fri Oct 6 11:43:26 2017 +0300

--
 .../core/providers/package/__init__.py  |  2 +-
 .../core/providers/package/apt.py   | 23 --
 .../core/providers/package/yumrpm.py| 82 ++-
 .../core/providers/package/zypper.py| 37 +++--
 .../libraries/functions/repository_util.py  | 79 ++
 .../libraries/script/script.py  |  3 +-
 .../ambari/server/agent/CommandRepository.java  | 85 
 .../ambari/server/agent/ExecutionCommand.java   |  1 +
 .../server/configuration/Configuration.java | 13 +++
 .../controller/AmbariActionExecutionHelper.java |  1 -
 .../AmbariCustomCommandExecutionHelper.java | 17 +++-
 .../orm/entities/RepositoryVersionEntity.java   | 27 +++
 .../stack/upgrade/RepositoryVersionHelper.java  | 21 -
 .../server/upgrade/UpgradeCatalog260.java   | 13 +++
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  1 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 +
 .../custom_actions/scripts/install_packages.py  |  5 +-
 ...ClusterStackVersionResourceProviderTest.java |  2 +
 .../configs/install_packages_config.json|  1 +
 .../install_packages_repository_file.json   |  1 +
 24 files changed, 339 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6bfcb838/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
 
b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
index 13cb784..e531f3d 100644
--- 
a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
+++ 
b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
@@ -69,7 +69,7 @@ class PackageProvider(Provider):
   def get_available_packages_in_repos(self, repositories):
 """
 Gets all (both installed and available) packages that are available at 
given repositories.
-:param repositories: from command configs like 
config['repositoryFile']['repositories']
+:type repositories 
resource_management.libraries.functions.repository_util.CommandRepository
 :return: installed and available packages from these repositories
 """
 raise NotImplementedError()

http://git-wip-us.apache.org/repos/asf/ambari/blob/6bfcb838/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
 
b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
index 5fcb945..7f3563e 100644
--- 
a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
+++ 
b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
@@ -275,24 +275,31 @@ class AptProvider(PackageProvider):
 
 return packages
 
-  def get_available_packages_in_repos(self, repositories):
+  def get_available_packages_in_repos(self, repos):
 """
 Gets all (both installed and available) packages that are available at 
given repositories.
-:param repositories: from command configs like 
config['repositoryFile']['repositories']
+:type repos 
resource_management.libraries.functions.repository_util.CommandRepository
 :return: installed and available packages from these repositories
 """
 
 filtered_packages = []
 packages = self.all_available_packages()
+repo_ids = []
 
-for repo in repositories:
-  repo_url_part = repo['baseUrl'].replace("http://;, "").replace("/", "_")
+for repo in repos.items:
+  repo_ids.append(repo.base_url.replace("http://;, "").replace("/", "_"))
 
-  for package in packages:
-if 

ambari git commit: AMBARI-21854. Adapt Repository Files For Existing Deployments (dgrinenko via dlysnichenko)

[dmitriusan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 f64d027db -> 412c6cac4


AMBARI-21854. Adapt Repository Files For Existing Deployments (dgrinenko via 
dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/412c6cac
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/412c6cac
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/412c6cac

Branch: refs/heads/branch-2.6
Commit: 412c6cac4416cb676046dd6792ccb962441febf5
Parents: f64d027
Author: Lisnichenko Dmitro 
Authored: Wed Sep 20 12:45:25 2017 +0300
Committer: Lisnichenko Dmitro 
Committed: Wed Sep 20 16:20:54 2017 +0300

--
 .../core/providers/package/__init__.py  |  2 +-
 .../core/providers/package/apt.py   | 23 --
 .../core/providers/package/yumrpm.py| 82 +--
 .../core/providers/package/zypper.py| 37 +++--
 .../libraries/functions/repository_util.py  | 77 ++
 .../libraries/script/script.py  |  3 +-
 .../ambari/server/agent/CommandRepository.java  | 85 
 .../ambari/server/agent/ExecutionCommand.java   |  1 +
 .../server/configuration/Configuration.java | 13 +++
 .../controller/AmbariActionExecutionHelper.java |  1 -
 .../AmbariCustomCommandExecutionHelper.java | 17 +++-
 .../orm/entities/RepositoryVersionEntity.java   | 27 +++
 .../stack/upgrade/RepositoryVersionHelper.java  | 21 -
 .../server/upgrade/UpgradeCatalog260.java   | 14 
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  1 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 +
 .../custom_actions/scripts/install_packages.py  |  4 +-
 21 files changed, 333 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/412c6cac/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
 
b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
index 84ff9cc..fba16cf 100644
--- 
a/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
+++ 
b/ambari-common/src/main/python/resource_management/core/providers/package/__init__.py
@@ -69,7 +69,7 @@ class PackageProvider(Provider):
   def get_available_packages_in_repos(self, repositories):
 """
 Gets all (both installed and available) packages that are available at 
given repositories.
-:param repositories: from command configs like 
config['repositoryFile']['repositories']
+:type repositories 
resource_management.libraries.functions.repository_util.CommandRepository
 :return: installed and available packages from these repositories
 """
 raise NotImplementedError()

http://git-wip-us.apache.org/repos/asf/ambari/blob/412c6cac/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
 
b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
index 65caeff..6517da2 100644
--- 
a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
+++ 
b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
@@ -274,24 +274,31 @@ class AptProvider(PackageProvider):
 
 return packages
 
-  def get_available_packages_in_repos(self, repositories):
+  def get_available_packages_in_repos(self, repos):
 """
 Gets all (both installed and available) packages that are available at 
given repositories.
-:param repositories: from command configs like 
config['repositoryFile']['repositories']
+:type repos 
resource_management.libraries.functions.repository_util.CommandRepository
 :return: installed and available packages from these repositories
 """
 
 filtered_packages = []
 packages = self.all_available_packages()
+repo_ids = []
 
-for repo in repositories:
-  repo_url_part = repo['baseUrl'].replace("http://;, "").replace("/", "_")
+for repo in repos.items:
+  repo_ids.append(repo.base_url.replace("http://;, "").replace("/", "_"))
 
-  for package in packages:
-if repo_url_part in package[2]:
-  filtered_packages.append(package[0])
+if repos.feat.scoped:
+