|
39 | 39 | pass |
40 | 40 |
|
41 | 41 | yaml = YAML() |
42 | | -yaml.default_flow_style = False |
| 42 | +yaml.default_flow_style = False |
43 | 43 | yaml.indent(mapping=2, sequence=4, offset=2) |
44 | 44 |
|
45 | 45 | logger = logging.getLogger(__name__) |
@@ -104,13 +104,13 @@ def _recover_project(prj_path: str): |
104 | 104 | sys.exit() |
105 | 105 | client = ProjectClient(host_addr=env.host_addr, project_id=env.project_id) |
106 | 106 | project = client.get(namespace=namespace) or client.create( |
107 | | - name=project_name, |
108 | | - desc=desc, |
109 | | - namespace=namespace, |
110 | | - config=env._config, |
111 | | - visibility=env.project_config.get("visibility", "PRIVATE"), |
112 | | - tag=env.project_config.get("tag", "LOCAL"), |
113 | | - userNo=env.project_config.get("userNo", "openspg") |
| 107 | + name=project_name, |
| 108 | + desc=desc, |
| 109 | + namespace=namespace, |
| 110 | + config=env._config, |
| 111 | + visibility=env.project_config.get("visibility", "PRIVATE"), |
| 112 | + tag=env.project_config.get("tag", "LOCAL"), |
| 113 | + userNo=env.project_config.get("userNo", "openspg"), |
114 | 114 | ) |
115 | 115 |
|
116 | 116 | env._config["project"]["id"] = project.id |
@@ -177,12 +177,14 @@ def create_project( |
177 | 177 |
|
178 | 178 | if host_addr: |
179 | 179 | client = ProjectClient(host_addr=host_addr) |
180 | | - project = client.create(name=name, |
181 | | - namespace=namespace, |
182 | | - config=config, |
183 | | - visibility=env.project_config.get("visibility", "PRIVATE"), |
184 | | - tag=env.project_config.get("tag", "LOCAL"), |
185 | | - userNo=env.project_config.get("userNo", "openspg")) |
| 180 | + project = client.create( |
| 181 | + name=name, |
| 182 | + namespace=namespace, |
| 183 | + config=config, |
| 184 | + visibility=env.project_config.get("visibility", "PRIVATE"), |
| 185 | + tag=env.project_config.get("tag", "LOCAL"), |
| 186 | + userNo=env.project_config.get("userNo", "openspg"), |
| 187 | + ) |
186 | 188 |
|
187 | 189 | if project and project.id: |
188 | 190 | project_id = project.id |
@@ -230,12 +232,14 @@ def restore_project(host_addr, proj_path): |
230 | 232 | if not project_wanted: |
231 | 233 | if host_addr: |
232 | 234 | client = ProjectClient(host_addr=host_addr) |
233 | | - project = client.create(name=env.name, |
234 | | - namespace=env.namespace, |
235 | | - config=env._config, |
236 | | - visibility=env.project_config.get("visibility", "PRIVATE"), |
237 | | - tag=env.project_config.get("tag", "LOCAL"), |
238 | | - userNo=env.project_config.get("userNo", "openspg")) |
| 235 | + project = client.create( |
| 236 | + name=env.name, |
| 237 | + namespace=env.namespace, |
| 238 | + config=env._config, |
| 239 | + visibility=env.project_config.get("visibility", "PRIVATE"), |
| 240 | + tag=env.project_config.get("tag", "LOCAL"), |
| 241 | + userNo=env.project_config.get("userNo", "openspg"), |
| 242 | + ) |
239 | 243 | project_id = project.id |
240 | 244 | else: |
241 | 245 | project_id = project_wanted.id |
@@ -267,17 +271,23 @@ def update_project(proj_path): |
267 | 271 | sys.exit() |
268 | 272 |
|
269 | 273 | logger.info(f"project id: {env.id}") |
270 | | - client.update(id=env.id, namespace=env.namespace, config=env._config, visibility=env.project_config.get("visibility", "PRIVATE"), tag=env.project_config.get("tag", "LOCAL"), userNo=env.project_config.get("userNo", "openspg")) |
| 274 | + client.update( |
| 275 | + id=env.id, |
| 276 | + namespace=env.namespace, |
| 277 | + config=env._config, |
| 278 | + visibility=env.project_config.get("visibility", "PRIVATE"), |
| 279 | + tag=env.project_config.get("tag", "LOCAL"), |
| 280 | + userNo=env.project_config.get("userNo", "openspg"), |
| 281 | + ) |
271 | 282 | click.secho( |
272 | 283 | f"Project [{env.name}] with namespace [{env.namespace}] was successfully updated from [{proj_path}].", |
273 | 284 | fg="bright_green", |
274 | 285 | ) |
275 | 286 |
|
| 287 | + |
276 | 288 | @click.option("--host_addr", help="Address of spg server.", default=DEFAULT_HOST_ADDR) |
277 | 289 | def list_project(host_addr): |
278 | | - client = ProjectClient( |
279 | | - host_addr=host_addr |
280 | | - ) |
| 290 | + client = ProjectClient(host_addr=host_addr) |
281 | 291 | projects = client.get_all() |
282 | 292 |
|
283 | 293 | headers = ["Project Name", "Project ID"] |
|
0 commit comments