CORD-2461 Fix loading ONOS netcfg via TOSCA
Change-Id: Ia326d92fc49c36c87995abecaee4da9fed053b77
diff --git a/Makefile b/Makefile
index bc5cc65..db27358 100644
--- a/Makefile
+++ b/Makefile
@@ -377,9 +377,13 @@
$(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_LOCAL) ansible/maas-provision.yml --extra-vars='maas_user=maas vagrant_name=cord_compute$*'" $(LOGCMD)
touch $@
-$(M)/refresh-fabric: | $(M)/compute1-up
- $(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_MAAS) $(PI)/cord-refresh-fabric.yml" $(LOGCMD)
- touch $@
+
+# Fabric targets
+fabric-refresh: | $(M)/setup-automation
+ $(ANSIBLE_PB) $(PI)/cord-refresh-fabric.yml $(LOGCMD)
+
+fabric-pingtest:
+ $(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_MAAS) --private-key ~/.ssh/cord_rsa $(PI)/cord-fabric-pingtest.yml" $(LOGCMD)
# Testing targets
@@ -390,8 +394,7 @@
mcord-%:
$(ANSIBLE_PB) ../orchestration/profiles/mcord/test/mcord-$*-playbook.yml $(LOGCMD)
-fabric-pingtest: $(M)/refresh-fabric
- $(SSH_HEAD) "cd /opt/cord/build; $(ANSIBLE_PB_MAAS) $(PI)/cord-fabric-pingtest.yml" $(LOGCMD)
+
# Local Targets, bring up XOS containers without a VM
diff --git a/docs/appendix_basic_config.md b/docs/appendix_basic_config.md
index db4bb09..1fe6886 100644
--- a/docs/appendix_basic_config.md
+++ b/docs/appendix_basic_config.md
@@ -192,49 +192,22 @@
> NOTE: When prompted, use password `rocks`
-## Generate the Network Configuration
+## Generate and Load the Network Configuration
-To modify the fabric configuration for your environment, generate on the head
-node a new network configuration using the following commands:
+To modify the fabric configuration for your environment, run the following
+on the dev machine:
```shell
-cd /opt/cord_profile && \
-cp fabric-network-cfg.json{,.$(date +%Y%m%d-%H%M%S)} && \
-cord generate > fabric-network-cfg.json
+cd ~/cord/build && \
+make fabric-refresh
```
-## Load Network Configuration
+This generates a new fabric configuration using the `cord generate`
+command. It then uploads the new configuration to XOS, which pushes it to
+ONOS.
-Once these steps are done load the new configuration into XOS, and restart the
-apps in ONOS:
-
-### Install Dependencies
-
-```shell
-sudo pip install httpie
-```
-
-### Delete Old Configuration
-
-```shell
-http -a onos:rocks DELETE http://onos-fabric:8181/onos/v1/network/configuration/
-```
-
-### Load New Configuration
-
-```shell
-http -a onos:rocks POST http://onos-fabric:8181/onos/v1/network/configuration/ < /opt/cord_profile/fabric-network-cfg.json
-```
-
-### Restart ONOS Apps
-
-```shell
-http -a onos:rocks DELETE http://onos-fabric:8181/onos/v1/applications/org.onosproject.segmentrouting/active
-http -a onos:rocks POST http://onos-fabric:8181/onos/v1/applications/org.onosproject.segmentrouting/active
-```
-
-To verify that XOS has pushed the configuration to ONOS, log into ONOS in the
-onos-fabric VM and run netcfg:
+To verify that XOS has pushed the configuration to ONOS, log into the
+`onos-fabric` container and run `netcfg`:
```shell
$ ssh -p 8101 onos@onos-fabric netcfg
@@ -265,7 +238,7 @@
...
```
->NOTE: When prompt, use password "rocks"
+>NOTE: When prompted, use password "rocks"
## Verify Connectivity over the Fabric