Merge pull request #56 from andy000923/master

rename NKS service group, service type

src/plugin/connector/nks/nks_connector.py → src/plugin/connector/nks/cluster_connector.py

@@ -8,7 +8,7 @@
 _LOGGER = logging.getLogger("cloudforet")
 
 
-class NKSConnector(NHNCloudBaseConnector):
+class ClusterConnector(NHNCloudBaseConnector):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

src/plugin/connector/nks/group_connector.py → src/plugin/connector/nks/node_group_connector.py

@@ -8,7 +8,7 @@
 _LOGGER = logging.getLogger("cloudforet")
 
 
-class NKSGroupConnector(NHNCloudBaseConnector):
+class NodeGroupConnector(NHNCloudBaseConnector):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

src/plugin/manager/__init__.py

@@ -30,6 +30,9 @@
 from plugin.manager.network_acl.network_acl_manager import NetworkACLManager
 from plugin.manager.network_acl.rule_manger import RuleManager
 from plugin.manager.network_acl.binding_manager import BindingManager
+from plugin.manager.nks.node_group_manager import NodeGroupManager
+from plugin.manager.nks.cluster_manager import ClusterManager
+from plugin.manager.object_storage.container_manager import ContainerManager
 from plugin.manager.push.token_manager import PushTokenManager
 from plugin.manager.push.tag_manager import PushTagManager
 from plugin.manager.rds_for_mariadb.db_security_group_manager import DBSecurityGroupManager
@@ -58,7 +61,4 @@
 from plugin.manager.transit_hub.multicast_domain_manager import MulticastDomainManager
 from plugin.manager.vpc.vpc_manager import VPCManager
 from plugin.manager.vpc.subnet_manager import VPCSubnetManager
-from plugin.manager.vpc.routing_table_manager import RoutingTableManager
-from plugin.manager.nks.group_manager import NKSGroupManager
-from plugin.manager.nks.nks_manager import NKSManager
-from plugin.manager.object_storage.container_manager import ContainerManager
+from plugin.manager.vpc.routing_table_manager import RoutingTableManager

src/plugin/manager/nks/nks_manager.py → src/plugin/manager/nks/cluster_manager.py

@@ -2,23 +2,23 @@
 from spaceone.inventory.plugin.collector.lib import *
 
 from plugin.conf.cloud_service_conf import AUTH_TYPE, REGION, ASSET_URL
-from plugin.connector.nks.nks_connector import NKSConnector
+from plugin.connector.nks.cluster_connector import ClusterConnector
 from plugin.manager.base import NHNCloudBaseManager
 
 _LOGGER = logging.getLogger("cloudforet")
 
 
-class NKSManager(NHNCloudBaseManager):
+class ClusterManager(NHNCloudBaseManager):
     auth_type = AUTH_TYPE.TOKEN
     AVAILABLE_REGIONS = [REGION.KR1, REGION.KR2]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.cloud_service_group = "Container"
-        self.cloud_service_type = "NKS"
+        self.cloud_service_group = "NKS"
+        self.cloud_service_type = "Cluster"
         self.provider = "nhncloud"
-        self.metadata_path = "metadata/nks/nks.yaml"
+        self.metadata_path = "metadata/nks/cluster.yaml"
 
     def create_cloud_service_type(self):
         cloud_service_type = make_cloud_service_type(
@@ -37,7 +37,7 @@ def create_cloud_service_type(self):
         return cloud_service_type
 
     def create_cloud_service(self, secret_data):
-        nks_connector = NKSConnector()
+        nks_connector = ClusterConnector()
         for AVAILABLE_REGION in self.AVAILABLE_REGIONS:
             resources = nks_connector.get_cluster(secret_data, AVAILABLE_REGION)
             for resource in resources:

src/plugin/manager/nks/group_manager.py → src/plugin/manager/nks/node_group_manager.py

@@ -2,24 +2,24 @@
 from spaceone.inventory.plugin.collector.lib import *
 
 from plugin.conf.cloud_service_conf import AUTH_TYPE, ASSET_URL, REGION
-from plugin.connector.nks.nks_connector import NKSConnector
-from plugin.connector.nks.group_connector import NKSGroupConnector
+from plugin.connector.nks.node_group_connector import NodeGroupConnector
+from plugin.connector.nks.cluster_connector import ClusterConnector
 from plugin.manager.base import NHNCloudBaseManager
 
 _LOGGER = logging.getLogger("cloudforet")
 
 
-class NKSGroupManager(NHNCloudBaseManager):
+class NodeGroupManager(NHNCloudBaseManager):
     auth_type = AUTH_TYPE.TOKEN
     AVAILABLE_REGIONS = [REGION.KR1, REGION.KR2]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.cloud_service_group = "Container"
+        self.cloud_service_group = "NKS"
         self.cloud_service_type = "Node Group"
         self.provider = "nhncloud"
-        self.metadata_path = "metadata/nks/group.yaml"
+        self.metadata_path = "metadata/nks/node_group.yaml"
 
     def create_cloud_service_type(self):
         cloud_service_type = make_cloud_service_type(
@@ -38,8 +38,8 @@ def create_cloud_service_type(self):
         return cloud_service_type
 
     def create_cloud_service(self, secret_data):
-        group_connector = NKSGroupConnector()
-        cluster_connector = NKSConnector()
+        group_connector = NodeGroupConnector()
+        cluster_connector = ClusterConnector()
         for AVAILABLE_REGION in self.AVAILABLE_REGIONS:
             for cluster in cluster_connector.get_cluster(secret_data, AVAILABLE_REGION):
                 cluster_id = cluster['uuid']