Hello community,
here is the log from the commit of package python-saharaclient for openSUSE:Factory checked in at 2015-10-30 13:42:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-saharaclient (Old)
and /work/SRC/openSUSE:Factory/.python-saharaclient.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-saharaclient"
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-saharaclient/python-saharaclient.changes 2015-09-17 09:22:00.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-saharaclient.new/python-saharaclient.changes 2015-10-30 13:42:37.000000000 +0100
@@ -1,0 +2,14 @@
+Sun Oct 4 07:41:24 UTC 2015 - tbechtold@suse.com
+
+- update to 0.11.1:
+ * Updating saharaclient api docs
+ * Updated from global requirements
+ * Change ignore-errors to ignore_errors
+ * Fixing cluster and node group template updates
+ * Remove `data source update` from setup.cfg
+ * Adding missed public/protected support for jobs creation
+ * Fix functional tests in saharaclient
+ * Update .gitreview for stable/liberty
+- adjust Requires according to requirements.txt
+
+-------------------------------------------------------------------
Old:
----
python-saharaclient-0.11.0.tar.gz
New:
----
python-saharaclient-0.11.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-saharaclient.spec ++++++
--- /var/tmp/diff_new_pack.TU0xYZ/_old 2015-10-30 13:42:37.000000000 +0100
+++ /var/tmp/diff_new_pack.TU0xYZ/_new 2015-10-30 13:42:37.000000000 +0100
@@ -19,7 +19,7 @@
%define component saharaclient
Name: python-%{component}
-Version: 0.11.0
+Version: 0.11.1
Release: 0
Summary: Openstack Data Processing (Savanna) API Client
License: Apache-2.0
@@ -38,10 +38,12 @@
Requires: python >= 2.6.8
Requires: python-Babel >= 1.3
Requires: python-PrettyTable >= 0.7
+Requires: python-cliff >= 1.14.0
Requires: python-keystoneclient >= 1.6.0
Requires: python-netaddr >= 0.7.12
Requires: python-neutronclient >= 2.6.0
-Requires: python-novaclient >= 2.26.0
+Requires: python-novaclient >= 2.28.1
+Requires: python-openstackclient >= 1.5.0
Requires: python-oslo.config >= 2.3.0
Requires: python-oslo.i18n >= 1.5.0
Requires: python-oslo.utils >= 2.0.0
@@ -71,7 +73,7 @@
%endif
Requires: python-mock >= 1.2
Requires: python-requests-mock >= 0.6.0
-Requires: python-tempest-lib >= 0.6.1
+Requires: python-tempest-lib >= 0.8.0
Requires: python-testrepository >= 0.0.18
%description test
++++++ python-saharaclient-0.11.0.tar.gz -> python-saharaclient-0.11.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/.coveragerc new/python-saharaclient-0.11.1/.coveragerc
--- old/python-saharaclient-0.11.0/.coveragerc 2015-09-01 19:30:56.000000000 +0200
+++ new/python-saharaclient-0.11.1/.coveragerc 2015-09-29 01:38:45.000000000 +0200
@@ -10,4 +10,4 @@
source = saharaclient
[report]
-ignore-errors = True
+ignore_errors = True
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/AUTHORS new/python-saharaclient-0.11.1/AUTHORS
--- old/python-saharaclient-0.11.0/AUTHORS 2015-09-01 19:31:47.000000000 +0200
+++ new/python-saharaclient-0.11.1/AUTHORS 2015-09-29 01:39:44.000000000 +0200
@@ -20,6 +20,7 @@
Michael McCune
Mina Park
Minkyung Maisy Kim
+Monty Taylor
Nikita Konovalov
Nikolay Mahotkin
Pavlo Shchelokovskyy
@@ -31,6 +32,7 @@
Sergey Reshetnyak
Sergey Reshetnyak
Shrirang Phadke
+Steve Martinelli
Telles Nobrega
Tetiana Lashchova
Trevor McKay
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/ChangeLog new/python-saharaclient-0.11.1/ChangeLog
--- old/python-saharaclient-0.11.0/ChangeLog 2015-09-01 19:31:47.000000000 +0200
+++ new/python-saharaclient-0.11.1/ChangeLog 2015-09-29 01:39:44.000000000 +0200
@@ -1,6 +1,18 @@
CHANGES
=======
+0.11.1
+------
+
+* Updating saharaclient api docs
+* Updated from global requirements
+* Change ignore-errors to ignore_errors
+* Fixing cluster and node group template updates
+* Remove `data source update` from setup.cfg
+* Adding missed public/protected support for jobs creation
+* Fix functional tests in saharaclient
+* Update .gitreview for stable/liberty
+
0.11.0
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/PKG-INFO new/python-saharaclient-0.11.1/PKG-INFO
--- old/python-saharaclient-0.11.0/PKG-INFO 2015-09-01 19:31:47.000000000 +0200
+++ new/python-saharaclient-0.11.1/PKG-INFO 2015-09-29 01:39:45.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-saharaclient
-Version: 0.11.0
+Version: 0.11.1
Summary: Client library for Sahara API
Home-page: https://github.com/openstack/python-saharaclient
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/doc/source/api.rst new/python-saharaclient-0.11.1/doc/source/api.rst
--- old/python-saharaclient-0.11.0/doc/source/api.rst 2015-09-01 19:30:56.000000000 +0200
+++ new/python-saharaclient-0.11.1/doc/source/api.rst 2015-09-29 01:38:45.000000000 +0200
@@ -24,6 +24,9 @@
* project_name - Keystone Tenant name.
* project_id - Keystone Tenant id.
* input_auth_token - Keystone authorization token.
+ * insecure - Allow insecure.
+ * auth - Keystone Authentication Plugin object.
+ * session - Keystone Session object.
**Important!**
It is not a mandatory rule to provide all of the parameters above. The minimum number should be enough
@@ -32,36 +35,28 @@
Authentication check
~~~~~~~~~~~~~~~~~~~~
-If a user already has a Keystone authentication token, it may be used in `input_auth_token` parameter.
+Passing authentication parameters to Sahara Client is deprecated. Keystone
+Session object should be used for this purpose. For example:
.. sourcecode:: python
- from saharaclient.api.client import Client as saharaclient
+ from keystoneclient.auth.identity import v2
+ from keystoneclient import session
+ from saharaclient import client
+
+ auth = v2.Password(auth_url=AUTH_URL,
+ username=USERNAME,
+ password=PASSWORD,
+ tenant_name=PROJECT_ID)
- sahara = saharaclient(sahara_url="http://sahara:8386/v1.1",
- project_id="11111111-2222-3333-4444-555555555555",
- input_auth_token="66666666-7777-8888-9999-000000000000")
-..
-
-In this case no other authentication parameters are required and `input_auth_token` has a higher
-priority than other parameters. Otherwise user has to provide:
-
- * auth_url
- * username
- * api_key
- * any of project_name or project_id
-
-.. sourcecode:: python
-
- from saharaclient.api.client import Client as saharaclient
+ ses = session.Session(auth=auth)
- sahara = saharaclient(auth_url="http://keystone:5000/v2.0",
- sahara_url="http://sahara:8386/v1.1",
- username="user",
- api_key="PaSsWoRd",
- project_name="demo-project")
+ sahara = client.Client('1.1', session=ses)
..
+For more information about Keystone Sessions, see `Using Sessions`_.
+
+.. _Using Sessions: http://docs.openstack.org/developer/python-keystoneclient/using-sessions.htm...
Sahara endpoint discovery
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -73,24 +68,22 @@
.. sourcecode:: python
- from saharaclient.api.client import Client as saharaclient
-
- sahara = saharaclient(auth_url="http://keystone:5000/v2.0",
- username="user",
- api_key="PaSsWoRd",
- project_name="demo-project",
- service_type="non-default-service-type",
- endpoint_type="internalURL")
+ from keystoneclient.auth.identity import v2
+ from keystoneclient import session
+ from saharaclient import client
+
+ auth = v2.Password(auth_url=AUTH_URL,
+ username=USERNAME,
+ password=PASSWORD,
+ tenant_name=PROJECT_ID)
+
+ ses = session.Session(auth=auth)
+
+ sahara = client.Client('1.1', session=ses,
+ service_type="non-default-service-type",
+ endpoint_type="internalURL")
..
-
-Tenant specification
-~~~~~~~~~~~~~~~~~~~~
-
-All Sahara operations should be performed in one of OpenStack tenants.
-There are two parameters: `project_name` and `project_id` which allow to specify a tenant.
-`project_id` parameter has a higher priority.
-
Object managers
---------------
Sahara Client has a list of fields to operate with:
@@ -104,6 +97,7 @@
* job_binaries
* job_binary_internals
* job_executions
+ * job_types
Each of this fields is a reference to a Manager for a corresponding group of REST calls.
@@ -133,42 +127,50 @@
Node Group Template ops
~~~~~~~~~~~~~~~~~~~~~~~
- * create(name, plugin_name, hadoop_version, flavor_id, description, volumes_per_node, volumes_size, node_processes, node_configs, floating_ip_pool, availability_zone, volumes_availability_zone) - Create a Node Group Template with specified parameters.
+ * create(name, plugin_name, hadoop_version, flavor_id, description, volumes_per_node, volumes_size, node_processes, node_configs, floating_ip_pool, security_groups, auto_security_group, availability_zone, volumes_availability_zone, volume_type, image_id, is_proxy_gateway, volume_local_to_instance, use_autoconfig, shares, is_public, is_protected) - Create a Node Group Template with specified parameters.
+ * update(ng_template_id, name, plugin_name, hadoop_version, flavor_id, description, volumes_per_node, volumes_size, node_processes, node_configs, floating_ip_pool, security_groups, auto_security_group, availability_zone, volumes_availability_zone, volume_type, image_id, is_proxy_gateway, volume_local_to_instance, use_autoconfig, shares, is_public, is_protected) - Update a Node Group Template with specified parameters.
Cluster Template ops
~~~~~~~~~~~~~~~~~~~~
- * create(name, plugin_name, hadoop_version, description, cluster_configs, node_groups, anti_affinity, net_id) - Create a Cluster Template with specified parameters.
+ * create(name, plugin_name, hadoop_version, description, cluster_configs, node_groups, anti_affinity, net_id, default_image_id, use_autoconfig, shares, is_public, is_protected) - Create a Cluster Template with specified parameters.
+ * update(cluster_template_id, name, plugin_name, hadoop_version, description, cluster_configs, node_groups, anti_affinity, net_id, default_image_id, use_autoconfig, shares, is_public, is_protected) - Update a Cluster Template with specified parameters.
Cluster ops
~~~~~~~~~~~
- * create(name, plugin_name, hadoop_version, cluster_template_id, default_image_id, is_transient, description, cluster_configs, node_groups, user_keypair_id, anti_affinity, net_id) - Launch a Cluster with specified parameters.
+ * create(name, plugin_name, hadoop_version, cluster_template_id, default_image_id, is_transient, description, cluster_configs, node_groups, user_keypair_id, anti_affinity, net_id, count, use_autoconfig, shares, is_public, is_protected) - Launch a Cluster with specified parameters.
* scale(cluster_id, scale_object) - Scale an existing Cluster. `scale_object` format is described in REST API doc.
+ * update(cluster_id, name, description, is_public, is_protected) - Update a Cluster with specified parameters.
Data Source ops
~~~~~~~~~~~~~~~
- * create(name, description, data_source_type, url, credential_user, credential_pass) - Create a Data Source with specified parameters.
+ * create(name, description, data_source_type, url, credential_user, credential_pass, is_public, is_protected) - Create a Data Source with specified parameters.
+ * update(data_source_id, update_data) - Update a Data Source with provided `data`.
Job Binary Internal ops
~~~~~~~~~~~~~~~~~~~~~~~
* create(name, data) - Create a Job Binary Internal from provided `data`.
+ * update(job_binary_id, name, is_public, is_protected) - Update a Job Binary Internal with specified parameters
Job Binary ops
~~~~~~~~~~~~~~
- * create(name, url, description, extra) - Create a Job Binary with specified parameters.
- * get_file(job_binary_id) - Download a Job Binary
+ * create(name, url, description, extra, is_public, is_protected) - Create a Job Binary with specified parameters.
+ * get_file(job_binary_id) - Download a Job Binary.
+ * update(job_binary_id, data) - Update Job Binary with provided `data`.
Job ops
~~~~~~~
- * create(name, type, mains, libs, description) - Create a Job with specified parameters.
+ * create(name, type, mains, libs, description, interface, is_public, is_protected) - Create a Job with specified parameters.
* get_configs(job_type) - Get config hints for a specified Job type.
+ * update(job_id, name, description, is_public, is_protected) - Update a Job with specified parameters.
Job Execution ops
~~~~~~~~~~~~~~~~~
- * create(job_id, cluster_id, input_id, output_id, configs) - Launch a Job with specified parameters.
+ * create(job_id, cluster_id, input_id, output_id, configs, interface, is_public, is_protected) - Launch a Job with specified parameters.
+ * update(obj_id, is_public, is_protected) - Update a Job Execution with specified parameters.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/python_saharaclient.egg-info/PKG-INFO new/python-saharaclient-0.11.1/python_saharaclient.egg-info/PKG-INFO
--- old/python-saharaclient-0.11.0/python_saharaclient.egg-info/PKG-INFO 2015-09-01 19:31:47.000000000 +0200
+++ new/python-saharaclient-0.11.1/python_saharaclient.egg-info/PKG-INFO 2015-09-29 01:39:44.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: python-saharaclient
-Version: 0.11.0
+Version: 0.11.1
Summary: Client library for Sahara API
Home-page: https://github.com/openstack/python-saharaclient
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/python_saharaclient.egg-info/entry_points.txt new/python-saharaclient-0.11.1/python_saharaclient.egg-info/entry_points.txt
--- old/python-saharaclient-0.11.0/python_saharaclient.egg-info/entry_points.txt 2015-09-01 19:31:47.000000000 +0200
+++ new/python-saharaclient-0.11.1/python_saharaclient.egg-info/entry_points.txt 2015-09-29 01:39:44.000000000 +0200
@@ -9,7 +9,6 @@
dataprocessing_data_source_delete = saharaclient.osc.v1.data_sources:DeleteDataSource
dataprocessing_data_source_list = saharaclient.osc.v1.data_sources:ListDataSources
dataprocessing_data_source_show = saharaclient.osc.v1.data_sources:ShowDataSource
-dataprocessing_data_source_update = saharaclient.osc.v1.data_sources:UpdateDataSource
dataprocessing_plugin_configs_get = saharaclient.osc.v1.plugins:GetPluginConfigs
dataprocessing_plugin_list = saharaclient.osc.v1.plugins:ListPlugins
dataprocessing_plugin_show = saharaclient.osc.v1.plugins:ShowPlugin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/python_saharaclient.egg-info/pbr.json new/python-saharaclient-0.11.1/python_saharaclient.egg-info/pbr.json
--- old/python-saharaclient-0.11.0/python_saharaclient.egg-info/pbr.json 2015-09-01 19:31:47.000000000 +0200
+++ new/python-saharaclient-0.11.1/python_saharaclient.egg-info/pbr.json 2015-09-29 01:39:44.000000000 +0200
@@ -1 +1 @@
-{"git_version": "d7dae5e", "is_release": true}
\ No newline at end of file
+{"git_version": "ec678db", "is_release": true}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/python_saharaclient.egg-info/requires.txt new/python-saharaclient-0.11.1/python_saharaclient.egg-info/requires.txt
--- old/python-saharaclient-0.11.0/python_saharaclient.egg-info/requires.txt 2015-09-01 19:31:47.000000000 +0200
+++ new/python-saharaclient-0.11.1/python_saharaclient.egg-info/requires.txt 2015-09-29 01:39:44.000000000 +0200
@@ -1,4 +1,4 @@
-pbr<2.0,>=1.6
+pbr>=1.6
Babel>=1.3
cliff>=1.14.0
netaddr!=0.7.16,>=0.7.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/requirements.txt new/python-saharaclient-0.11.1/requirements.txt
--- old/python-saharaclient-0.11.0/requirements.txt 2015-09-01 19:30:56.000000000 +0200
+++ new/python-saharaclient-0.11.1/requirements.txt 2015-09-29 01:38:45.000000000 +0200
@@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr<2.0,>=1.6
+pbr>=1.6
Babel>=1.3
cliff>=1.14.0 # Apache-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/saharaclient/api/cluster_templates.py new/python-saharaclient-0.11.1/saharaclient/api/cluster_templates.py
--- old/python-saharaclient-0.11.0/saharaclient/api/cluster_templates.py 2015-09-01 19:30:56.000000000 +0200
+++ new/python-saharaclient-0.11.1/saharaclient/api/cluster_templates.py 2015-09-29 01:38:45.000000000 +0200
@@ -23,11 +23,11 @@
class ClusterTemplateManager(base.ResourceManager):
resource_class = ClusterTemplate
- def _assign_field(self, name, plugin_name, hadoop_version,
- description=None, cluster_configs=None, node_groups=None,
- anti_affinity=None, net_id=None, default_image_id=None,
- use_autoconfig=None, shares=None, is_public=None,
- is_protected=None):
+ def create(self, name, plugin_name, hadoop_version, description=None,
+ cluster_configs=None, node_groups=None, anti_affinity=None,
+ net_id=None, default_image_id=None, use_autoconfig=None,
+ shares=None, is_public=None, is_protected=None):
+
data = {
'name': name,
'plugin_name': plugin_name,
@@ -45,30 +45,29 @@
shares=shares,
is_public=is_public,
is_protected=is_protected)
- return data
-
- def create(self, name, plugin_name, hadoop_version, description=None,
- cluster_configs=None, node_groups=None, anti_affinity=None,
- net_id=None, default_image_id=None, use_autoconfig=None,
- shares=None, is_public=None, is_protected=None):
- data = self._assign_field(name, plugin_name, hadoop_version,
- description, cluster_configs, node_groups,
- anti_affinity, net_id, default_image_id,
- use_autoconfig, shares, is_public,
- is_protected)
return self._create('/cluster-templates', data, 'cluster_template')
- def update(self, cluster_template_id, name, plugin_name, hadoop_version,
- description=None, cluster_configs=None, node_groups=None,
- anti_affinity=None, net_id=None, default_image_id=None,
- use_autoconfig=None, shares=None, is_public=None,
- is_protected=None):
- data = self._assign_field(name, plugin_name, hadoop_version,
- description, cluster_configs, node_groups,
- anti_affinity, net_id, default_image_id,
- use_autoconfig, shares, is_public,
- is_protected)
+ def update(self, cluster_template_id, name=None, plugin_name=None,
+ hadoop_version=None, description=None, cluster_configs=None,
+ node_groups=None, anti_affinity=None, net_id=None,
+ default_image_id=None, use_autoconfig=None, shares=None,
+ is_public=None, is_protected=None):
+
+ data = {}
+ self._copy_if_defined(data, name=name,
+ plugin_name=plugin_name,
+ hadoop_version=hadoop_version,
+ description=description,
+ cluster_configs=cluster_configs,
+ node_groups=node_groups,
+ anti_affinity=anti_affinity,
+ neutron_management_network=net_id,
+ default_image_id=default_image_id,
+ use_autoconfig=use_autoconfig,
+ shares=shares,
+ is_public=is_public,
+ is_protected=is_protected)
return self._update('/cluster-templates/%s' % cluster_template_id,
data, 'cluster_template')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/saharaclient/api/jobs.py new/python-saharaclient-0.11.1/saharaclient/api/jobs.py
--- old/python-saharaclient-0.11.0/saharaclient/api/jobs.py 2015-09-01 19:30:56.000000000 +0200
+++ new/python-saharaclient-0.11.1/saharaclient/api/jobs.py 2015-09-29 01:38:45.000000000 +0200
@@ -23,7 +23,8 @@
class JobsManager(base.ResourceManager):
resource_class = Job
- def create(self, name, type, mains, libs, description, interface=None):
+ def create(self, name, type, mains, libs, description, interface=None,
+ is_public=None, is_protected=None):
data = {
'name': name,
'type': type,
@@ -32,8 +33,8 @@
'libs': libs,
}
- if interface:
- data['interface'] = interface
+ self._copy_if_defined(data, interface=interface, is_public=is_public,
+ is_protected=is_protected)
return self._create('/jobs', data, 'job')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/saharaclient/api/node_group_templates.py new/python-saharaclient-0.11.1/saharaclient/api/node_group_templates.py
--- old/python-saharaclient-0.11.0/saharaclient/api/node_group_templates.py 2015-09-01 19:30:56.000000000 +0200
+++ new/python-saharaclient-0.11.1/saharaclient/api/node_group_templates.py 2015-09-29 01:38:45.000000000 +0200
@@ -23,15 +23,14 @@
class NodeGroupTemplateManager(base.ResourceManager):
resource_class = NodeGroupTemplate
- def _assign_field(self, name, plugin_name, hadoop_version, flavor_id,
- description=None, volumes_per_node=None,
- volumes_size=None, node_processes=None,
- node_configs=None, floating_ip_pool=None,
- security_groups=None, auto_security_group=None,
- availability_zone=None, volumes_availability_zone=None,
- volume_type=None, image_id=None, is_proxy_gateway=None,
- volume_local_to_instance=None, use_autoconfig=None,
- shares=None, is_public=None, is_protected=None):
+ def create(self, name, plugin_name, hadoop_version, flavor_id,
+ description=None, volumes_per_node=None, volumes_size=None,
+ node_processes=None, node_configs=None, floating_ip_pool=None,
+ security_groups=None, auto_security_group=None,
+ availability_zone=None, volumes_availability_zone=None,
+ volume_type=None, image_id=None, is_proxy_gateway=None,
+ volume_local_to_instance=None, use_autoconfig=None,
+ shares=None, is_public=None, is_protected=None):
data = {
'name': name,
@@ -68,49 +67,36 @@
data.update(
{"volume_local_to_instance": volume_local_to_instance})
- return data
-
- def create(self, name, plugin_name, hadoop_version, flavor_id,
- description=None, volumes_per_node=None, volumes_size=None,
- node_processes=None, node_configs=None, floating_ip_pool=None,
- security_groups=None, auto_security_group=None,
- availability_zone=None, volumes_availability_zone=None,
- volume_type=None, image_id=None, is_proxy_gateway=None,
- volume_local_to_instance=None, use_autoconfig=None,
- shares=None, is_public=None, is_protected=None):
-
- data = self._assign_field(name, plugin_name, hadoop_version, flavor_id,
- description, volumes_per_node, volumes_size,
- node_processes, node_configs,
- floating_ip_pool, security_groups,
- auto_security_group, availability_zone,
- volumes_availability_zone, volume_type,
- image_id, is_proxy_gateway,
- volume_local_to_instance, use_autoconfig,
- shares, is_public, is_protected)
-
return self._create('/node-group-templates', data,
'node_group_template')
- def update(self, ng_template_id, name, plugin_name, hadoop_version,
- flavor_id, description=None, volumes_per_node=None,
- volumes_size=None, node_processes=None, node_configs=None,
- floating_ip_pool=None, security_groups=None,
+ def update(self, ng_template_id, name=None, plugin_name=None,
+ hadoop_version=None, flavor_id=None, description=None,
+ volumes_per_node=None, volumes_size=None, node_processes=None,
+ node_configs=None, floating_ip_pool=None, security_groups=None,
auto_security_group=None, availability_zone=None,
volumes_availability_zone=None, volume_type=None,
image_id=None, is_proxy_gateway=None,
volume_local_to_instance=None, use_autoconfig=None,
shares=None, is_public=None, is_protected=None):
- data = self._assign_field(name, plugin_name, hadoop_version, flavor_id,
- description, volumes_per_node, volumes_size,
- node_processes, node_configs,
- floating_ip_pool, security_groups,
- auto_security_group, availability_zone,
- volumes_availability_zone, volume_type,
- image_id, is_proxy_gateway,
- volume_local_to_instance, use_autoconfig,
- shares, is_public, is_protected)
+ data = {}
+ self._copy_if_defined(
+ data, name=name, plugin_name=plugin_name,
+ hadoop_version=hadoop_version, flavor_id=flavor_id,
+ description=description, volumes_per_node=volumes_per_node,
+ volumes_size=volumes_size, node_processes=node_processes,
+ node_configs=node_configs, floating_ip_pool=floating_ip_pool,
+ security_groups=security_groups,
+ auto_security_group=auto_security_group,
+ availability_zone=availability_zone,
+ volumes_availability_zone=volumes_availability_zone,
+ volume_type=volume_type, image_id=image_id,
+ is_proxy_gateway=is_proxy_gateway,
+ volume_local_to_instance=volume_local_to_instance,
+ use_autoconfig=use_autoconfig, shares=shares,
+ is_public=is_public, is_protected=is_protected
+ )
return self._update('/node-group-templates/%s' % ng_template_id, data,
'node_group_template')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/saharaclient/tests/functional/hooks/post_test_hook.sh new/python-saharaclient-0.11.1/saharaclient/tests/functional/hooks/post_test_hook.sh
--- old/python-saharaclient-0.11.0/saharaclient/tests/functional/hooks/post_test_hook.sh 2015-09-01 19:30:56.000000000 +0200
+++ new/python-saharaclient-0.11.1/saharaclient/tests/functional/hooks/post_test_hook.sh 2015-09-29 01:38:45.000000000 +0200
@@ -18,7 +18,7 @@
if [ -f .testrepository/0 ]; then
sudo .tox/functional/bin/testr last --subunit > $WORKSPACE/testrepository.subunit
sudo mv $WORKSPACE/testrepository.subunit $BASE/logs/testrepository.subunit
- sudo .tox/functional/bin/python /usr/local/jenkins/slave_scripts/subunit2html.py $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
+ sudo /usr/os-testr-env/bin/subunit2html $BASE/logs/testrepository.subunit $BASE/logs/testr_results.html
sudo gzip -9 $BASE/logs/testrepository.subunit
sudo gzip -9 $BASE/logs/testr_results.html
sudo chown jenkins:jenkins $BASE/logs/testrepository.subunit.gz $BASE/logs/testr_results.html.gz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/saharaclient/tests/unit/test_jobs.py new/python-saharaclient-0.11.1/saharaclient/tests/unit/test_jobs.py
--- old/python-saharaclient-0.11.0/saharaclient/tests/unit/test_jobs.py 2015-09-01 19:30:56.000000000 +0200
+++ new/python-saharaclient-0.11.1/saharaclient/tests/unit/test_jobs.py 2015-09-29 01:38:45.000000000 +0200
@@ -24,7 +24,9 @@
'type': 'pig',
'mains': ['job_binary_id'],
'libs': [],
- 'description': 'descr'
+ 'description': 'descr',
+ 'is_public': True,
+ 'is_protected': False
}
def test_create_job(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/setup.cfg new/python-saharaclient-0.11.1/setup.cfg
--- old/python-saharaclient-0.11.0/setup.cfg 2015-09-01 19:31:47.000000000 +0200
+++ new/python-saharaclient-0.11.1/setup.cfg 2015-09-29 01:39:45.000000000 +0200
@@ -40,7 +40,6 @@
dataprocessing_data_source_create = saharaclient.osc.v1.data_sources:CreateDataSource
dataprocessing_data_source_list = saharaclient.osc.v1.data_sources:ListDataSources
dataprocessing_data_source_show = saharaclient.osc.v1.data_sources:ShowDataSource
- dataprocessing_data_source_update = saharaclient.osc.v1.data_sources:UpdateDataSource
dataprocessing_data_source_delete = saharaclient.osc.v1.data_sources:DeleteDataSource
[build_sphinx]
@@ -53,6 +52,6 @@
[egg_info]
tag_date = 0
-tag_build =
tag_svn_revision = 0
+tag_build =
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/setup.py new/python-saharaclient-0.11.1/setup.py
--- old/python-saharaclient-0.11.0/setup.py 2015-09-01 19:30:56.000000000 +0200
+++ new/python-saharaclient-0.11.1/setup.py 2015-09-29 01:38:45.000000000 +0200
@@ -25,5 +25,5 @@
pass
setuptools.setup(
- setup_requires=['pbr>=1.3'],
+ setup_requires=['pbr>=1.8'],
pbr=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/python-saharaclient-0.11.0/test-requirements.txt new/python-saharaclient-0.11.1/test-requirements.txt
--- old/python-saharaclient-0.11.0/test-requirements.txt 2015-09-01 19:30:56.000000000 +0200
+++ new/python-saharaclient-0.11.1/test-requirements.txt 2015-09-29 01:38:45.000000000 +0200
@@ -9,10 +9,10 @@
mock>=1.2
oslo.config>=2.3.0 # Apache-2.0
oslosphinx>=2.5.0 # Apache-2.0
-python-neutronclient<3,>=2.6.0
-python-novaclient>=2.26.0
+python-neutronclient>=2.6.0
+python-novaclient>=2.28.1
python-swiftclient>=2.2.0
requests-mock>=0.6.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-tempest-lib>=0.6.1
+tempest-lib>=0.8.0
testrepository>=0.0.18
