Sync with global requirements

Change-Id: I708ffe506e1be9a72a92edfec911e3ee70481ff1
added clustertype support
add get method for clustertypes
unittests for cli actions