upgrade_contrail from r2.22.x-15 juno aborts with AttributeError

[wenqing liang]

upgrade_contrail from r2.22.x-15 juno aborts with AttributeError. This is NOT seen upgrading from r3.0.2.0-51.

2016-09-20 14:37:47:718627: [root@10.87.140.197] out: [localhost] local: service cassandra stop
2016-09-20 14:37:48:019117: [root@10.87.140.197] out: Traceback (most recent call last):
2016-09-20 14:37:48:150984: [root@10.87.140.197] out: File "/usr/bin/upgrade-vnc-database", line 9, in <module>
2016-09-20 14:37:48:151266: [root@10.87.140.197] out: load_entry_point('ContrailProvisioning==0.1dev', 'console_scripts', 'upgrade-vnc-database')()
2016-09-20 14:37:48:151337: [root@10.87.140.197] out: File "/usr/local/lib/python2.7/dist-packages/contrail_provisioning/database/upgrade.py", line 128, in main
2016-09-20 14:37:48:151494: [root@10.87.140.197] out: database.upgrade()
2016-09-20 14:37:48:151551: [root@10.87.140.197] out: File "/usr/local/lib/python2.7/dist-packages/contrail_provisioning/database/upgrade.py", line 114, in upgrade
2016-09-20 14:37:48:151588: [root@10.87.140.197] out: self.fixup_cassandra_upgrade()
2016-09-20 14:37:48:151637: [root@10.87.140.197] out: File "/usr/local/lib/python2.7/dist-packages/contrail_provisioning/database/upgrade.py", line 75, in fixup_cassandra_upgrade
2016-09-20 14:37:48:151674: [root@10.87.140.197] out: self.fixup_cassandra_config_files()
2016-09-20 14:37:48:151709: [root@10.87.140.197] out: AttributeError: 'DatabaseUpgrade' object has no attribute 'fixup_cassandra_config_files'
2016-09-20 14:37:48:151745: [root@10.87.140.197] out:
2016-09-20 14:37:48:152102:

2016-09-20 14:37:48:157928: Fatal error: sudo() received nonzero return code 1 while executing!
2016-09-20 14:37:48:157928:
2016-09-20 14:37:48:157928: Requested: upgrade-vnc-database --self_ip 5.0.0.1 --cfgm_ip 5.0.0.1 --seed_list 5.0.0.1 --zookeeper_ip_list 5.0.0.1 --database_index 1 --minimum_diskGB 256 --kafka_broker_id 0 -P contrail-openstack-database -F 2.22.2 -T 3.0.3.0
2016-09-20 14:37:48:157928: Executed: sudo -S -p 'sudo password:' /bin/bash -l -c "upgrade-vnc-database --self_ip 5.0.0.1 --cfgm_ip 5.0.0.1 --seed_list 5.0.0.1 --zookeeper_ip_list 5.0.0.1 --database_index 1 --minimum_diskGB 256 --kafka_broker_id 0 -P contrail-openstack-database -F 2.22.2 -T 3.0.3.0"
2016-09-20 14:37:48:157928:
2016-09-20 14:37:48:157947: Aborting.
2016-09-20 14:37:48:157947: 2016-09-20 14:37:48:157854: Disconnecting from 10.87.140.200... done.
2016-09-20 14:37:48:271892: Disconnecting from 10.87.140.199... done.
2016-09-20 14:37:48:287396: Disconnecting from 10.87.140.198... done.
2016-09-20 14:37:48:401253: Disconnecting from 10.87.140.197... done.
2016-09-20 14:37:48:465119: root@cmbu-ceph-perf1:/opt/contrail/utils#

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/24318
Submitter: Ignatious Johnson Christopher (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/24318
Committed: http://github.org/Juniper/contrail-provisioning/commit/2cce0f52c1a2a334eb63adec425282e58138c9a2
Submitter: Zuul
Branch: R3.0

commit 2cce0f52c1a2a334eb63adec425282e58138c9a2
Author: Ignatious Johnson Christopher <email address hidden>
Date: Tue Sep 20 15:20:11 2016 -0700

Issue:
Incorrect old method name is used in upgrade.py

Fix:
Correcting it to use correct method with right arguments.

Change-Id: I4cd89b92f5d55008d7fad280c20596e860997dd2
Closes-Bug: 1625838

[Ignatious Johnson Christopher (ijohnson-x)]

Fix not required in Master.